2
0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
linux/fs/smb/server
Jakub Kicinski af2d6148d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.16-rc7).

Conflicts:

Documentation/netlink/specs/ovpn.yaml
  880d43ca9a ("netlink: specs: clean up spaces in brackets")
  af52020fc5 ("ovpn: reject unexpected netlink attributes")

drivers/net/phy/phy_device.c
  a44312d58e ("net: phy: Don't register LEDs for genphy")
  f0f2b992d8 ("net: phy: Don't register LEDs for genphy")
https://lore.kernel.org/20250710114926.7ec3a64f@kernel.org

drivers/net/wireless/intel/iwlwifi/fw/regulatory.c
drivers/net/wireless/intel/iwlwifi/mld/regulatory.c
  5fde0fcbd7 ("wifi: iwlwifi: mask reserved bits in chan_state_active_bitmap")
  ea045a0de3 ("wifi: iwlwifi: add support for accepting raw DSM tables by firmware")

net/ipv6/mcast.c
  ae3264a25a ("ipv6: mcast: Delay put pmc->idev in mld_del_delrec()")
  a8594c956c ("ipv6: mcast: Avoid a duplicate pointer check in mld_del_delrec()")
https://lore.kernel.org/8cc52891-3653-4b03-a45e-05464fe495cf@kernel.org

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2025-07-17 11:00:33 -07:00
..
mgmt ksmbd: fix use-after-free in ksmbd_session_rpc_open 2025-04-22 20:45:43 -05:00
asn1.c ksmbd: use __GFP_RETRY_MAYFAIL 2024-11-25 18:58:02 -06:00
asn1.h
auth.c ksmbd: use SHA-256 library API instead of crypto_shash API 2025-05-25 22:54:50 -05:00
auth.h ksmbd: use SHA-256 library API instead of crypto_shash API 2025-05-25 22:54:50 -05:00
connection.c ksmbd: add free_transport ops in ksmbd connection 2025-06-17 16:26:44 -05:00
connection.h ksmbd: add free_transport ops in ksmbd connection 2025-06-17 16:26:44 -05:00
crypto_ctx.c ksmbd: use SHA-256 library API instead of crypto_shash API 2025-05-25 22:54:50 -05:00
crypto_ctx.h ksmbd: use SHA-256 library API instead of crypto_shash API 2025-05-25 22:54:50 -05:00
glob.h ksmbd: use __GFP_RETRY_MAYFAIL 2024-11-25 18:58:02 -06:00
Kconfig ksmbd: use SHA-256 library API instead of crypto_shash API 2025-05-25 22:54:50 -05:00
ksmbd_netlink.h ksmbd: browse interfaces list on FSCTL_QUERY_INTERFACE_INFO IOCTL 2025-01-15 23:24:51 -06:00
ksmbd_spnego_negtokeninit.asn1 treewide: Add SPDX identifier to IETF ASN.1 modules 2023-10-27 18:04:28 +08:00
ksmbd_spnego_negtokentarg.asn1 treewide: Add SPDX identifier to IETF ASN.1 modules 2023-10-27 18:04:28 +08:00
ksmbd_work.c ksmbd: fix use-after-free in ksmbd_free_work_struct 2025-03-10 12:54:28 -05:00
ksmbd_work.h ksmbd: fix use-after-free in ksmbd_free_work_struct 2025-03-10 12:54:28 -05:00
Makefile
misc.c ksmbd: use __GFP_RETRY_MAYFAIL 2024-11-25 18:58:02 -06:00
misc.h
ndr.c ksmbd: use __GFP_RETRY_MAYFAIL 2024-11-25 18:58:02 -06:00
ndr.h
nterr.h
ntlmssp.h
oplock.c ksmbd: use list_first_entry_or_null for opinfo_get_list() 2025-05-21 22:30:39 -05:00
oplock.h ksmbd: fix use-after-free in smb_break_all_levII_oplock() 2025-04-14 22:21:26 -05:00
server.c ksmbd: remove unnecessary softdep on crc32 2025-05-25 22:54:50 -05:00
server.h ksmbd: browse interfaces list on FSCTL_QUERY_INTERFACE_INFO IOCTL 2025-01-15 23:24:51 -06:00
smb2misc.c smb: move SMB2 Status code to common header file 2024-09-15 10:42:44 -05:00
smb2ops.c ksmbd: do not set SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1 2024-04-02 09:21:25 -05:00
smb2pdu.c ksmbd: fix potential use-after-free in oplock/lease break ack 2025-07-08 11:25:44 -05:00
smb2pdu.h ksmbd: provide zero as a unique ID to the Mac client 2025-05-27 10:25:12 -05:00
smb_common.c kernel-6.14-rc1.cred 2025-01-20 10:13:06 -08:00
smb_common.h smb3: Add defines for two new FileSystemAttributes 2025-04-09 23:42:16 -05:00
smbacl.c ksmbd: validate zero num_subauth before sub_auth is accessed 2025-04-01 00:04:21 -05:00
smbacl.h smb: common: change the data type of num_aces to le16 2025-03-02 22:50:54 -06:00
smbfsctl.h
transport_ipc.c ksmbd: Prevent integer overflow in calculation of deadtime 2025-04-14 22:21:26 -05:00
transport_ipc.h ksmbd: Remove unused functions 2025-01-15 23:24:51 -06:00
transport_rdma.c smb: server: make use of rdma_destroy_qp() 2025-07-08 11:25:43 -05:00
transport_rdma.h
transport_tcp.c net: make sk->sk_rcvtimeo lockless 2025-06-23 17:05:12 -07:00
transport_tcp.h ksmbd: fix use-after-free in __smb2_lease_break_noti() 2025-04-14 22:21:26 -05:00
unicode.c ksmbd: use __GFP_RETRY_MAYFAIL 2024-11-25 18:58:02 -06:00
unicode.h fs/smb: Swing unicode common code from smb->NLS 2023-08-30 08:55:51 -05:00
vfs_cache.c ksmbd: Fix UAF in __close_file_table_ids 2025-05-06 08:37:02 -05:00
vfs_cache.h ksmbd: handle set/get info file for streamed file 2025-06-17 16:27:16 -05:00
vfs.c ksmbd: fix a mount write count leak in ksmbd_vfs_kern_path_locked() 2025-07-08 11:25:44 -05:00
vfs.h ksmbd: Remove unused functions 2025-01-15 23:24:51 -06:00
xattr.h ksmbd: Correct typos in multiple comments across various files 2024-09-25 21:33:22 -05:00