From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org,
bpf@vger.kernel.org, kernel-team@fb.com
Subject: Re: pull-request: bpf-next 2020-03-30
Date: Mon, 30 Mar 2020 20:11:05 -0700 [thread overview]
Message-ID: <20200331031105.qxzwapskpykmeou2@ast-mbp> (raw)
In-Reply-To: <20200330.195400.784625163425445502.davem@davemloft.net>
On Mon, Mar 30, 2020 at 07:54:00PM -0700, David Miller wrote:
> From: Alexei Starovoitov <ast@kernel.org>
> Date: Mon, 30 Mar 2020 18:28:15 -0700
>
> > The following pull-request contains BPF updates for your *net-next* tree.
> >
> > We've added 73 non-merge commits during the last 14 day(s) which contain
> > a total of 107 files changed, 6086 insertions(+), 1728 deletions(-).
> >
> > The main changes are:
> ...
> > Please consider pulling these changes from:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
>
> Pulled, there was a minor merge conflict in the cgroup changes, which I
> resolved like this:
>
> @@@ -305,10 -418,9 +421,9 @@@ int __cgroup_bpf_attach(struct cgroup *
> u32 saved_flags = (flags & (BPF_F_ALLOW_OVERRIDE | BPF_F_ALLOW_MULTI));
> struct list_head *progs = &cgrp->bpf.progs[type];
> struct bpf_prog *old_prog = NULL;
> - struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE],
> - *old_storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {NULL};
> + struct bpf_cgroup_storage *storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {};
> + struct bpf_cgroup_storage *old_storage[MAX_BPF_CGROUP_STORAGE_TYPE] = {};
> - struct bpf_prog_list *pl, *replace_pl = NULL;
> - enum bpf_cgroup_storage_type stype;
> + struct bpf_prog_list *pl;
Right. Forgot to mention this merge conflict.
The resolution is correct.
Same as what Stephen did here:
https://lore.kernel.org/lkml/20200331114005.5e2fc6f7@canb.auug.org.au/
Thanks!
prev parent reply other threads:[~2020-03-31 3:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-31 1:28 pull-request: bpf-next 2020-03-30 Alexei Starovoitov
2020-03-31 2:54 ` David Miller
2020-03-31 3:11 ` Alexei Starovoitov [this message]
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=20200331031105.qxzwapskpykmeou2@ast-mbp \
--to=alexei.starovoitov@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/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).