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, 12 May 2021 15:04:48 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        "Paul E. McKenney" <paulmck@kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Yury Norov <yury.norov@gmail.com>
Subject: linux-next: manual merge of the akpm-current tree with the rcu tree
Message-ID: <20210512150448.05728739@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/5X2=ANOdhwM.8dxjZDOsfCd";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/5X2=ANOdhwM.8dxjZDOsfCd
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Documentation/admin-guide/kernel-parameters.rst

between commit:

  b18def121f07 ("bitmap_parse: Support 'all' semantics")

from the rcu tree and commit:

  458a0b70b496 ("bitmap_parse: support 'all' semantics")

from the akpm-current tree.

I fixed it up (I just use the latter 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_/5X2=ANOdhwM.8dxjZDOsfCd
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmCbYfAACgkQAVBC80lX
0GyFoAf/ZuBpFpkJHErfw50H2+grJA0R2x8C8NMD54yEWYDPMzyuFZeb/XXU/EXz
Ly9HomCItgjUFK7ExC0qblUxjxd4qI/5XdMUXWSZ4v94NqKDS2/jd8qnedBW7vnu
jQedkzWcKFUWq4eNaIkDVLNGwkqLxZfWCPWfUQq/mMdu/kIQBueye9C7dupD55qB
A2QT4PlhOYuJ2brlqHp03TG0CVMbXlxcM9Qo+ds5FFX7WXgwKo+pfTShGw/bnobb
ItbYrftPXXPtdqSzWwmC9If2IAJQDJrUMr5YVMPGVoZZ92d2s1ttHtRnMwI8/waL
5x4IKcdf8aZo/atr0L9kIYd7s1Q4XQ==
=axzZ
-----END PGP SIGNATURE-----

--Sig_/5X2=ANOdhwM.8dxjZDOsfCd--