linux-next: manual merge of the i2c tree with the asm-generic tree
Hi Wolfram, Today's linux-next merge of the i2c tree got a conflict in: arch/blackfin/mach-bf561/boards/acvilon.c between commit: 120090af2745 ("arch: remove blackfin port") from the asm-generic tree and commit: eb49778c8c6c ("i2c: pca-platform: drop gpio from platform data") from the i2c tree. I fixed it up (I 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 pgpJfUu18n4Li.pgp Description: OpenPGP digital signature
linux-next: manual merge of the i2c tree with the asm-generic tree
Hi Wolfram, Today's linux-next merge of the i2c tree got a conflict in: arch/blackfin/mach-bf561/boards/acvilon.c between commit: 120090af2745 ("arch: remove blackfin port") from the asm-generic tree and commit: eb49778c8c6c ("i2c: pca-platform: drop gpio from platform data") from the i2c tree. I fixed it up (I 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 pgpJfUu18n4Li.pgp Description: OpenPGP digital signature