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:   Mon, 6 Jan 2020 09:32:46 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul@pwsan.com>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the risc-v tree with Linus' tree
Message-ID: <20200106093246.6abbb7e9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/2ywFS/t0S6j3w=iZbYIrd+8";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/2ywFS/t0S6j3w=iZbYIrd+8
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  Documentation/riscv/patch-acceptance.rst

between commit:

  0e194d9da198 ("Documentation: riscv: add patch acceptance guidelines")

from Linus' tree and commit:

  d89a1a16d7dc ("Documentation: riscv: add patch acceptance guidelines")

from the risc-v tree.

I fixed it up (I used the version from Linus' tree as that was committed
later) 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_/2ywFS/t0S6j3w=iZbYIrd+8
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl4SZA4ACgkQAVBC80lX
0GzovQgAlDsPfmHcXwByPHIKH6zevu/q/QYmgw/mSYdbgqWuWzZVCaRYGf2t7sGh
9DuHoIoTXpvSxvCwkzZ1ORvxkGaa3LzA6x+K/eHdBae+6N9tz0yNRMa28lqjoig/
1LpAZeHQh3ftDj8UdRTjK5b4RYNDCeC73k4GPhlziblzVQblVbM8FfQNKdFJFd/A
vDY3Q76Hz72M7nkp0i37nGV4ixVUIKSlBYzeSR8EsvQLg74IVwHca9V5wM3Bw1bN
67bGzsGPpzvZl/ixApXiFZrN9Dgnk5ajV3Zmdm80fWoBPeipVnAmB4YOa0L6UWIp
7jgSv1qgPDATIYOq4f/AhRIQUbTxOA==
=63bB
-----END PGP SIGNATURE-----

--Sig_/2ywFS/t0S6j3w=iZbYIrd+8--