Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51b259bb authored by Herbert Xu's avatar Herbert Xu
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Merge the crypto tree to resolve conflict in qat Makefile.
parents 16dee780 81dc0365

crypto/crypto_user.c

+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ static const int crypto_msg_min[CRYPTO_NR_MSGTYPES] = { 
	[CRYPTO_MSG_NEWALG	- CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),

	[CRYPTO_MSG_DELALG	- CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),

	[CRYPTO_MSG_UPDATEALG	- CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),

	[CRYPTO_MSG_GETALG	- CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),

	[CRYPTO_MSG_DELRNG	- CRYPTO_MSG_BASE] = 0,

};

drivers/crypto/ux500/hash/hash_core.c

+2 −2
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ static int hash_process_data(struct hash_device_data *device_data, 
						&device_data->state);

				memmove(req_ctx->state.buffer,

					device_data->state.buffer,

					HASH_BLOCK_SIZE / sizeof(u32));

					HASH_BLOCK_SIZE);

				if (ret) {

					dev_err(device_data->dev,

						"%s: hash_resume_state() failed!\n",
@@ -832,7 +832,7 @@ static int hash_process_data(struct hash_device_data *device_data, 


			memmove(device_data->state.buffer,

				req_ctx->state.buffer,

				HASH_BLOCK_SIZE / sizeof(u32));

				HASH_BLOCK_SIZE);

			if (ret) {

				dev_err(device_data->dev, "%s: hash_save_state() failed!\n",

					__func__);

drivers/crypto/vmx/aes_cbc.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ struct crypto_alg p8_aes_cbc_alg = { 
	.cra_name = "cbc(aes)",

	.cra_driver_name = "p8_aes_cbc",

	.cra_module = THIS_MODULE,

	.cra_priority = 1000,

	.cra_priority = 2000,

	.cra_type = &crypto_blkcipher_type,

	.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK,

	.cra_alignmask = 0,

drivers/crypto/vmx/aes_ctr.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ struct crypto_alg p8_aes_ctr_alg = { 
	.cra_name = "ctr(aes)",

	.cra_driver_name = "p8_aes_ctr",

	.cra_module = THIS_MODULE,

	.cra_priority = 1000,

	.cra_priority = 2000,

	.cra_type = &crypto_blkcipher_type,

	.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_NEED_FALLBACK,

	.cra_alignmask = 0,

drivers/crypto/vmx/ppc-xlate.pl

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ my $vmr = sub { 


# Some ABIs specify vrsave, special-purpose register #256, as reserved

# for system use.

my $no_vrsave = ($flavour =~ /aix|linux64le/);

my $no_vrsave = ($flavour =~ /linux-ppc64le/);

my $mtspr = sub {

    my ($f,$idx,$ra) = @_;

    if ($idx == 256 && $no_vrsave) {