linux-next: manual merge of the bpf-next tree with Linus' tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1698 bytes --]

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  kernel/bpf/cgroup.c

between commit:

  62039c30c19d ("bpf: Initialize storage pointers to NULL to prevent freeing garbage pointer")

from Linus' tree and commits:

  00c4eddf7ee5 ("bpf: Factor out cgroup storages operations")
  72ae26452e77 ("bpf: Implement bpf_link-based cgroup BPF program attachment")

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 kernel/bpf/cgroup.c
index 4f1472409ef8,80676fc00d81..000000000000
--- a/kernel/bpf/cgroup.c
+++ b/kernel/bpf/cgroup.c
@@@ -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;
  	int err;
  
  	if (((flags & BPF_F_ALLOW_OVERRIDE) && (flags & BPF_F_ALLOW_MULTI)) ||

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]