linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: "Björn Töpel" <bjorn.topel@gmail.com>
Cc: sfr@canb.auug.org.au, "Daniel Borkmann" <daniel@iogearbox.net>,
	ast@kernel.org, Netdev <netdev@vger.kernel.org>,
	linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	"Björn Töpel" <bjorn.topel@intel.com>
Subject: Re: linux-next: build failure after merge of the bpf-next tree
Date: Thu, 6 Sep 2018 22:45:20 -0700	[thread overview]
Message-ID: <20180907054518.jnnckempmerazwwh@ast-mbp.dhcp.thefacebook.com> (raw)
In-Reply-To: <CAJ+HfNgRd5ztzwJ9HtgnrDyf8F0ykODY_EGC91d9KiAfDbhcXA@mail.gmail.com>

On Fri, Sep 07, 2018 at 07:21:05AM +0200, Björn Töpel wrote:
> Den fre 7 sep. 2018 kl 02:23 skrev Alexei Starovoitov
> <alexei.starovoitov@gmail.com>:
> >
> > On Fri, Sep 07, 2018 at 10:19:23AM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > After merging the bpf-next tree, today's linux-next build (powerpc
> > > ppc64_defconfig) failed like this:
> > >
> > > ERROR: ".xsk_reuseq_swap" [drivers/net/ethernet/intel/i40e/i40e.ko] undefined!
> > > ERROR: ".xsk_reuseq_free" [drivers/net/ethernet/intel/i40e/i40e.ko] undefined!
> > > ERROR: ".xsk_reuseq_prepare" [drivers/net/ethernet/intel/i40e/i40e.ko] undefined
> > >
> > > Caused by commit
> > >
> > >   9654bd10da60 ("i40e: clean zero-copy XDP Rx ring on shutdown/reset")
> > >
> > > CONFIG_XDP_SOCKETS is not set for this build.
> > >
> > > I have used the version of the bfp-next tree from next-20180906 for today.
> >
> > merge conflict and build error...
> > Bjorn, I'm thinking to toss the patches out of bpf-next and reapply
> > cleaned up version of the patches...
> > what do you think?
> >
> 
> Yes, do that. I'll get back with a cleaned up v2.

Done.

Unfortunately during interactive rebase that removed your commits git didn't
preserve merge commits that came after yours,
so Jesper's and Yonghong's cover letters are not in the git history.
Yet all patches are in the same order.
Explicit revert with trail in the git history would have been worse.
patchworks + git isn't the most convenient workflow. sigh.

  reply	other threads:[~2018-09-07  5:45 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-07  0:19 linux-next: build failure after merge of the bpf-next tree Stephen Rothwell
2018-09-07  0:22 ` Alexei Starovoitov
2018-09-07  5:21   ` Björn Töpel
2018-09-07  5:45     ` Alexei Starovoitov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-03-19 23:26 Stephen Rothwell
2023-03-20 12:07 ` Alexander Lobakin
2023-03-21 22:35   ` Stephen Rothwell
2022-07-20  1:59 Stephen Rothwell
2022-07-20  3:42 ` Alexei Starovoitov
2022-07-20  3:44   ` Stanislav Fomichev
2022-04-19  1:56 Stephen Rothwell
2022-04-21  0:32 ` Stephen Rothwell
2022-04-21  9:45   ` Daniel Borkmann
2022-04-21 10:40     ` Maciej Fijalkowski
2022-02-09  0:21 Stephen Rothwell
2021-12-03  0:15 Stephen Rothwell
2021-09-14  1:37 Stephen Rothwell
2021-09-14 23:25 ` Andrii Nakryiko
2021-09-14 23:38   ` Stephen Rothwell
2021-09-14 23:40     ` Andrii Nakryiko
2021-09-14 23:59       ` Stephen Rothwell
2021-09-15  1:27         ` Alexei Starovoitov
2021-08-26  1:50 Stephen Rothwell
2021-08-26  2:01 ` Daniel Xu
2021-03-11  0:47 Stephen Rothwell
2021-03-11  6:47 ` Björn Töpel
2021-03-12  1:00   ` Stephen Rothwell
2021-03-26  1:18     ` Stephen Rothwell
2020-12-01  8:07 Stephen Rothwell
2020-12-01 14:55 ` Daniel Borkmann
2020-09-08  3:08 Stephen Rothwell
2020-09-08 17:54 ` Andrii Nakryiko
2020-08-21  1:11 Stephen Rothwell
2020-08-25  1:20 ` Stephen Rothwell
2020-08-25  1:25   ` Alexei Starovoitov
2020-08-25  3:04     ` Stephen Rothwell
2020-08-25  3:27       ` Alexei Starovoitov
2020-08-25  6:50         ` Stephen Rothwell
2020-08-25 14:33           ` Alexei Starovoitov
2020-08-25 21:10             ` Stephen Rothwell
2020-08-25 22:34               ` Alexei Starovoitov
2020-08-25 23:09                 ` Stephen Rothwell
2020-07-14  2:22 Stephen Rothwell
2020-07-14  6:16 ` Jiri Olsa
2020-07-14  8:31   ` Jiri Olsa
2020-07-14  9:19     ` Geert Uytterhoeven
2019-07-01  4:57 Stephen Rothwell
2019-07-01  5:01 ` Stephen Rothwell
2019-04-18  1:57 Stephen Rothwell
2019-02-28  1:31 Stephen Rothwell
2019-02-28  2:18 ` Alexei Starovoitov
2018-10-03  3:18 Stephen Rothwell
2018-10-03  5:29 ` Joe Stringer
2017-12-13  1:32 Stephen Rothwell
2017-12-13  1:47 ` Alexei Starovoitov

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=20180907054518.jnnckempmerazwwh@ast-mbp.dhcp.thefacebook.com \
    --to=alexei.starovoitov@gmail.com \
    --cc=ast@kernel.org \
    --cc=bjorn.topel@gmail.com \
    --cc=bjorn.topel@intel.com \
    --cc=daniel@iogearbox.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).