Received-SPF: pass (google.com: domain of linux-kernel+bounces-167268-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Fri, 3 May 2024 15:52:15 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Yury Norov <yury.norov@gmail.com>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: Kuan-Wei Chiu <visitorckw@gmail.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the bitmap tree with the mm tree
Message-ID: <20240503155215.22466d02@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/YZV15e6mYmmMAUJv8W==.nI";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/YZV15e6mYmmMAUJv8W==.nI
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  include/linux/bitops.h

between commit:

  120c5991cbae ("bitops: optimize fns() for improved performance")

from the mm-nonmm-unstable branch of the mm tree and commit:

  1b6ef2812522 ("bitops: Optimize fns() for improved performance")

from the bitmap tree.

I fixed it up (I just used the latter as it had a more recent date) 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/YZV15e6mYmmMAUJv8W==.nI
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY0e48ACgkQAVBC80lX
0Gz5Egf/eYAbNTYsz/C3Kc7MaH8QeQ/NEeIbg0h2DEjLMVw+Pq7svMNoDfWGRVF4
juGqithBjsasmEXIgwbywbHDV2/qiNwyx7e7xOEeNiMfyYQYG+FwIUg6Ofb8CMd3
1xKFutyurfwBSYQ/k0gKiirgFturj8Rl0Qooy/88I1zWzkGik31IZxNeQjmHrIdw
JBNwD5fSjVAdkJJdzYxrX+USnmTU3J9EqkwaISz6hnVd8HikH0MF2IJP7MRD3RbP
lUxJBd+8SCxwnq0G4GlK0tC3zQ6k5EgtFj6i5y2EIBx8YqzBg3oDi2ej4jc2mm6Z
MIOsflMzsMJQM08ItrH3HhT42a4OOQ==
=L3us
-----END PGP SIGNATURE-----

--Sig_/YZV15e6mYmmMAUJv8W==.nI--