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
  f866fbc842de ("ipv4: fix data-races around inet->inet_id")
  c274af224269 ("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
  e74216b8def3 ("bonding: fix macvlan over alb bond support")
  f11e5bd159b0 ("bonding: support balance-alb with openvswitch")

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

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

net/sctp/socket.c
  f866fbc842de ("ipv4: fix data-races around inet->inet_id")
  b09bde5c3554 ("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

..

aoe

aoe: make aoe_class a static const structure

2023-06-21 07:45:19 -06:00

drbd

genetlink: remove userhdr from struct genl_info

2023-08-15 14:54:44 -07:00

mtip32xx

block: replace fmode_t with a block-specific type for block open flags

2023-06-12 08:04:05 -06:00

null_blk

Merge branch '6.5/scsi-staging' into 6.5/scsi-fixes

2023-07-11 12:15:15 -04:00

rnbd

drivers/rnbd: restore sysfs interface to rnbd-client

2023-08-18 15:00:39 -06:00

xen-blkback

block: replace fmode_t with a block-specific type for block open flags

2023-06-12 08:04:05 -06:00

zram

zram: take device and not only bvec offset into account

2023-08-05 16:13:15 -06:00

amiflop.c

block: replace fmode_t with a block-specific type for block open flags

2023-06-12 08:04:05 -06:00

ataflop.c

block: replace fmode_t with a block-specific type for block open flags

2023-06-12 08:04:05 -06:00

brd.c

brd: use cond_resched instead of cond_resched_rcu

2023-06-14 11:13:07 -06:00

floppy.c

block: replace fmode_t with a block-specific type for block open flags

2023-06-12 08:04:05 -06:00

Kconfig

block: ublk: switch to ioctl command encoding

2023-04-18 20:13:30 -06:00

loop.c

loop: do not enforce max_loop hard limit by (new) default

2023-07-21 13:20:57 -06:00

Makefile

Revert "pktcdvd: remove driver."

2023-01-04 14:44:13 -07:00

n64cart.c

block: remove blk_cleanup_disk

2022-06-28 06:33:15 -06:00

nbd.c

block: replace fmode_t with a block-specific type for block open flags

2023-06-12 08:04:05 -06:00

pktcdvd.c

block: replace fmode_t with a block-specific type for block open flags

2023-06-12 08:04:05 -06:00

ps3disk.c

block: remove blk_cleanup_disk

2022-06-28 06:33:15 -06:00

ps3vram.c

ps3vram: remove bio splitting

2023-01-29 15:18:35 -07:00

rbd_types.h

libceph, rbd: replace zero-length array with flexible-array

2020-06-01 13:22:53 +02:00

rbd.c

rbd: prevent busy loop when requesting exclusive lock

2023-08-02 09:07:34 +02:00

sunvdc.c

block: replace fmode_t with a block-specific type for block open flags

2023-06-12 08:04:05 -06:00

swim3.c

swim3: fix the floppy_locked_ioctl prototype

2023-06-13 09:45:40 -06:00

swim_asm.S

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152

2019-05-30 11:26:32 -07:00

swim.c

swim: fix a missing FMODE_ -> BLK_OPEN_ conversion in floppy_open

2023-06-20 07:16:04 -06:00

ublk_drv.c

ublk: return -EINTR if breaking from waiting for existed users in DEL_DEV

2023-07-27 07:17:36 -06:00

virtio_blk.c

Merge branch '6.5/scsi-staging' into 6.5/scsi-fixes

2023-07-11 12:15:15 -04:00

xen-blkfront.c

for-6.5/block-2023-06-23

2023-06-26 12:47:20 -07:00

z2ram.c

block: replace fmode_t with a block-specific type for block open flags

2023-06-12 08:04:05 -06:00