From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>, bpf <bpf@vger.kernel.org>,
Networking <netdev@vger.kernel.org>,
Bagas Sanjaya <bagasdotme@gmail.com>,
David Vernet <void@manifault.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the bpf tree
Date: Fri, 10 Mar 2023 11:38:18 +1100 [thread overview]
Message-ID: <20230310113818.3f27de45@canb.auug.org.au> (raw)
In-Reply-To: <20230307095812.236eb1be@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1817 bytes --]
Hi all,
On Tue, 7 Mar 2023 09:58:12 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> Documentation/bpf/bpf_devel_QA.rst
>
> between commit:
>
> b7abcd9c656b ("bpf, doc: Link to submitting-patches.rst for general patch submission info")
>
> from the bpf tree and commit:
>
> d56b0c461d19 ("bpf, docs: Fix link to netdev-FAQ target")
>
> from the bpf-next tree.
>
> I fixed it up (see below) 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/bpf/bpf_devel_QA.rst
> index b421d94dc9f2,5f5f9ccc3862..000000000000
> --- a/Documentation/bpf/bpf_devel_QA.rst
> +++ b/Documentation/bpf/bpf_devel_QA.rst
> @@@ -684,8 -684,12 +684,8 @@@ when
>
>
> .. Links
> - .. _netdev-FAQ: Documentation/process/maintainer-netdev.rst
> -.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
> + .. _netdev-FAQ: https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html
> .. _selftests:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/
> -.. _Documentation/dev-tools/kselftest.rst:
> - https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html
> -.. _Documentation/bpf/btf.rst: btf.rst
>
> Happy BPF hacking!
This is now a conflict between the net-next tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-03-10 0:38 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-06 22:58 linux-next: manual merge of the bpf-next tree with the bpf tree Stephen Rothwell
2023-03-10 0:38 ` Stephen Rothwell [this message]
2023-03-10 3:18 ` Bagas Sanjaya
-- strict thread matches above, loose matches on Subject: below --
2024-03-07 1:40 Stephen Rothwell
2022-11-21 1:27 Stephen Rothwell
2022-08-26 1:46 Stephen Rothwell
2022-08-25 0:50 Stephen Rothwell
2022-08-22 1:01 Stephen Rothwell
2021-12-05 23:39 Stephen Rothwell
2020-09-30 4:07 Stephen Rothwell
2020-10-02 3:59 ` Stephen Rothwell
2020-06-26 0:05 Stephen Rothwell
2020-07-06 1:43 ` Stephen Rothwell
2020-05-15 3:18 Stephen Rothwell
2019-10-08 22:47 Stephen Rothwell
2019-10-15 23:29 ` Stephen Rothwell
2019-10-07 22:48 Stephen Rothwell
2019-10-15 23:27 ` Stephen Rothwell
2019-04-17 1:08 Stephen Rothwell
2019-04-24 3:12 ` Stephen Rothwell
2018-12-04 1:09 Stephen Rothwell
2018-12-04 1:05 Stephen Rothwell
2018-11-12 0:54 Stephen Rothwell
2018-05-14 1:57 Stephen Rothwell
2018-05-14 20:41 ` Jakub Kicinski
2018-05-14 21:57 ` Stephen Rothwell
2018-05-02 2:09 Stephen Rothwell
2018-05-02 4:40 ` Song Liu
2018-05-02 5:50 ` Stephen Rothwell
2018-05-02 6:05 ` Song Liu
2018-04-26 0:53 Stephen Rothwell
2018-04-26 7:57 ` Daniel Borkmann
2018-02-26 0:41 Stephen Rothwell
2018-02-26 9:03 ` Daniel Borkmann
2018-02-26 23:28 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230310113818.3f27de45@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bagasdotme@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=void@manifault.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).