Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 1 Jul 2020 11:34:48 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "Paul E. McKenney" <paulmck@kernel.org>,
        Masahiro Yamada <masahiroy@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>
Subject: linux-next: manual merge of the rcu tree with the kbuild tree
Message-ID: <20200701113448.3119f64f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/LbbdNw.r9ne.vHhmNn7xx/+";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/LbbdNw.r9ne.vHhmNn7xx/+
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:

  kernel/kcsan/Makefile

between commit:

  f7c28e224da6 ("kbuild: remove cc-option test of -fno-stack-protector")

from the kbuild tree and commits:

  2839a232071f ("kcsan: Simplify compiler flags")
  61d56d7aa5ec ("kcsan: Disable branch tracing in core runtime")

from the rcu tree.

I fixed it up (I just used the rcu tree version) 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_/LbbdNw.r9ne.vHhmNn7xx/+
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl776DgACgkQAVBC80lX
0GzUyAf/b6pF4g88e7Ygc0CBSiGjsiSuBCPQdWRXNWgkSmeii+0Cu3nBmIHVaQNT
BaN8HlMEk2wdKsjrZPqNaaSwamLeI3mpT5eS9tgkrL9VG2H/xGzvDgSVZ5TKMRmW
FKODItOD8FDK+PCjFduJMuqYPlAE/6RdGDpCd3Dk9S3SsqNNf9nqyfDSoGZg3P4o
+7yhdcy1Ir2gqfxOah9Y8kW6ImLrgRymgkFb41f39vxHESVVDyrste7jvUODHvoH
zTFJv7WF4Tl244AASgpg8NyZpkbE9GtQgAjJ0/SYdmbu+7WrODjvYEOqR6sbpLa5
ccXryN/SStERFQfVTOaWEq/ahPYmRg==
=IDEy
-----END PGP SIGNATURE-----

--Sig_/LbbdNw.r9ne.vHhmNn7xx/+--