From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0509C4CECE for ; Fri, 13 Mar 2020 20:16:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C202D20637 for ; Fri, 13 Mar 2020 20:16:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727350AbgCMUQp (ORCPT ); Fri, 13 Mar 2020 16:16:45 -0400 Received: from 6.mo69.mail-out.ovh.net ([46.105.50.107]:58786 "EHLO 6.mo69.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726480AbgCMUQp (ORCPT ); Fri, 13 Mar 2020 16:16:45 -0400 X-Greylist: delayed 478 seconds by postgrey-1.27 at vger.kernel.org; Fri, 13 Mar 2020 16:16:44 EDT Received: from player788.ha.ovh.net (unknown [10.110.208.43]) by mo69.mail-out.ovh.net (Postfix) with ESMTP id 70795888D8 for ; Fri, 13 Mar 2020 21:08:45 +0100 (CET) Received: from sk2.org (82-65-25-201.subs.proxad.net [82.65.25.201]) (Authenticated sender: steve@sk2.org) by player788.ha.ovh.net (Postfix) with ESMTPSA id C03D510713CE3; Fri, 13 Mar 2020 20:08:31 +0000 (UTC) Date: Fri, 13 Mar 2020 21:08:24 +0100 From: Stephen Kitt To: Alexei Starovoitov Cc: Stephen Rothwell , Daniel Borkmann , Alexei Starovoitov , Networking , Jonathan Corbet , Linux Next Mailing List , Linux Kernel Mailing List 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: References: <20200313135850.2329f480@canb.auug.org.au> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/2PzWJQucE+G5Q=dyzzxVk2k"; protocol="application/pgp-signature" X-Ovh-Tracer-Id: 16739035391216012653 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedugedruddvjedgudeffecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpeffhffvuffkjghfofggtgesghdtreerredtjeenucfhrhhomhepufhtvghphhgvnhcumfhithhtuceoshhtvghvvgesshhkvddrohhrgheqnecukfhppedtrddtrddtrddtpdekvddrieehrddvhedrvddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehplhgrhigvrhejkeekrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepshhtvghvvgesshhkvddrohhrghdprhgtphhtthhopehlihhnuhigqdhkvghrnhgvlhesvhhgvghrrdhkvghrnhgvlhdrohhrgh Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --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 wrote: > On Thu, Mar 12, 2020 at 7:59 PM Stephen Rothwell > 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--