iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
747ba8783a
linux/drivers/staging
History
Jakub Kicinski fecc51559a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 
Cross-merge networking fixes after downstream PR.

Conflicts:

net/ipv4/udp.c
  f796feabb9 ("udp: add local "peek offset enabled" flag")
  56667da739 ("net: implement lockless setsockopt(SO_PEEK_OFF)")

Adjacent changes:

net/unix/garbage.c
  aa82ac51d6 ("af_unix: Drop oob_skb ref before purging queue in GC.")
  11498715f2 ("af_unix: Remove io_uring code for GC.")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-02-22 15:29:26 -08:00
..
axis-fifo staging: Explicitly include correct DT includes 2023-07-27 10:01:07 +02:00
board
emxx_udc
fbtft Staging driver updates for 6.7-rc1 2023-11-03 15:31:04 -10:00
fieldbus staging: fieldbus: make controller_class constant 2023-10-06 15:38:17 +02:00
gdm724x staging: gdm724x: Add blank line after declaration 2023-10-21 12:00:24 +02:00
greybus staging: greybus: Don't let i2c adapters declare I2C_CLASS_SPD support if they support I2C_CLASS_HWMON 2024-01-18 21:10:41 +01:00
iio staging: iio: ad5933: fix type mismatch regression 2024-01-27 16:00:02 +00:00
ks7010 staging: ks7010: disable bh on tx_dev_lock 2023-10-05 09:58:12 +02:00
media media: atomisp: Adjust for v4l2_subdev_state handling changes in 6.8 2024-02-01 13:47:52 +01:00
most staging: Explicitly include correct DT includes 2023-07-27 10:01:07 +02:00
nvec
octeon Revert "staging: octeon: remove typedef in enum cvmx_spi_mode_t" 2023-10-30 09:56:27 +01:00
olpc_dcon staging: olpc_dcon: Remove I2C_CLASS_DDC support 2023-10-27 13:10:05 +02:00
pi433 staging: pi433: make pi433_class constant 2023-10-06 15:38:34 +02:00
rtl8192e Staging: rtl8192e: Rename variable OpMode 2024-01-04 14:34:51 +01:00
rtl8712 staging: rtl8712: fix open parentheses alignment 2023-12-23 14:09:31 +01:00
rtl8723bs Staging driver updates for 6.7-rc1 2023-11-03 15:31:04 -10:00
rts5208 staging: rts5208: Remove macros scsi_lock(), scsi_unlock() 2023-10-15 18:20:35 +02:00
sm750fb staging/sm750fb: Initialize fb_ops with fbdev macros 2023-11-29 12:20:41 +01:00
vc04_services staging: vc04_services: vchiq_dev: Use %p to log pointer address 2023-12-09 15:06:35 +01:00
vme_user staging: vme_user: print more detailed infomation when an error occurs 2024-01-04 14:32:40 +01:00
vt6655 wifi: mac80211: introduce 'channel request' 2024-02-08 13:07:34 +01:00
vt6656 wifi: mac80211: introduce 'channel request' 2024-02-08 13:07:34 +01:00
wlan-ng staging: wlan-ng: remove function prism2sta_ev_txexc 2023-10-17 15:43:52 +02:00
Kconfig staging: qlge: Retire the driver 2023-10-21 11:52:54 +02:00
Makefile staging: qlge: Retire the driver 2023-10-21 11:52:54 +02:00