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:   Fri, 13 Mar 2020 21:08:24 +0100
From:   Stephen Kitt <steve@sk2.org>
To:     Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Alexei Starovoitov <ast@kernel.org>,
        Networking <netdev@vger.kernel.org>,
        Jonathan Corbet <corbet@lwn.net>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the jc_docs
 tree
Message-ID: <20200313210824.177688ba@heffalump.sk2.org>
In-Reply-To: <CAADnVQ+r3hMEtqbkhm1j9HyXYxSNihbX=VCR9erUGXoE72Pwsg@mail.gmail.com>
References: <20200313135850.2329f480@canb.auug.org.au>
        <CAADnVQ+r3hMEtqbkhm1j9HyXYxSNihbX=VCR9erUGXoE72Pwsg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
 boundary="Sig_/2PzWJQucE+G5Q=dyzzxVk2k"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/2PzWJQucE+G5Q=dyzzxVk2k
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

On Fri, 13 Mar 2020 12:51:54 -0700, Alexei Starovoitov
<alexei.starovoitov@gmail.com> wrote:
> On Thu, Mar 12, 2020 at 7:59 PM Stephen Rothwell <sfr@canb.auug.org.au>
> wrote:
> > Today's linux-next merge of the bpf-next tree got a conflict in:
> >
> >   Documentation/admin-guide/sysctl/kernel.rst
> >
> > between commit:
> >
> >   a3cb66a50852 ("docs: pretty up sysctl/kernel.rst")
> >
> > from the jc_docs tree and commit:
> >
> >   c480a3b79cbc ("docs: sysctl/kernel: Document BPF entries")
> >
> > from the bpf-next tree. =20
>=20
> I dropped this commit from bpf-next, since it causes unnecessary conflict=
s.
> Please steer it via Jon's tree.

OK, I=E2=80=99ll do that.

Regards,

Stephen

--Sig_/2PzWJQucE+G5Q=dyzzxVk2k
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQIzBAEBCgAdFiEEnPVX/hPLkMoq7x0ggNMC9Yhtg5wFAl5r6DgACgkQgNMC9Yht
g5y4KA/+OXRIzjiG6db3rZOSUGlJes+prq9WGuRY85rB7yud6Ohfj9RAITPQkFjv
uDfvkiI8ctrDhJ3dAo06dG9GPj8S0PHHoig5jKBvXQ/cHPHeeDpAvXXM/1PUFENC
mDt3KZQ+XfiJjThCx40/cNmEnEYJUX93KlheJddmJplZzdbFOnHZ/Ww9dfE88yH7
4xByXsy8IBgCZ+JLwOAawC3TICOTGi96mgrkhCvwFzUI7HeU0Y6VRKV5SiP/hW1B
+3yrgxTRPKzZcQfTgsXaeY6141+FSaTDQrGtM02THs6+IKwjcPcZCSG0EHROxWds
jvZxJIph2+il4L0Sqw89xx0TG7lYmrqnpmHDFUYx0NqeGlAcxeLhSVKfDPCCdSDu
LYWk+whzj5zoZjqYK5Twhw34S3ScQPC8dtcIico9plGsLur7iwajAHpO0JyTlmh/
CBTHY2JHaY7SKzaBoBx1dsQcM6phNx3+WEIZY91JKXZkIK2aMmYdVH1bfEAvoGDH
lcGCT5YWWxkG1DbLT6h5BnXHg196xR2e4wLagDTYnbd0KueEf70v7GFUf3o2Pg7Y
FRwtvpt3AZejSK7ScKyZ/mAi85XFuAU5hmrzvpciJXzQWTfC0tey98QkwzJ1Q05s
/Gf11/7pLXNQXzVOw5kiYQMbgGwhbUtrR+YSU++apusiEv4hD3k=
=o9fM
-----END PGP SIGNATURE-----

--Sig_/2PzWJQucE+G5Q=dyzzxVk2k--