Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 19 Nov 2019 18:30:42 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        "Paul E. McKenney" <paulmck@kernel.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Marco Elver <elver@google.com>,
        Changbin Du <changbin.du@gmail.com>
Subject: linux-next: manual merge of the akpm tree with the rcu tree
Message-ID: <20191119183042.5839ef00@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/_hR6Fp7Gfqy9qwEi=8GpZ+4";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/_hR6Fp7Gfqy9qwEi=8GpZ+4
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  lib/Kconfig.debug

between commit:

  dfd402a4c4ba ("kcsan: Add Kernel Concurrency Sanitizer infrastructure")

from the rcu tree and commit:

  fa95a0eadaa7 ("kernel-hacking: group sysrq/kgdb/ubsan into 'Generic Kerne=
l Debugging Instruments'")

from the akpm tree.

I fixed it up (I added kcsan into the above) 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_/_hR6Fp7Gfqy9qwEi=8GpZ+4
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3TmiIACgkQAVBC80lX
0GzPDQgAj7kCqnHJhjTLuBPq21A9KCUChICb9fOfHSHd6eVeDiCrh+n4EscHpr4R
Ygg6Nqb6ii8Qnd20QHyIGIcl2tfxrAj5vAQtZSxtzemtQTP9Uj2CQQXk6eEOkOIk
faF3qCFwClrraLKsoncDL7JBMZxHPR9tRbi82deMmKHjGUq1GX2qY0d3FoVnxP6n
ZbPy1Z6qx4SnzBncKwhxfXBuh7N/LIDrteUlAjnOSlxfHKsdtzU0pQolmgURIFDU
rTc5nHnL7jfimhkDMeoVbiV4t548PhkJtT2BMeP7P3xlN3q0kloSDOYaPVJfkmdH
ediptw8lx/N7ESV+W9gaD9aQlOcVgA==
=ImMS
-----END PGP SIGNATURE-----

--Sig_/_hR6Fp7Gfqy9qwEi=8GpZ+4--