Commit 1f594fe7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Paolo Abeni:
 "Including fixes from can, xfrm, bluetooth and netfilter.

  Current release - regressions:

   - ipv6: fix RCU splat in ipv6_route_seq_show()

   - wifi: iwlwifi: disable RFI feature

  Previous releases - regressions:

   - tcp: fix possible sk_priority leak in tcp_v4_send_reset()

   - tipc: do not update mtu if msg_max is too small in mtu negotiation

   - netfilter: fix null deref on element insertion

   - devlink: change per-devlink netdev notifier to static one

   - phylink: fix ksettings_set() ethtool call

   - wifi: mac80211: fortify the spinlock against deadlock by interrupt

   - wifi: brcmfmac: check for probe() id argument being NULL

   - eth: ice:
      - fix undersized tx_flags variable
      - fix ice VF reset during iavf initialization

   - eth: hns3: fix sending pfc frames after reset issue

  Previous releases - always broken:

   - xfrm: release all offloaded policy memory

   - nsh: use correct mac_offset to unwind gso skb in nsh_gso_segment()

   - vsock: avoid to close connected socket after the timeout

   - dsa: rzn1-a5psw: enable management frames for CPU port

   - eth: virtio_net: fix error unwinding of XDP initialization

   - eth: tun: fix memory leak for detached NAPI queue.

  Misc:

   - MAINTAINERS: sctp: move Neil to CREDITS"

* tag 'net-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (107 commits)
  MAINTAINERS: skip CCing netdev for Bluetooth patches
  mdio_bus: unhide mdio_bus_init prototype
  bridge: always declare tunnel functions
  atm: hide unused procfs functions
  net: isa: include net/Space.h
  Revert "ARM: dts: stm32: add CAN support on stm32f746"
  netfilter: nft_set_rbtree: fix null deref on element insertion
  netfilter: nf_tables: fix nft_trans type confusion
  netfilter: conntrack: define variables exp_nat_nla_policy and any_addr with CONFIG_NF_NAT
  net: wwan: t7xx: Ensure init is completed before system sleep
  net: selftests: Fix optstring
  net: pcs: xpcs: fix C73 AN not getting enabled
  net: wwan: iosm: fix NULL pointer dereference when removing device
  vlan: fix a potential uninit-value in vlan_dev_hard_start_xmit()
  mailmap: add entries for Nikolay Aleksandrov
  igb: fix bit_shift to be in [1..8] range
  net: dsa: mv88e6xxx: Fix mv88e6393x EPC write command offset
  cassini: Fix a memory leak in the error handling path of cas_init_one()
  tun: Fix memory leak for detached NAPI queue.
  can: kvaser_pciefd: Disable interrupts in probe error path
  ...
parents b802651b 6e42fae0

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -364,6 +364,11 @@ Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org> 
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>

Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>

Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>

Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>

Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1706,6 +1706,10 @@ S: Panoramastrasse 18 
S: D-69126 Heidelberg

S: Germany



N: Neil Horman

M: nhorman@tuxdriver.com

D: SCTP protocol maintainer.



N: Simon Horman

M: horms@verge.net.au

D: Renesas ARM/ARM64 SoC maintainer

Documentation/devicetree/bindings/net/can/st,stm32-bxcan.yaml

+15 −4
Original line number Diff line number Diff line
@@ -21,11 +21,22 @@ properties: 


  st,can-primary:

    description:

      Primary and secondary mode of the bxCAN peripheral is only relevant

      if the chip has two CAN peripherals. In that case they share some

      of the required logic.

      Primary mode of the bxCAN peripheral is only relevant if the chip has

      two CAN peripherals in dual CAN configuration. In that case they share

      some of the required logic.

      Not to be used if the peripheral is in single CAN configuration.

      To avoid misunderstandings, it should be noted that ST documentation

      uses the terms master/slave instead of primary/secondary.

      uses the terms master instead of primary.

    type: boolean



  st,can-secondary:

    description:

      Secondary mode of the bxCAN peripheral is only relevant if the chip

      has two CAN peripherals in dual CAN configuration. In that case they

      share some of the required logic.

      Not to be used if the peripheral is in single CAN configuration.

      To avoid misunderstandings, it should be noted that ST documentation

      uses the terms slave instead of secondary.

    type: boolean



  reg:

MAINTAINERS

+5 −2
Original line number Diff line number Diff line
@@ -6211,6 +6211,7 @@ X: Documentation/devicetree/ 
X:	Documentation/driver-api/media/

X:	Documentation/firmware-guide/acpi/

X:	Documentation/i2c/

X:	Documentation/netlink/

X:	Documentation/power/

X:	Documentation/spi/

X:	Documentation/userspace-api/media/
@@ -14566,6 +14567,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git 
F:	Documentation/devicetree/bindings/net/

F:	drivers/connector/

F:	drivers/net/

X:	drivers/net/wireless/

F:	include/dt-bindings/net/

F:	include/linux/etherdevice.h

F:	include/linux/fcdevice.h
@@ -14615,6 +14617,7 @@ B: mailto:netdev@vger.kernel.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git

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

F:	Documentation/core-api/netlink.rst

F:	Documentation/netlink/

F:	Documentation/networking/

F:	Documentation/process/maintainer-netdev.rst

F:	Documentation/userspace-api/netlink/
@@ -14629,6 +14632,7 @@ F: include/uapi/linux/netdevice.h 
F:	lib/net_utils.c

F:	lib/random32.c

F:	net/

X:	net/bluetooth/

F:	tools/net/

F:	tools/testing/selftests/net/








@@ -18842,12 +18846,11 @@ F:	drivers/target/







F:	include/target/

















SCTP PROTOCOL









M:	Neil Horman <nhorman@tuxdriver.com>









M:	Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>









M:	Xin Long <lucien.xin@gmail.com>









L:	linux-sctp@vger.kernel.org









S:	Maintained









W:	http://lksctp.sourceforge.net









W:	https://github.com/sctp/lksctp-tools/wiki









F:	Documentation/networking/sctp.rst









F:	include/linux/sctp.h









F:	include/net/sctp/

























arch/arm/boot/dts/stm32f429.dtsi



+1
−0






























Original line number
Diff line number
Diff line







@@ -387,6 +387,7 @@







			interrupt-names = "tx", "rx0", "rx1", "sce";









			resets = <&rcc STM32F4_APB1_RESET(CAN2)>;









			clocks = <&rcc 0 STM32F4_APB1_CLOCK(CAN2)>;









			st,can-secondary;









			st,gcan = <&gcan>;









			status = "disabled";









		};