Jakub Kicinski 57ce6427e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Cross-merge networking fixes after downstream PR.

Conflicts:

include/net/inet_sock.h
  f866fbc842 ("ipv4: fix data-races around inet->inet_id")
  c274af2242 ("inet: introduce inet->inet_flags")
https://lore.kernel.org/all/679ddff6-db6e-4ff6-b177-574e90d0103d@tessares.net/

Adjacent changes:

drivers/net/bonding/bond_alb.c
  e74216b8de ("bonding: fix macvlan over alb bond support")
  f11e5bd159 ("bonding: support balance-alb with openvswitch")

drivers/net/ethernet/broadcom/bgmac.c
  d6499f0b7c ("net: bgmac: Return PTR_ERR() for fixed_phy_register()")
  23a14488ea ("net: bgmac: Fix return value check for fixed_phy_register()")

drivers/net/ethernet/broadcom/genet/bcmmii.c
  32bbe64a13 ("net: bcmgenet: Fix return value check for fixed_phy_register()")
  acf50d1adb ("net: bcmgenet: Return PTR_ERR() for fixed_phy_register()")

net/sctp/socket.c
  f866fbc842 ("ipv4: fix data-races around inet->inet_id")
  b09bde5c35 ("inet: move inet->mc_loop to inet->inet_frags")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2023-08-24 10:51:39 -07:00

..

c_can

can: c_can: Do not check for 0 return after calling platform_get_irq()

2023-08-02 08:19:20 +02:00

cc770

can: cc770_platform: Convert to platform remove callback returning void

2023-05-15 22:53:49 +02:00

ctucanfd

can: ctucanfd: Convert to platform remove callback returning void

2023-05-15 22:53:50 +02:00

dev

can: rx-offload: add can_rx_offload_get_echo_skb_queue_tail()

2023-07-28 09:45:25 +02:00

flexcan

can: flexcan: fix the return value handle for platform_get_irq()

2023-07-31 10:12:56 +02:00

ifi_canfd

can: Explicitly include correct DT includes, part 2

2023-07-28 08:49:52 +02:00

m_can

can: tcan4x5x: Add error messages in probe

2023-07-31 10:41:09 +02:00

mscan

can: mscan: mpc5xxx_can: Convert to platform remove callback returning void

2023-05-15 22:53:50 +02:00

peak_canfd

can: dev: fix skb drop check

2022-11-07 14:00:27 +01:00

rcar

can: Explicitly include correct DT includes, part 2

2023-07-28 08:49:52 +02:00

sja1000

can: Explicitly include correct DT includes, part 2

2023-07-28 08:49:52 +02:00

slcan

can: slcan: fix freed work crash

2022-12-07 10:32:24 +01:00

softing

can: softing: Convert to platform remove callback returning void

2023-05-15 22:53:51 +02:00

spi

can: rx-offload: rename rx_offload_get_echo_skb() -> can_rx_offload_get_echo_skb_queue_timestamp()

2023-07-28 09:45:24 +02:00

usb

can: esd_usb: Add support for esd CAN-USB/3

2023-08-03 09:24:30 +02:00

at91_can.c

can: at91_can: Convert to platform remove callback returning void

2023-05-15 22:53:49 +02:00

bxcan.c

can: Explicitly include correct DT includes, part 2

2023-07-28 08:49:52 +02:00

can327.c

can: can327: flush TX_work on ldisc .close()

2022-12-07 10:32:36 +01:00

grcan.c

can: Explicitly include correct DT includes

2023-07-19 08:55:28 +02:00

janz-ican3.c

can: janz-ican3: Convert to platform remove callback returning void

2023-05-15 22:53:50 +02:00

Kconfig

can: sun4i_can: Add support for the Allwinner D1

2023-07-28 08:47:18 +02:00

kvaser_pciefd.c

can: kvaser_pciefd: Add support for new Kvaser pciefd devices

2023-07-19 09:03:10 +02:00

Makefile

can: bxcan: add support for ST bxCAN controller

2023-03-28 11:43:36 +02:00

sun4i_can.c

can: Explicitly include correct DT includes, part 2

2023-07-28 08:49:52 +02:00

ti_hecc.c

can: rx-offload: rename rx_offload_get_echo_skb() -> can_rx_offload_get_echo_skb_queue_timestamp()

2023-07-28 09:45:24 +02:00

vcan.c

can: dev: add CAN XL support to virtual CAN

2022-09-15 09:08:09 +02:00

vxcan.c

net: validate veth and vxcan peer ifindexes

2023-08-20 11:40:03 +01:00

xilinx_can.c

can: xilinx_can: Add support for controller reset

2023-07-19 08:55:28 +02:00