Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

Pull networking updates from David Miller:

 1) Support 6Ghz band in ath11k driver, from Rajkumar Manoharan.

 2) Support UDP segmentation in code TSO code, from Eric Dumazet.

 3) Allow flashing different flash images in cxgb4 driver, from Vishal
    Kulkarni.

 4) Add drop frames counter and flow status to tc flower offloading,
    from Po Liu.

 5) Support n-tuple filters in cxgb4, from Vishal Kulkarni.

 6) Various new indirect call avoidance, from Eric Dumazet and Brian
    Vazquez.

 7) Fix BPF verifier failures on 32-bit pointer arithmetic, from
    Yonghong Song.

 8) Support querying and setting hardware address of a port function via
    devlink, use this in mlx5, from Parav Pandit.

 9) Support hw ipsec offload on bonding slaves, from Jarod Wilson.

10) Switch qca8k driver over to phylink, from Jonathan McDowell.

11) In bpftool, show list of processes holding BPF FD references to
    maps, programs, links, and btf objects. From Andrii Nakryiko.

12) Several conversions over to generic power management, from Vaibhav
    Gupta.

13) Add support for SO_KEEPALIVE et al. to bpf_setsockopt(), from Dmitry
    Yakunin.

14) Various https url conversions, from Alexander A. Klimov.

15) Timestamping and PHC support for mscc PHY driver, from Antoine
    Tenart.

16) Support bpf iterating over tcp and udp sockets, from Yonghong Song.

17) Support 5GBASE-T i40e NICs, from Aleksandr Loktionov.

18) Add kTLS RX HW offload support to mlx5e, from Tariq Toukan.

19) Fix the ->ndo_start_xmit() return type to be netdev_tx_t in several
    drivers. From Luc Van Oostenryck.

20) XDP support for xen-netfront, from Denis Kirjanov.

21) Support receive buffer autotuning in MPTCP, from Florian Westphal.

22) Support EF100 chip in sfc driver, from Edward Cree.

23) Add XDP support to mvpp2 driver, from Matteo Croce.

24) Support MPTCP in sock_diag, from Paolo Abeni.

25) Commonize UDP tunnel offloading code by creating udp_tunnel_nic
    infrastructure, from Jakub Kicinski.

26) Several pci_ --> dma_ API conversions, from Christophe JAILLET.

27) Add FLOW_ACTION_POLICE support to mlxsw, from Ido Schimmel.

28) Add SK_LOOKUP bpf program type, from Jakub Sitnicki.

29) Refactor a lot of networking socket option handling code in order to
    avoid set_fs() calls, from Christoph Hellwig.

30) Add rfc4884 support to icmp code, from Willem de Bruijn.

31) Support TBF offload in dpaa2-eth driver, from Ioana Ciornei.

32) Support XDP_REDIRECT in qede driver, from Alexander Lobakin.

33) Support PCI relaxed ordering in mlx5 driver, from Aya Levin.

34) Support TCP syncookies in MPTCP, from Flowian Westphal.

35) Fix several tricky cases of PMTU handling wrt. briding, from Stefano
    Brivio.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (2056 commits)
  net: thunderx: initialize VF's mailbox mutex before first usage
  usb: hso: remove bogus check for EINPROGRESS
  usb: hso: no complaint about kmalloc failure
  hso: fix bailout in error case of probe
  ip_tunnel_core: Fix build for archs without _HAVE_ARCH_IPV6_CSUM
  selftests/net: relax cpu affinity requirement in msg_zerocopy test
  mptcp: be careful on subflow creation
  selftests: rtnetlink: make kci_test_encap() return sub-test result
  selftests: rtnetlink: correct the final return value for the test
  net: dsa: sja1105: use detected device id instead of DT one on mismatch
  tipc: set ub->ifindex for local ipv6 address
  ipv6: add ipv6_dev_find()
  net: openvswitch: silence suspicious RCU usage warning
  Revert "vxlan: fix tos value before xmit"
  ptp: only allow phase values lower than 1 period
  farsync: switch from 'pci_' to 'dma_' API
  wan: wanxl: switch from 'pci_' to 'dma_' API
  hv_netvsc: do not use VF device if link is down
  dpaa2-eth: Fix passing zero to 'PTR_ERR' warning
  net: macb: Properly handle phylink on at91sam9x
  ...

diff --cc Documentation/bpf/index.rst
index 0f60b95e83c402da843895b6919a9394ae6e9749,44ca8ea5a7231889eabaf64034084ce18ead02ee..d46429be334ea2021497b6476c146392c8f1b2ef
--- 1/Documentation/bpf/index.rst
--- 2/Documentation/bpf/index.rst
+++ b/Documentation/bpf/index.rst
@@@ -58,16 -67,8 +67,16 @@@ Testing and debugging BP
     s390
  
  
 +Other
 +=====
 +
 +.. toctree::
 +   :maxdepth: 1
 +
 +   ringbuf
 +
  .. Links:
- .. _Documentation/networking/filter.rst: ../networking/filter.txt
+ .. _networking-filter: ../networking/filter.rst
  .. _man-pages: https://www.kernel.org/doc/man-pages/
- .. _bpf(2): http://man7.org/linux/man-pages/man2/bpf.2.html
- .. _BPF and XDP Reference Guide: http://cilium.readthedocs.io/en/latest/bpf/
+ .. _bpf(2): https://man7.org/linux/man-pages/man2/bpf.2.html
+ .. _BPF and XDP Reference Guide: https://docs.cilium.io/en/latest/bpf/

diff --cc Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
Simple merge

diff --cc Documentation/driver-api/index.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
index 09c1bd1fcb644581b097e4711004e010b1effc61,253c579aae831b0a95d2133fc3d61f8c2a33e57b..5cfc3481207fc700e9cfc46acf0e16c0ef69d688
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -511,9 -511,9 +512,9 @@@ GCC_PLUGINS_CFLAGS :
  CLANG_FLAGS :=
  
  export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC
- export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE LEX YACC AWK INSTALLKERNEL
+ export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL
  export PERL PYTHON PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX
 -export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ
 +export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD
  export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE
  
  export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS

diff --cc arch/arm64/include/asm/unistd32.h
Simple merge

diff --cc arch/mips/kernel/syscalls/syscall_n32.tbl
Simple merge

diff --cc arch/mips/kernel/syscalls/syscall_o32.tbl
Simple merge

diff --cc arch/parisc/kernel/syscalls/syscall.tbl
Simple merge

diff --cc arch/powerpc/kernel/syscalls/syscall.tbl
Simple merge

diff --cc arch/s390/kernel/syscalls/syscall.tbl
Simple merge

diff --cc arch/s390/net/bpf_jit_comp.c
Simple merge

diff --cc arch/sparc/kernel/syscalls/syscall.tbl
Simple merge

diff --cc arch/x86/entry/syscalls/syscall_32.tbl
Simple merge

diff --cc arch/x86/entry/syscalls/syscall_64.tbl
Simple merge

diff --cc crypto/af_alg.c
Simple merge

diff --cc crypto/algif_aead.c
Simple merge

diff --cc crypto/algif_skcipher.c
Simple merge

diff --cc drivers/atm/zatm.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
Simple merge

diff --cc drivers/net/ethernet/neterion/s2io.c
Simple merge

diff --cc drivers/net/ethernet/sun/cassini.c
Simple merge

diff --cc drivers/net/ethernet/sun/niu.c
Simple merge

diff --cc drivers/net/thunderbolt.c
Simple merge

diff --cc drivers/net/wan/farsync.c
Simple merge

diff --cc drivers/net/wireless/broadcom/b43/phy_n.c
Simple merge

diff --cc drivers/net/wireless/broadcom/b43legacy/main.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlegacy/4965-mac.c
Simple merge

diff --cc drivers/ssb/driver_chipcommon.c
Simple merge

diff --cc fs/debugfs/file.c
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc include/linux/mmc/sdio_ids.h
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/linux/perf_event.h
Simple merge

diff --cc include/linux/phylink.h
Simple merge

diff --cc include/linux/syscalls.h
Simple merge

diff --cc include/net/flow_offload.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc include/uapi/asm-generic/unistd.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc net/bridge/netfilter/ebtables.c
Simple merge

diff --cc net/compat.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/dccp/options.c
Simple merge

diff --cc net/ipv6/ip6_flowlabel.c
index 73bb047e60371263d332723e4e8eb784e407977d,2d655260dedc75692b3067c6b3e5f5a8501b90fb..aa673a6a7e4328d03e89527ed3daaccd69c39084
--- 1/net/ipv6/ip6_flowlabel.c
--- 2/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@@ -533,181 -534,185 +534,185 @@@ int ipv6_flowlabel_opt_get(struct sock 
        return -ENOENT;
  }
  
- int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen)
+ #define socklist_dereference(__sflp) \
+       rcu_dereference_protected(__sflp, lockdep_is_held(&ip6_sk_fl_lock))
+ 
+ static int ipv6_flowlabel_put(struct sock *sk, struct in6_flowlabel_req *freq)
  {
-       int err;
-       struct net *net = sock_net(sk);
        struct ipv6_pinfo *np = inet6_sk(sk);
-       struct in6_flowlabel_req freq;
-       struct ipv6_fl_socklist *sfl1 = NULL;
-       struct ipv6_fl_socklist *sfl;
        struct ipv6_fl_socklist __rcu **sflp;
-       struct ip6_flowlabel *fl, *fl1 = NULL;
+       struct ipv6_fl_socklist *sfl;
  
+       if (freq->flr_flags & IPV6_FL_F_REFLECT) {
+               if (sk->sk_protocol != IPPROTO_TCP)
+                       return -ENOPROTOOPT;
+               if (!np->repflow)
+                       return -ESRCH;
+               np->flow_label = 0;
+               np->repflow = 0;
+               return 0;
+       }
  
-       if (optlen < sizeof(freq))
-               return -EINVAL;
+       spin_lock_bh(&ip6_sk_fl_lock);
+       for (sflp = &np->ipv6_fl_list;
+            (sfl = socklist_dereference(*sflp)) != NULL;
+            sflp = &sfl->next) {
+               if (sfl->fl->label == freq->flr_label)
+                       goto found;
+       }
+       spin_unlock_bh(&ip6_sk_fl_lock);
+       return -ESRCH;
+ found:
+       if (freq->flr_label == (np->flow_label & IPV6_FLOWLABEL_MASK))
+               np->flow_label &= ~IPV6_FLOWLABEL_MASK;
+       *sflp = sfl->next;
+       spin_unlock_bh(&ip6_sk_fl_lock);
+       fl_release(sfl->fl);
+       kfree_rcu(sfl, rcu);
+       return 0;
+ }
  
-       if (copy_from_user(&freq, optval, sizeof(freq)))
-               return -EFAULT;
+ static int ipv6_flowlabel_renew(struct sock *sk, struct in6_flowlabel_req *freq)
+ {
+       struct ipv6_pinfo *np = inet6_sk(sk);
+       struct net *net = sock_net(sk);
+       struct ipv6_fl_socklist *sfl;
+       int err;
  
-       switch (freq.flr_action) {
-       case IPV6_FL_A_PUT:
-               if (freq.flr_flags & IPV6_FL_F_REFLECT) {
-                       if (sk->sk_protocol != IPPROTO_TCP)
-                               return -ENOPROTOOPT;
-                       if (!np->repflow)
-                               return -ESRCH;
-                       np->flow_label = 0;
-                       np->repflow = 0;
-                       return 0;
-               }
-               spin_lock_bh(&ip6_sk_fl_lock);
-               for (sflp = &np->ipv6_fl_list;
-                    (sfl = rcu_dereference_protected(*sflp,
-                                                     lockdep_is_held(&ip6_sk_fl_lock))) != NULL;
-                    sflp = &sfl->next) {
-                       if (sfl->fl->label == freq.flr_label) {
-                               if (freq.flr_label == (np->flow_label&IPV6_FLOWLABEL_MASK))
-                                       np->flow_label &= ~IPV6_FLOWLABEL_MASK;
-                               *sflp = sfl->next;
-                               spin_unlock_bh(&ip6_sk_fl_lock);
-                               fl_release(sfl->fl);
-                               kfree_rcu(sfl, rcu);
-                               return 0;
-                       }
+       rcu_read_lock_bh();
+       for_each_sk_fl_rcu(np, sfl) {
+               if (sfl->fl->label == freq->flr_label) {
+                       err = fl6_renew(sfl->fl, freq->flr_linger,
+                                       freq->flr_expires);
+                       rcu_read_unlock_bh();
+                       return err;
                }
-               spin_unlock_bh(&ip6_sk_fl_lock);
-               return -ESRCH;
+       }
+       rcu_read_unlock_bh();
  
-       case IPV6_FL_A_RENEW:
-               rcu_read_lock_bh();
-               for_each_sk_fl_rcu(np, sfl) {
-                       if (sfl->fl->label == freq.flr_label) {
-                               err = fl6_renew(sfl->fl, freq.flr_linger, freq.flr_expires);
-                               rcu_read_unlock_bh();
-                               return err;
-                       }
-               }
-               rcu_read_unlock_bh();
+       if (freq->flr_share == IPV6_FL_S_NONE &&
+           ns_capable(net->user_ns, CAP_NET_ADMIN)) {
+               struct ip6_flowlabel *fl = fl_lookup(net, freq->flr_label);
  
-               if (freq.flr_share == IPV6_FL_S_NONE &&
-                   ns_capable(net->user_ns, CAP_NET_ADMIN)) {
-                       fl = fl_lookup(net, freq.flr_label);
-                       if (fl) {
-                               err = fl6_renew(fl, freq.flr_linger, freq.flr_expires);
-                               fl_release(fl);
-                               return err;
-                       }
+               if (fl) {
+                       err = fl6_renew(fl, freq->flr_linger,
+                                       freq->flr_expires);
+                       fl_release(fl);
+                       return err;
                }
-               return -ESRCH;
- 
-       case IPV6_FL_A_GET:
-               if (freq.flr_flags & IPV6_FL_F_REFLECT) {
-                       struct net *net = sock_net(sk);
-                       if (net->ipv6.sysctl.flowlabel_consistency) {
-                               net_info_ratelimited("Can not set IPV6_FL_F_REFLECT if flowlabel_consistency sysctl is enable\n");
-                               return -EPERM;
-                       }
+       }
+       return -ESRCH;
+ }
  
-                       if (sk->sk_protocol != IPPROTO_TCP)
-                               return -ENOPROTOOPT;
+ static int ipv6_flowlabel_get(struct sock *sk, struct in6_flowlabel_req *freq,
+               sockptr_t optval, int optlen)
+ {
+       struct ipv6_fl_socklist *sfl, *sfl1 = NULL;
+       struct ip6_flowlabel *fl, *fl1 = NULL;
+       struct ipv6_pinfo *np = inet6_sk(sk);
+       struct net *net = sock_net(sk);
 -      int uninitialized_var(err);
++      int err;
  
-                       np->repflow = 1;
-                       return 0;
+       if (freq->flr_flags & IPV6_FL_F_REFLECT) {
+               if (net->ipv6.sysctl.flowlabel_consistency) {
+                       net_info_ratelimited("Can not set IPV6_FL_F_REFLECT if flowlabel_consistency sysctl is enable\n");
+                       return -EPERM;
                }
  
-               if (freq.flr_label & ~IPV6_FLOWLABEL_MASK)
-                       return -EINVAL;
+               if (sk->sk_protocol != IPPROTO_TCP)
+                       return -ENOPROTOOPT;
+               np->repflow = 1;
+               return 0;
+       }
  
-               if (net->ipv6.sysctl.flowlabel_state_ranges &&
-                   (freq.flr_label & IPV6_FLOWLABEL_STATELESS_FLAG))
-                       return -ERANGE;
+       if (freq->flr_label & ~IPV6_FLOWLABEL_MASK)
+               return -EINVAL;
+       if (net->ipv6.sysctl.flowlabel_state_ranges &&
+           (freq->flr_label & IPV6_FLOWLABEL_STATELESS_FLAG))
+               return -ERANGE;
  
-               fl = fl_create(net, sk, &freq, optval, optlen, &err);
-               if (!fl)
-                       return err;
-               sfl1 = kmalloc(sizeof(*sfl1), GFP_KERNEL);
+       fl = fl_create(net, sk, freq, optval, optlen, &err);
+       if (!fl)
+               return err;
  
-               if (freq.flr_label) {
-                       err = -EEXIST;
-                       rcu_read_lock_bh();
-                       for_each_sk_fl_rcu(np, sfl) {
-                               if (sfl->fl->label == freq.flr_label) {
-                                       if (freq.flr_flags&IPV6_FL_F_EXCL) {
-                                               rcu_read_unlock_bh();
-                                               goto done;
-                                       }
-                                       fl1 = sfl->fl;
-                                       if (!atomic_inc_not_zero(&fl1->users))
-                                               fl1 = NULL;
-                                       break;
+       sfl1 = kmalloc(sizeof(*sfl1), GFP_KERNEL);
+ 
+       if (freq->flr_label) {
+               err = -EEXIST;
+               rcu_read_lock_bh();
+               for_each_sk_fl_rcu(np, sfl) {
+                       if (sfl->fl->label == freq->flr_label) {
+                               if (freq->flr_flags & IPV6_FL_F_EXCL) {
+                                       rcu_read_unlock_bh();
+                                       goto done;
                                }
+                               fl1 = sfl->fl;
+                               if (!atomic_inc_not_zero(&fl1->users))
+                                       fl1 = NULL;
+                               break;
                        }
-                       rcu_read_unlock_bh();
+               }
+               rcu_read_unlock_bh();
  
-                       if (!fl1)
-                               fl1 = fl_lookup(net, freq.flr_label);
-                       if (fl1) {
+               if (!fl1)
+                       fl1 = fl_lookup(net, freq->flr_label);
+               if (fl1) {
  recheck:
-                               err = -EEXIST;
-                               if (freq.flr_flags&IPV6_FL_F_EXCL)
-                                       goto release;
-                               err = -EPERM;
-                               if (fl1->share == IPV6_FL_S_EXCL ||
-                                   fl1->share != fl->share ||
-                                   ((fl1->share == IPV6_FL_S_PROCESS) &&
-                                    (fl1->owner.pid != fl->owner.pid)) ||
-                                   ((fl1->share == IPV6_FL_S_USER) &&
-                                    !uid_eq(fl1->owner.uid, fl->owner.uid)))
-                                       goto release;
- 
-                               err = -ENOMEM;
-                               if (!sfl1)
-                                       goto release;
-                               if (fl->linger > fl1->linger)
-                                       fl1->linger = fl->linger;
-                               if ((long)(fl->expires - fl1->expires) > 0)
-                                       fl1->expires = fl->expires;
-                               fl_link(np, sfl1, fl1);
-                               fl_free(fl);
-                               return 0;
+                       err = -EEXIST;
+                       if (freq->flr_flags&IPV6_FL_F_EXCL)
+                               goto release;
+                       err = -EPERM;
+                       if (fl1->share == IPV6_FL_S_EXCL ||
+                           fl1->share != fl->share ||
+                           ((fl1->share == IPV6_FL_S_PROCESS) &&
+                            (fl1->owner.pid != fl->owner.pid)) ||
+                           ((fl1->share == IPV6_FL_S_USER) &&
+                            !uid_eq(fl1->owner.uid, fl->owner.uid)))
+                               goto release;
+ 
+                       err = -ENOMEM;
+                       if (!sfl1)
+                               goto release;
+                       if (fl->linger > fl1->linger)
+                               fl1->linger = fl->linger;
+                       if ((long)(fl->expires - fl1->expires) > 0)
+                               fl1->expires = fl->expires;
+                       fl_link(np, sfl1, fl1);
+                       fl_free(fl);
+                       return 0;
  
  release:
-                               fl_release(fl1);
-                               goto done;
-                       }
-               }
-               err = -ENOENT;
-               if (!(freq.flr_flags&IPV6_FL_F_CREATE))
-                       goto done;
- 
-               err = -ENOMEM;
-               if (!sfl1)
+                       fl_release(fl1);
                        goto done;
+               }
+       }
+       err = -ENOENT;
+       if (!(freq->flr_flags & IPV6_FL_F_CREATE))
+               goto done;
  
-               err = mem_check(sk);
-               if (err != 0)
-                       goto done;
+       err = -ENOMEM;
+       if (!sfl1)
+               goto done;
  
-               fl1 = fl_intern(net, fl, freq.flr_label);
-               if (fl1)
-                       goto recheck;
+       err = mem_check(sk);
+       if (err != 0)
+               goto done;
  
-               if (!freq.flr_label) {
-                       if (copy_to_user(&((struct in6_flowlabel_req __user *) optval)->flr_label,
-                                        &fl->label, sizeof(fl->label))) {
-                               /* Intentionally ignore fault. */
-                       }
-               }
+       fl1 = fl_intern(net, fl, freq->flr_label);
+       if (fl1)
+               goto recheck;
  
-               fl_link(np, sfl1, fl);
-               return 0;
+       if (!freq->flr_label) {
+               size_t offset = offsetof(struct in6_flowlabel_req, flr_label);
  
-       default:
-               return -EINVAL;
+               if (copy_to_sockptr_offset(optval, offset, &fl->label,
+                               sizeof(fl->label))) {
+                       /* Intentionally ignore fault. */
+               }
        }
  
+       fl_link(np, sfl1, fl);
+       return 0;
  done:
        fl_free(fl);
        kfree(sfl1);

diff --cc net/mptcp/crypto.c
index 82bd2b54d7413b9e3091076f2d325d77cca25846,6c4ea979dfd41d3ea4915e066077d817b0c16e94..05d398d3fde40aa1c3e728d031fdb5aa1608d5be
--- 1/net/mptcp/crypto.c
--- 2/net/mptcp/crypto.c
+++ b/net/mptcp/crypto.c
@@@ -75,68 -82,11 +75,9 @@@ void mptcp_crypto_hmac_sha(u64 key1, u6
        for (i = 0; i < 8; i++)
                input[i + 8] ^= key2be[i];
  
 -      sha256_init(&state);
 -      sha256_update(&state, input, SHA256_BLOCK_SIZE + SHA256_DIGEST_SIZE);
 -      sha256_final(&state, (u8 *)hmac);
 +      sha256(input, SHA256_BLOCK_SIZE + SHA256_DIGEST_SIZE, hmac);
  }
  
- #ifdef CONFIG_MPTCP_HMAC_TEST
- struct test_cast {
-       char *key;
-       char *msg;
-       char *result;
- };
- 
- /* we can't reuse RFC 4231 test vectors, as we have constraint on the
-  * input and key size.
-  */
- static struct test_cast tests[] = {
-       {
-               .key = "0b0b0b0b0b0b0b0b",
-               .msg = "48692054",
-               .result = "8385e24fb4235ac37556b6b886db106284a1da671699f46db1f235ec622dcafa",
-       },
-       {
-               .key = "aaaaaaaaaaaaaaaa",
-               .msg = "dddddddd",
-               .result = "2c5e219164ff1dca1c4a92318d847bb6b9d44492984e1eb71aff9022f71046e9",
-       },
-       {
-               .key = "0102030405060708",
-               .msg = "cdcdcdcd",
-               .result = "e73b9ba9969969cefb04aa0d6df18ec2fcc075b6f23b4d8c4da736a5dbbc6e7d",
-       },
- };
- 
- static int __init test_mptcp_crypto(void)
- {
-       char hmac[32], hmac_hex[65];
-       u32 nonce1, nonce2;
-       u64 key1, key2;
-       u8 msg[8];
-       int i, j;
- 
-       for (i = 0; i < ARRAY_SIZE(tests); ++i) {
-               /* mptcp hmap will convert to be before computing the hmac */
-               key1 = be64_to_cpu(*((__be64 *)&tests[i].key[0]));
-               key2 = be64_to_cpu(*((__be64 *)&tests[i].key[8]));
-               nonce1 = be32_to_cpu(*((__be32 *)&tests[i].msg[0]));
-               nonce2 = be32_to_cpu(*((__be32 *)&tests[i].msg[4]));
- 
-               put_unaligned_be32(nonce1, &msg[0]);
-               put_unaligned_be32(nonce2, &msg[4]);
- 
-               mptcp_crypto_hmac_sha(key1, key2, msg, 8, hmac);
-               for (j = 0; j < 32; ++j)
-                       sprintf(&hmac_hex[j << 1], "%02x", hmac[j] & 0xff);
-               hmac_hex[64] = 0;
- 
-               if (memcmp(hmac_hex, tests[i].result, 64))
-                       pr_err("test %d failed, got %s expected %s", i,
-                              hmac_hex, tests[i].result);
-               else
-                       pr_info("test %d [ ok ]", i);
-       }
-       return 0;
- }
- 
- late_initcall(test_mptcp_crypto);
+ #if IS_MODULE(CONFIG_MPTCP_KUNIT_TESTS)
+ EXPORT_SYMBOL_GPL(mptcp_crypto_hmac_sha);
  #endif

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/netfilter/x_tables.c
Simple merge

diff --cc net/sched/sch_cake.c
Simple merge

diff --cc net/sched/sch_cbq.c
Simple merge

diff --cc net/sched/sch_fq_codel.c
Simple merge

diff --cc net/sched/sch_fq_pie.c
Simple merge

diff --cc net/sched/sch_hfsc.c
Simple merge

diff --cc net/sched/sch_htb.c
Simple merge

diff --cc net/sched/sch_sfq.c
Simple merge

diff --cc tools/bpf/Makefile
Simple merge

diff --cc tools/include/linux/compiler.h
Simple merge

diff --cc tools/testing/selftests/Makefile
Simple merge