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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20211022174816.68d0e2b2@canb.auug.org.au>
Date:   Fri, 22 Oct 2021 17:48:16 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Yury Norov <yury.norov@...il.com>, Helge Deller <deller@....de>,
        Parisc List <linux-parisc@...r.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the bitmap tree with the parisc-hd tree

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>
  

Content of type "application/pgp-signature" skipped