3
0
Fork 0
forked from mirrors/linux
kernel/net/bluetooth
Paolo Abeni 941defcea7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.14-rc6).

Conflicts:

tools/testing/selftests/drivers/net/ping.py
  75cc19c8ff ("selftests: drv-net: add xdp cases for ping.py")
  de94e86974 ("selftests: drv-net: store addresses in dict indexed by ipver")
https://lore.kernel.org/netdev/20250311115758.17a1d414@canb.auug.org.au/

net/core/devmem.c
  a70f891e0f ("net: devmem: do not WARN conditionally after netdev_rx_queue_restart()")
  1d22d3060b ("net: drop rtnl_lock for queue_mgmt operations")
https://lore.kernel.org/netdev/20250313114929.43744df1@canb.auug.org.au/

Adjacent changes:

tools/testing/selftests/net/Makefile
  6f50175cca ("selftests: Add IPv6 link-local address generation tests for GRE devices.")
  2e5584e0f9 ("selftests/net: expand cmsg_ipv6.sh with ipv4")

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  661958552e ("eth: bnxt: do not use BNXT_VNIC_NTUPLE unconditionally in queue restart logic")
  fe96d717d3 ("bnxt_en: Extend queue stop/start for TX rings")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2025-03-13 23:08:11 +01:00
..
bnep Bluetooth: bnep: fix wild-memory-access in proto_unregister 2024-10-16 16:10:03 -04:00
cmtp Bluetooth: CMTP: Mark BT_CMTP as DEPRECATED 2024-09-10 13:07:08 -04:00
hidp HID: intel-thc: fix CONFIG_HID dependency 2025-02-03 10:56:43 +01:00
rfcomm Revert "Bluetooth: hci_core: Fix sleeping function called from invalid context" 2025-03-07 13:03:05 -05:00
6lowpan.c net: move misc netdev_lock flavors to a separate header 2025-03-08 09:06:50 -08:00
af_bluetooth.c Including fixes from netfiler, xfrm and bluetooth. 2024-10-24 16:43:50 -07:00
aosp.c
aosp.h
coredump.c move asm/unaligned.h to linux/unaligned.h 2024-10-02 17:23:23 -04:00
ecdh_helper.c
ecdh_helper.h
eir.c Bluetooth: Fix eir name length 2024-03-08 10:22:17 -05:00
eir.h move asm/unaligned.h to linux/unaligned.h 2024-10-02 17:23:23 -04:00
hci_codec.c
hci_codec.h
hci_conn.c Bluetooth: ISO: Send BIG Create Sync via hci_sync 2024-11-14 15:39:59 -05:00
hci_core.c Revert "Bluetooth: hci_core: Fix sleeping function called from invalid context" 2025-03-07 13:03:05 -05:00
hci_debugfs.c Bluetooth: Remove hci_request.{c,h} 2024-07-15 10:11:35 -04:00
hci_debugfs.h
hci_event.c Bluetooth: hci_event: Fix enabling passive scanning 2025-03-07 12:43:30 -05:00
hci_sock.c Bluetooth: Improve setsockopt() handling of malformed user input 2024-12-11 11:54:57 -05:00
hci_sync.c Bluetooth: hci: Remove deadcode 2025-01-15 10:32:20 -05:00
hci_sysfs.c Bluetooth: Allow reset via sysfs 2025-01-15 10:37:07 -05:00
iso.c Revert "Bluetooth: hci_core: Fix sleeping function called from invalid context" 2025-03-07 13:03:05 -05:00
Kconfig Bluetooth: Remove BT_HS 2024-03-06 17:22:39 -05:00
l2cap_core.c Revert "Bluetooth: hci_core: Fix sleeping function called from invalid context" 2025-03-07 13:03:05 -05:00
l2cap_sock.c Bluetooth: L2CAP: Fix corrupted list in hci_chan_del 2025-02-13 11:15:37 -05:00
leds.c Bluetooth: Use led_set_brightness() in LED trigger activate() callback 2024-09-10 13:06:11 -04:00
leds.h
lib.c Bluetooth: Add documentation to exported functions in lib 2023-12-22 12:54:55 -05:00
Makefile Bluetooth: Remove hci_request.{c,h} 2024-07-15 10:11:35 -04:00
mgmt.c Bluetooth: Add check for mgmt_alloc_skb() in mgmt_device_connected() 2025-02-27 16:50:30 -05:00
mgmt_config.c
mgmt_config.h
mgmt_util.c move asm/unaligned.h to linux/unaligned.h 2024-10-02 17:23:23 -04:00
mgmt_util.h
msft.c Bluetooth: Remove hci_request.{c,h} 2024-07-15 10:11:35 -04:00
msft.h Bluetooth: msft: fix slab-use-after-free in msft_do_close() 2024-05-03 13:05:28 -04:00
sco.c Revert "Bluetooth: hci_core: Fix sleeping function called from invalid context" 2025-03-07 13:03:05 -05:00
selftest.c
selftest.h
smp.c Revert "Bluetooth: MGMT/SMP: Fix address type when using SMP over BREDR/LE" 2024-08-30 17:56:53 -04:00
smp.h