linux-next: manual merge of the bitmap tree with the parisc-hd tree

[Stephen Rothwell]

Hi all,

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

  arch/parisc/include/asm/bitops.h

between commit:

  ac0e561e5069 ("parisc: Drop ifdef __KERNEL__ from non-uapi kernel headers")

from the parisc-hd tree and commit:

  a7c7d06a49d6 ("include: move find.h from asm_generic to linux")

from the bitmap 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/parisc/include/asm/bitops.h
index daa2afd974fb,c7a9997ac9cb..000000000000
--- a/arch/parisc/include/asm/bitops.h
+++ b/arch/parisc/include/asm/bitops.h
@@@ -203,7 -205,11 +203,6 @@@ static __inline__ int fls(unsigned int 
  #include <asm-generic/bitops/hweight.h>
  #include <asm-generic/bitops/lock.h>
  #include <asm-generic/bitops/sched.h>
- #include <asm-generic/bitops/find.h>
 -
 -#endif /* __KERNEL__ */
 -
 -#ifdef __KERNEL__
 -
  #include <asm-generic/bitops/le.h>
  #include <asm-generic/bitops/ext2-atomic-setbit.h>

Attachment: pgp0bHCO8AhEX.pgp
Description: OpenPGP digital signature