diff options
| author | John Audia <therealgraysky@proton.me> | 2023-06-28 06:20:03 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-07-05 20:32:37 +0200 |
| commit | b8b49066140eb810474531a48ee3807caa6a694c (patch) | |
| tree | 3deada8616b1bfdbae65e325b14d757e20e3a89c /package/kernel | |
| parent | 06e64f9b364abe15c27bf0a7225fcac740819668 (diff) | |
| download | upstream-b8b49066140eb810474531a48ee3807caa6a694c.tar.gz upstream-b8b49066140eb810474531a48ee3807caa6a694c.tar.bz2 upstream-b8b49066140eb810474531a48ee3807caa6a694c.zip | |
kernel: bump 6.1 to 6.1.36
All patches automatically rebased.
Acknowledgment to @john-tho for the changes to fs.mk to accommodate new paths
introduced in https://github.com/gregkh/linux/commit/29429a1f5871dbe54ee0da81bb12db8567f15379
Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/linux/modules/fs.mk | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 5fb9a2b7d64..f2acaa74398 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -87,10 +87,14 @@ define KernelPackage/fs-smbfs-common SUBMENU:=$(FS_MENU) TITLE:=SMBFS common dependencies support HIDDEN:=1 - KCONFIG:=CONFIG_SMBFS_COMMON + KCONFIG:=\ + CONFIG_SMBFS_COMMON@lt6.1 \ + CONFIG_SMBFS@ge6.1 FILES:= \ - $(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko \ - $(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko + $(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko@lt6.1 \ + $(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko@lt6.1 \ + $(LINUX_DIR)/fs/smb/common/cifs_arc4.ko@ge6.1 \ + $(LINUX_DIR)/fs/smb/common/cifs_md4.ko@ge6.1 endef define KernelPackage/fs-smbfs-common/description @@ -108,7 +112,8 @@ define KernelPackage/fs-cifs CONFIG_CIFS_DFS_UPCALL=n \ CONFIG_CIFS_UPCALL=n FILES:= \ - $(LINUX_DIR)/fs/cifs/cifs.ko + $(LINUX_DIR)/fs/cifs/cifs.ko@lt6.1 \ + $(LINUX_DIR)/fs/smb/client/cifs.ko@ge6.1 AUTOLOAD:=$(call AutoLoad,30,cifs) $(call AddDepends/nls) DEPENDS+= \ @@ -373,7 +378,9 @@ define KernelPackage/fs-ksmbd CONFIG_SMB_SERVER_SMBDIRECT=n \ CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=n \ CONFIG_SMB_SERVER_KERBEROS5=n - FILES:=$(LINUX_DIR)/fs/ksmbd/ksmbd.ko + FILES:= \ + $(LINUX_DIR)/fs/ksmbd/ksmbd.ko@lt6.1 \ + $(LINUX_DIR)/fs/smb/server/ksmbd.ko@ge6.1 AUTOLOAD:=$(call AutoLoad,41,ksmbd) endef |