From: Luca Boccassi <bluca@debian.org>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Networking <netdev@vger.kernel.org>,
David Miller <davem@davemloft.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 net tree
Date: Wed, 27 Mar 2019 09:26:02 +0000 [thread overview]
Message-ID: <df699947253913a7e572fd1252b99e594431e261.camel@debian.org> (raw)
In-Reply-To: <20190327015623.ur46t5gdmraagi2q@ast-mbp>
On Tue, 2019-03-26 at 18:56 -0700, Alexei Starovoitov wrote:
> On Wed, Mar 27, 2019 at 09:14:37AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the bpf-next tree got a conflict in:
> >
> > tools/lib/bpf/Makefile
> >
> > between commit:
> >
> > 1d382264d911 ("bpf, libbpf: fix version info and add it to shared
> > object")
> >
> > from the net tree and commit:
> >
> > 60e4786e229d ("tools/bpf: generate pkg-config file for libbpf")
> >
> > 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.
>
> argh. that's a heavy conflict.
> Since that patch was at the top of the bpf-next I removed it for now
> and will re-apply when bpf-next gets merged cleanly into net-next and
> we bring back net changes into bpf-next. Sorry Luca.
No worries - for the next time, should I have based the patch on net-
next rather than bpf-next?
--
Kind regards,
Luca Boccassi
next prev parent reply other threads:[~2019-03-27 9:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-26 22:14 linux-next: manual merge of the bpf-next tree with the net tree Stephen Rothwell
2019-03-27 1:56 ` Alexei Starovoitov
2019-03-27 9:26 ` Luca Boccassi [this message]
2019-03-27 15:15 ` Alexei Starovoitov
2019-10-13 23:32 Stephen Rothwell
2019-10-15 23:30 ` Stephen Rothwell
2019-12-19 23:23 Stephen Rothwell
2020-07-22 3:21 Stephen Rothwell
2020-07-22 12:17 ` Jakub Sitnicki
2020-07-22 14:42 ` Kuniyuki Iwashima
2020-07-22 15:02 ` Jakub Sitnicki
2020-07-22 15:05 ` Willem de Bruijn
2020-07-22 15:25 ` Jakub Sitnicki
2020-07-22 15:49 ` Willem de Bruijn
2020-07-22 17:14 ` Alexei Starovoitov
2020-07-23 2:11 ` Stephen Rothwell
2022-08-25 1:00 Stephen Rothwell
2022-09-01 1:11 Stephen Rothwell
2022-11-15 23:10 Stephen Rothwell
2024-03-28 1:55 Stephen Rothwell
2024-03-28 1:57 ` Alexei Starovoitov
2024-04-29 1:49 Stephen Rothwell
2024-04-29 18:56 ` Jakub Kicinski
2024-04-29 21:17 ` Daniel Borkmann
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=df699947253913a7e572fd1252b99e594431e261.camel@debian.org \
--to=bluca@debian.org \
--cc=alexei.starovoitov@gmail.com \
--cc=ast@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=sfr@canb.auug.org.au \
/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).