Received-SPF: pass (google.com: domain of linux-kernel+bounces-144491-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Mon, 15 Apr 2024 12:32:47 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel.org>, Palmer Dabbelt
 <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com>
Cc: Leonardo Bras <leobras@redhat.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Palmer Dabbelt <palmer@rivosinc.com>, Yujie
 Liu <yujie.liu@intel.com>
Subject: linux-next: manual merge of the rcu tree with the risc-v tree
Message-ID: <20240415123247.0d27eb39@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/6_AXiiHatTihk3suI47_m1t";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/6_AXiiHatTihk3suI47_m1t
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/riscv/include/asm/cmpxchg.h

between commits:

  07a0a41cb77d ("riscv/cmpxchg: Deduplicate cmpxchg() asm and macros")
  54280ca64626 ("riscv/cmpxchg: Implement cmpxchg for variables of size 1 a=
nd 2")

from the risc-v tree and commit:

  b5e49f1af563 ("riscv: Emulate one-byte cmpxchg")

from the rcu tree.

I fixed it up (I just used the former as the latter seems to no longer be
needed - I also undid the change to arch/riscv/Kconfig from the latter)
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_/6_AXiiHatTihk3suI47_m1t
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYckc8ACgkQAVBC80lX
0GxC2gf+JNExjXUcrttlNnOwyZXsicjF4f2W2MBiIqqqOvnUs5Q9cQp+Ufb7+4C8
XTw1+7a93rbdbTk4RLnJRQ+E8xDPAQubfrk0RwoGWeLNqsiTDMuqIHTFqN4Wi1QX
HloJX/0KR4uPPt2nivLOC/JQF41+0NTB6GP3yWP4dcXM2DXjxL7XaHYLhaaQwLzZ
c6C8Hy+GRgt55uYqybQ59w12aTQ6ULYhlg8YuzD1AAVYwMAm4hnpAY5bH1UIKcEO
0qRXkKwWXnzM+wJF2iHHc/aA4SmHEGvm6pGE8S1rHVXsFyOa7ZZsD/ZuDGwJdTXk
v0lZrxeQ7Y/H1MpTabV+bErHoyrRnA==
=V3Jf
-----END PGP SIGNATURE-----

--Sig_/6_AXiiHatTihk3suI47_m1t--