Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.0-rc6+

Cross-merge BPF and other fixes after downstream PR.

Minor conflict in kernel/bpf/verifier.c

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc kernel/bpf/syscall.c
Simple merge

diff --cc kernel/bpf/verifier.c
index a431b7d50e1b831ebe503c3c90f86127782722c5,e3814152b52f8139a5565b2e4ac1b80d82d1ea65..5434b162c9309d22818097f318ba71e49eeeba12
--- 1/kernel/bpf/verifier.c
--- 2/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@@ -20094,8 -19937,18 +20116,13 @@@ static bool regsafe(struct bpf_verifier
                 * since someone could have accessed through (ptr - k), or
                 * even done ptr -= k in a register, to get a safe access.
                 */
-               if (rold->range > rcur->range)
+               if (rold->range < 0 || rcur->range < 0) {
+                       /* special case for [BEYOND|AT]_PKT_END */
+                       if (rold->range != rcur->range)
+                               return false;
+               } else if (rold->range > rcur->range) {
                        return false;
 -              /* If the offsets don't match, we can't trust our alignment;
 -               * nor can we be sure that we won't fall out of range.
 -               */
 -              if (rold->off != rcur->off)
 -                      return false;
+               }
                /* id relations must be preserved */
                if (!check_ids(rold->id, rcur->id, idmap))
                        return false;

diff --cc net/ipv6/addrconf.c
Simple merge