linux-next: manual merge of the crypto tree with Linus' tree

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2698 bytes --]

Hi Herbert,

Today's linux-next merge of the crypto tree got conflicts in
arch/arm/mach-ux500/board-mop500.c and arch/arm/mach-ux500/board-u5500.c
between commit b024a0c80435 ("ARM: ux500: move top level platform devices
in sysfs to /sys/devices/socX") from Linus' tree and commit 3ba812f4d0be
("mach-ux500: crypto - core support for CRYP/HASH module") from the
crypto tree.

Just context changes.  I fixed them up (see below) and can carry the
fixes as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-ux500/board-mop500.c
index 77d03c1,4e9bcd6..0000000
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@@ -595,13 -627,19 +635,19 @@@ static struct amba_pl011_data uart2_pla
  #endif
  };
  
 -static void __init mop500_uart_init(void)
 +static void __init mop500_uart_init(struct device *parent)
  {
 -	db8500_add_uart0(&uart0_plat);
 -	db8500_add_uart1(&uart1_plat);
 -	db8500_add_uart2(&uart2_plat);
 +	db8500_add_uart0(parent, &uart0_plat);
 +	db8500_add_uart1(parent, &uart1_plat);
 +	db8500_add_uart2(parent, &uart2_plat);
  }
  
+ static void __init u8500_cryp1_hash1_init(void)
+ {
+ 	db8500_add_cryp1(&u8500_cryp1_platform_data);
+ 	db8500_add_hash1(&u8500_hash1_platform_data);
+ }
+ 
  static struct platform_device *snowball_platform_devs[] __initdata = {
  	&snowball_led_dev,
  	&snowball_key_dev,
@@@ -621,10 -657,8 +667,12 @@@ static void __init mop500_init_machine(
  
  	mop500_pins_init();
  
+ 	u8500_cryp1_hash1_init();
+ 
 +	/* FIXME: parent of ab8500 should be prcmu */
 +	for (i = 0; i < ARRAY_SIZE(mop500_platform_devs); i++)
 +		mop500_platform_devs[i]->dev.parent = parent;
 +
  	platform_add_devices(mop500_platform_devs,
  			ARRAY_SIZE(mop500_platform_devs));
  
diff --cc arch/arm/mach-ux500/board-u5500.c
index 0ff4be7,865aaf8..0000000
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@@ -135,19 -182,13 +182,20 @@@ static void __init u5500_uart_init(stru
  
  static void __init u5500_init_machine(void)
  {
 -	u5500_init_devices();
 +	struct device *parent = NULL;
 +	int i;
 +
 +	parent = u5500_init_devices();
  	nmk_config_pins(u5500_pins, ARRAY_SIZE(u5500_pins));
 -	u5500_i2c_init();
 -	u5500_sdi_init();
 -	u5500_uart_init();
 +
 +	u5500_i2c_init(parent);
 +	u5500_sdi_init(parent);
 +	u5500_uart_init(parent);
+ 	u5500_cryp1_hash1_init();
  
 +	for (i = 0; i < ARRAY_SIZE(u5500_platform_devices); i++)
 +		u5500_platform_devices[i]->dev.parent = parent;
 +
  	platform_add_devices(u5500_platform_devices,
  		ARRAY_SIZE(u5500_platform_devices));
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the crypto tree with Linus' tree

[Herbert Xu]

On Mon, May 07, 2012 at 12:11:37PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got conflicts in
> arch/arm/mach-ux500/board-mop500.c and arch/arm/mach-ux500/board-u5500.c
> between commit b024a0c80435 ("ARM: ux500: move top level platform devices
> in sysfs to /sys/devices/socX") from Linus' tree and commit 3ba812f4d0be
> ("mach-ux500: crypto - core support for CRYP/HASH module") from the
> crypto tree.
> 
> Just context changes.  I fixed them up (see below) and can carry the
> fixes as necessary.

I think it looks fine but I'll let Linus Walleij have the final
say on this.

Thanks!
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: linux-next: manual merge of the crypto tree with Linus' tree

[Arnd Bergmann]

On Monday 07 May 2012, Stephen Rothwell wrote:
> + static void __init u8500_cryp1_hash1_init(void)
> + {
> +       db8500_add_cryp1(&u8500_cryp1_platform_data);
> +       db8500_add_hash1(&u8500_hash1_platform_data);
> + }

This is actually not correct any more because of the
other changes: each device addition should also pass the parent
pointer so the device is created in the right position.

Stephen, your fix is ok for linux-next and I expect everything
to still work, but we should not merge it into v3.5 this way.

Thanks for the fixup.

	Arnd

Re: linux-next: manual merge of the crypto tree with Linus' tree

[Herbert Xu]

On Mon, May 07, 2012 at 08:09:21AM +0000, Arnd Bergmann wrote:
> On Monday 07 May 2012, Stephen Rothwell wrote:
> > + static void __init u8500_cryp1_hash1_init(void)
> > + {
> > +       db8500_add_cryp1(&u8500_cryp1_platform_data);
> > +       db8500_add_hash1(&u8500_hash1_platform_data);
> > + }
> 
> This is actually not correct any more because of the
> other changes: each device addition should also pass the parent
> pointer so the device is created in the right position.
> 
> Stephen, your fix is ok for linux-next and I expect everything
> to still work, but we should not merge it into v3.5 this way.
> 
> Thanks for the fixup.

OK, I'll drop the last patch

	mach-ux500: crypto - core support for CRYP/HASH module

from my tree.

Cheers,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: linux-next: manual merge of the crypto tree with Linus' tree

[Linus Walleij]

On Mon, May 7, 2012 at 11:04 AM, Herbert Xu <herbert@gondor.apana.org.au> wrote:
> On Mon, May 07, 2012 at 08:09:21AM +0000, Arnd Bergmann wrote:
>> On Monday 07 May 2012, Stephen Rothwell wrote:
>> > + static void __init u8500_cryp1_hash1_init(void)
>> > + {
>> > +       db8500_add_cryp1(&u8500_cryp1_platform_data);
>> > +       db8500_add_hash1(&u8500_hash1_platform_data);
>> > + }
>>
>> This is actually not correct any more because of the
>> other changes: each device addition should also pass the parent
>> pointer so the device is created in the right position.
>>
>> Stephen, your fix is ok for linux-next and I expect everything
>> to still work, but we should not merge it into v3.5 this way.
>>
>> Thanks for the fixup.
>
> OK, I'll drop the last patch
>
>        mach-ux500: crypto - core support for CRYP/HASH module

OK we need to revisit this and we can drop the U5500 hunks at
the same time.

Yours,
Linus Walleij

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 937 bytes --]

Hi all,

Today's linux-next merge of the crypto tree got a conflict in:

  crypto/asymmetric_keys/public_key.c

between commit:

  c3d03e8e35e0 ("KEYS: asymmetric: Copy sig and digest in public_key_verify_signature()")

from Linus' tree and commits:

  e5221fa6a355 ("KEYS: asymmetric: Move sm2 code into x509_public_key")
  63ba4d67594a ("KEYS: asymmetric: Use new crypto interface without scatterlists")

from the crypto tree.

I fixed it up (I effectively reverted the former commit - which may or may
not be the correc thing to do) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 880 bytes --]

Hi all,

Today's linux-next merge of the crypto tree got a conflict in:

  drivers/crypto/cavium/nitrox/nitrox_main.c

between commit:

  6a3239a738d8 ("Revert "crypto: cavium/nitrox - add an error message to explain the failure of pci_request_mem_regions"")

from Linus' tree and commit:

  0dc64297c8ac ("crypto: cavium/nitrox - Fix an error rhandling path in 'nitrox_probe()'")

from the crypto tree.

I fixed it up (I just used the latter since it also did what the former
did) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1148 bytes --]

Hi all,

Today's linux-next merge of the crypto tree got a conflict in:

  drivers/crypto/Kconfig

between commit:

  bfe8fe939a04 ("crypto: sa2ul - add Kconfig selects to fix build error")

from Linus' tree and commit:

  61f033ba18c3 ("crypto: sa2ul - Select CRYPTO_AUTHENC")

from the crypto tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/crypto/Kconfig
index 52a9b7cf6576,c2950127def6..000000000000
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@@ -873,9 -873,7 +873,10 @@@ config CRYPTO_DEV_SA2U
  	select CRYPTO_AES
  	select CRYPTO_AES_ARM64
  	select CRYPTO_ALGAPI
+ 	select CRYPTO_AUTHENC
 +	select CRYPTO_SHA1
 +	select CRYPTO_SHA256
 +	select CRYPTO_SHA512
  	select HW_RANDOM
  	select SG_SPLIT
  	help

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 777 bytes --]

Hi all,

Today's linux-next merge of the crypto tree got conflicts in:

  crypto/lrw.c
  crypto/xts.c

between commit:

  1a263ae60b04 ("gcc-10: avoid shadowing standard library 'free()' in crypto")

from Linus' tree and commit:

  d099ea6e6fde ("crypto - Avoid free() namespace collision")

from the crypto tree.

I fixed it up (I just used the versions from the crypto tree) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1426 bytes --]

Hi all,

Today's linux-next merge of the crypto tree got a conflict in:

  arch/arm/crypto/Kconfig

between commit:

  f703964fc668 ("crypto: arm/aes-ce - add dependency on AES library")

from Linus' tree and commits:

  b4d0c0aad57a ("crypto: arm - use Kconfig based compiler checks for crypto opcodes")
  b95bba5d0114 ("crypto: skcipher - rename the crypto_blkcipher module and kconfig option")

from the crypto tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/crypto/Kconfig
index 043b0b18bf7e,c618c379449f..000000000000
--- a/arch/arm/crypto/Kconfig
+++ b/arch/arm/crypto/Kconfig
@@@ -96,9 -96,8 +96,9 @@@ config CRYPTO_AES_ARM_B
  
  config CRYPTO_AES_ARM_CE
  	tristate "Accelerated AES using ARMv8 Crypto Extensions"
- 	depends on KERNEL_MODE_NEON
- 	select CRYPTO_BLKCIPHER
+ 	depends on KERNEL_MODE_NEON && (CC_IS_CLANG || GCC_VERSION >= 40800)
+ 	select CRYPTO_SKCIPHER
 +	select CRYPTO_LIB_AES
  	select CRYPTO_SIMD
  	help
  	  Use an implementation of AES in CBC, CTR and XTS modes that uses

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the crypto tree with Linus' tree

[Nick Desaulniers]

LGTM, sorry for the mid air collision.  Thanks for resolving, Stephen!

On Thu, Aug 22, 2019 at 8:08 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the crypto tree got a conflict in:
>
>   arch/x86/purgatory/Makefile
>
> between commit:
>
>   4ce97317f41d ("x86/purgatory: Do not use __builtin_memcpy and __builtin_memset")
>
> from Linus' tree and commit:
>
>   ad767ee858b3 ("crypto: sha256 - Move lib/sha256.c to lib/crypto")
>
> from the crypto tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/x86/purgatory/Makefile
> index 8901a1f89cf5,ea86982aba27..000000000000
> --- a/arch/x86/purgatory/Makefile
> +++ b/arch/x86/purgatory/Makefile
> @@@ -6,12 -6,11 +6,14 @@@ purgatory-y := purgatory.o stack.o setu
>   targets += $(purgatory-y)
>   PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))
>
>  +$(obj)/string.o: $(srctree)/arch/x86/boot/compressed/string.c FORCE
>  +      $(call if_changed_rule,cc_o_c)
>  +
> - $(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE
> + $(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE
>         $(call if_changed_rule,cc_o_c)
>
> + CFLAGS_sha256.o := -D__DISABLE_EXPORTS
> +
>   LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib
>   targets += purgatory.ro
>


-- 
Thanks,
~Nick Desaulniers

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1489 bytes --]

Hi all,

Today's linux-next merge of the crypto tree got a conflict in:

  arch/x86/purgatory/Makefile

between commit:

  4ce97317f41d ("x86/purgatory: Do not use __builtin_memcpy and __builtin_memset")

from Linus' tree and commit:

  ad767ee858b3 ("crypto: sha256 - Move lib/sha256.c to lib/crypto")

from the crypto tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/x86/purgatory/Makefile
index 8901a1f89cf5,ea86982aba27..000000000000
--- a/arch/x86/purgatory/Makefile
+++ b/arch/x86/purgatory/Makefile
@@@ -6,12 -6,11 +6,14 @@@ purgatory-y := purgatory.o stack.o setu
  targets += $(purgatory-y)
  PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))
  
 +$(obj)/string.o: $(srctree)/arch/x86/boot/compressed/string.c FORCE
 +	$(call if_changed_rule,cc_o_c)
 +
- $(obj)/sha256.o: $(srctree)/lib/sha256.c FORCE
+ $(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE
  	$(call if_changed_rule,cc_o_c)
  
+ CFLAGS_sha256.o := -D__DISABLE_EXPORTS
+ 
  LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib
  targets += purgatory.ro
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 997 bytes --]

Hi all,

Today's linux-next merge of the crypto tree got conflicts in:

  drivers/crypto/vmx/aes.c
  drivers/crypto/vmx/aes_cbc.c
  drivers/crypto/vmx/aes_ctr.c
  drivers/crypto/vmx/aes_xts.c
  drivers/crypto/vmx/vmx.c

between commits:

  64d85cc99980 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 299")
  27ba4deb4e26 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 442")

from Linus' tree and commit:

  1fa0a7dcf759 ("crypto: vmx - convert to SPDX license identifiers")

from the crypto tree.

I fixed it up (I just used the SPDX tags from Linus' tree) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 760 bytes --]

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in:

  crypto/crypto_wq.c

between commit:

  2874c5fd2842 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152")

from Linus' tree and commit:

  3e56e168638b ("crypto: cryptd - move kcrypto_wq into cryptd")

from the crypto tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the crypto tree with Linus' tree

[Herbert Xu]

On Fri, May 09, 2014 at 12:07:02PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got a conflict in
> crypto/crypto_user.c between commit 90f62cf30a78 ("net: Use
> netlink_ns_capable to verify the permisions of netlink messages") from
> Linus' tree and commit c568398aa05f ("crypto: user - Allow
> CRYPTO_MSG_GETALG without CAP_NET_ADMIN") from the crypto tree.
> 
> I fixed it up (I hope - see below) and can carry the fix as necessary
> (no action is required).

Looks good.  Thanks Stephen!
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1760 bytes --]

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in
crypto/crypto_user.c between commit 90f62cf30a78 ("net: Use
netlink_ns_capable to verify the permisions of netlink messages") from
Linus' tree and commit c568398aa05f ("crypto: user - Allow
CRYPTO_MSG_GETALG without CAP_NET_ADMIN") from the crypto tree.

I fixed it up (I hope - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc crypto/crypto_user.c
index 43665d0d0905,aa906b8fdd17..000000000000
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@@ -265,6 -265,9 +265,9 @@@ static int crypto_update_alg(struct sk_
  	struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];
  	LIST_HEAD(list);
  
 -	if (!capable(CAP_NET_ADMIN))
++	if (!netlink_capable(skb, CAP_NET_ADMIN))
+ 		return -EPERM;
+ 
  	if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
  		return -EINVAL;
  
@@@ -295,6 -298,9 +298,9 @@@ static int crypto_del_alg(struct sk_buf
  	struct crypto_alg *alg;
  	struct crypto_user_alg *p = nlmsg_data(nlh);
  
 -	if (!capable(CAP_NET_ADMIN))
++	if (!netlink_capable(skb, CAP_NET_ADMIN))
+ 		return -EPERM;
+ 
  	if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
  		return -EINVAL;
  
@@@ -379,6 -385,9 +385,9 @@@ static int crypto_add_alg(struct sk_buf
  	struct crypto_user_alg *p = nlmsg_data(nlh);
  	struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];
  
 -	if (!capable(CAP_NET_ADMIN))
++	if (!netlink_capable(skb, CAP_NET_ADMIN))
+ 		return -EPERM;
+ 
  	if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
  		return -EINVAL;
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in
drivers/crypto/bfin_crc.h between commit 3356c99ea392 ("bfin_crc: Move
architecture independant crc header file out of the blackfin folder")
from Linus' tree and commit 52e6e543f2d8 ("crypto: bfin_crc - access crc
registers by readl and writel functions") from the crypto tree.

I fixed it up (I kept the file under its new name) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1327 bytes --]

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in
drivers/char/hw_random/Kconfig between commit 2257ffbca73c ("hwrng: msm:
switch Kconfig to ARCH_QCOM depends") from Linus' tree and commits
020016183453 ("hwrng: Turn HW_RANDOM into a menuconfig") and 2d9cab5194c8
("hwrng: Fix a few driver dependencies and defaults") from the crypto
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/char/hw_random/Kconfig
index 244759bbd7b7,38cfae686cc4..000000000000
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@@ -342,11 -321,12 +321,12 @@@ config HW_RANDOM_TP
  	  If unsure, say Y.
  
  config HW_RANDOM_MSM
 -	tristate "Qualcomm MSM Random Number Generator support"
 -	depends on ARCH_MSM
 +	tristate "Qualcomm SoCs Random Number Generator support"
- 	depends on HW_RANDOM && ARCH_QCOM
++	depends on ARCH_QCOM
+ 	default HW_RANDOM
  	---help---
  	  This driver provides kernel-side support for the Random Number
 -	  Generator hardware found on Qualcomm MSM SoCs.
 +	  Generator hardware found on Qualcomm SoCs.
  
  	  To compile this driver as a module, choose M here. the
  	  module will be called msm-rng.

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the crypto tree with Linus' tree

[Herbert Xu]

On Mon, May 07, 2012 at 12:31:00PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got a conflict in
> arch/arm/mach-ux500/devices-common.c between commit 3510ec672319 ("ARM:
> ux500: remove intermediary add_platform_device* functions") from Linus'
> tree and commit 3ba812f4d0be ("mach-ux500: crypto - core support for
> CRYP/HASH module") from the crypto tree.
> 
> I can't easily resolve this, sorry.  This crypto patch needs to be
> revised on top of v3.4-rc1.
> 
> I have use the crypto tree from next-20120504 for today.

OK I'll fix it up.  Thanks,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 567 bytes --]

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in
arch/arm/mach-ux500/devices-common.c between commit 3510ec672319 ("ARM:
ux500: remove intermediary add_platform_device* functions") from Linus'
tree and commit 3ba812f4d0be ("mach-ux500: crypto - core support for
CRYP/HASH module") from the crypto tree.

I can't easily resolve this, sorry.  This crypto patch needs to be
revised on top of v3.4-rc1.

I have use the crypto tree from next-20120504 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the crypto tree with Linus' tree

[Herbert Xu]

On Wed, Apr 14, 2010 at 11:48:56AM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got a conflict in
> drivers/crypto/mv_cesa.c between commit
> 5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h
> and slab.h includes to prepare for breaking implicit slab.h inclusion
> from percpu.h") from Linus' tree and commit
> 750052dd2400cd09e0864d75b63c2c0bf605056f ("crypto: mv_cesa - Add sha1 and
> hmac(sha1) async hash drivers") from the crypto tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> for a while.

Thanks for the heads up Stephen, I will do a merge soon.
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

linux-next: manual merge of the crypto tree with Linus' tree

[Stephen Rothwell]

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in
drivers/crypto/mv_cesa.c between commit
5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h
and slab.h includes to prepare for breaking implicit slab.h inclusion
from percpu.h") from Linus' tree and commit
750052dd2400cd09e0864d75b63c2c0bf605056f ("crypto: mv_cesa - Add sha1 and
hmac(sha1) async hash drivers") from the crypto tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/crypto/mv_cesa.c
index 6f29012,1cee5a9..0000000
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@@ -14,9 -14,14 +14,15 @@@
  #include <linux/kthread.h>
  #include <linux/platform_device.h>
  #include <linux/scatterlist.h>
 +#include <linux/slab.h>
+ #include <crypto/internal/hash.h>
+ #include <crypto/sha.h>
  
  #include "mv_cesa.h"
+ 
+ #define MV_CESA	"MV-CESA:"
+ #define MAX_HW_HASH_SIZE	0xFFFF
+ 
  /*
   * STM:
   *   /---------------------------------------\