From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Apr 2020 21:52:29 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v5.10.7~2790
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8372665b4b96d6a818b2693dd49236d5f9c8bc2;p=platform%2Fkernel%2Flinux-rpi.git

Merge git://git./linux/kernel/git/netdev/net

Pull networking fixes from David Miller:

 1) Disable RISCV BPF JIT builds when !MMU, from Björn Töpel.

 2) nf_tables leaves dangling pointer after free, fix from Eric Dumazet.

 3) Out of boundary write in __xsk_rcv_memcpy(), fix from Li RongQing.

 4) Adjust icmp6 message source address selection when routes have a
    preferred source address set, from Tim Stallard.

 5) Be sure to validate HSR protocol version when creating new links,
    from Taehee Yoo.

 6) CAP_NET_ADMIN should be sufficient to manage l2tp tunnels even in
    non-initial namespaces, from Michael Weiß.

 7) Missing release firmware call in mlx5, from Eran Ben Elisha.

 8) Fix variable type in macsec_changelink(), caught by KASAN. Fix from
    Taehee Yoo.

 9) Fix pause frame negotiation in marvell phy driver, from Clemens
    Gruber.

10) Record RX queue early enough in tun packet paths such that XDP
    programs will see the correct RX queue index, from Gilberto Bertin.

11) Fix double unlock in mptcp, from Florian Westphal.

12) Fix offset overflow in ARM bpf JIT, from Luke Nelson.

13) marvell10g needs to soft reset PHY when coming out of low power
    mode, from Russell King.

14) Fix MTU setting regression in stmmac for some chip types, from
    Florian Fainelli.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (101 commits)
  amd-xgbe: Use __napi_schedule() in BH context
  mISDN: make dmril and dmrim static
  net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes
  net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode
  tipc: fix incorrect increasing of link window
  Documentation: Fix tcp_challenge_ack_limit default value
  net: tulip: make early_486_chipsets static
  dt-bindings: net: ethernet-phy: add desciption for ethernet-phy-id1234.d400
  ipv6: remove redundant assignment to variable err
  net/rds: Use ERR_PTR for rds_message_alloc_sgs()
  net: mscc: ocelot: fix untagged packet drops when enslaving to vlan aware bridge
  selftests/bpf: Check for correct program attach/detach in xdp_attach test
  libbpf: Fix type of old_fd in bpf_xdp_set_link_opts
  libbpf: Always specify expected_attach_type on program load if supported
  xsk: Add missing check on user supplied headroom size
  mac80211: fix channel switch trigger from unknown mesh peer
  mac80211: fix race in ieee80211_register_hw()
  net: marvell10g: soft-reset the PHY when coming out of low power
  net: marvell10g: report firmware version
  net/cxgb4: Check the return from t4_query_params properly
  ...
---

c8372665b4b96d6a818b2693dd49236d5f9c8bc2
diff --cc arch/riscv/Kconfig
index a197258,bd35ac7..62f7bfe
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -55,12 -55,9 +55,12 @@@ config RISC
  	select ARCH_HAS_PTE_SPECIAL
  	select ARCH_HAS_MMIOWB
  	select ARCH_HAS_DEBUG_VIRTUAL
- 	select HAVE_EBPF_JIT
+ 	select HAVE_EBPF_JIT if MMU
  	select EDAC_SUPPORT
  	select ARCH_HAS_GIGANTIC_PAGE
 +	select ARCH_HAS_SET_DIRECT_MAP
 +	select ARCH_HAS_SET_MEMORY
 +	select ARCH_HAS_STRICT_KERNEL_RWX
  	select ARCH_WANT_HUGE_PMD_SHARE if 64BIT
  	select SPARSEMEM_STATIC if 32BIT
  	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT if MMU