From 4446fc40e3bdc136d96df9f92f2306d1bdc3632f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 21 Jan 2024 09:14:46 +0100 Subject: [PATCH] drop driver core change that was not needed --- ...oc_noio-to-false-on-device_add_disk-.patch | 13 +- ...ve-config_sysfs_deprecated-and-confi.patch | 278 ------------------ queue-5.15/series | 1 - ...oc_noio-to-false-on-device_add_disk-.patch | 13 +- ...ve-config_sysfs_deprecated-and-confi.patch | 278 ------------------ queue-6.1/series | 1 - 6 files changed, 8 insertions(+), 576 deletions(-) delete mode 100644 queue-5.15/driver-core-remove-config_sysfs_deprecated-and-confi.patch delete mode 100644 queue-6.1/driver-core-remove-config_sysfs_deprecated-and-confi.patch diff --git a/queue-5.15/block-set-memalloc_noio-to-false-on-device_add_disk-.patch b/queue-5.15/block-set-memalloc_noio-to-false-on-device_add_disk-.patch index f83ceabda3e..ed5c0866e46 100644 --- a/queue-5.15/block-set-memalloc_noio-to-false-on-device_add_disk-.patch +++ b/queue-5.15/block-set-memalloc_noio-to-false-on-device_add_disk-.patch @@ -19,21 +19,16 @@ Link: https://lore.kernel.org/r/20231211075356.1839282-1-linan666@huaweicloud.co Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- - block/genhd.c | 1 + + block/genhd.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/block/genhd.c b/block/genhd.c -index 62dd331db639..6aef540bbacf 100644 --- a/block/genhd.c +++ b/block/genhd.c -@@ -535,6 +535,7 @@ int device_add_disk(struct device *parent, struct gendisk *disk, - blk_integrity_del(disk); +@@ -538,6 +538,7 @@ out_del_integrity: out_del_block_link: - sysfs_remove_link(block_depr, dev_name(ddev)); + if (!sysfs_deprecated) + sysfs_remove_link(block_depr, dev_name(ddev)); + pm_runtime_set_memalloc_noio(ddev, false); out_device_del: device_del(ddev); out_free_ext_minor: --- -2.43.0 - diff --git a/queue-5.15/driver-core-remove-config_sysfs_deprecated-and-confi.patch b/queue-5.15/driver-core-remove-config_sysfs_deprecated-and-confi.patch deleted file mode 100644 index 5f54a392e99..00000000000 --- a/queue-5.15/driver-core-remove-config_sysfs_deprecated-and-confi.patch +++ /dev/null @@ -1,278 +0,0 @@ -From 8b2493474383d7966b09bce73a840539090e7d75 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 23 Feb 2023 08:33:26 +0100 -Subject: driver core: remove CONFIG_SYSFS_DEPRECATED and - CONFIG_SYSFS_DEPRECATED_V2 - -From: Greg Kroah-Hartman - -[ Upstream commit 721da5cee9d43901105f5b8bd33fcb9101b12fc3 ] - -CONFIG_SYSFS_DEPRECATED was added in commit 88a22c985e35 -("CONFIG_SYSFS_DEPRECATED") in 2006 to allow systems with older versions -of some tools (i.e. Fedora 3's version of udev) to boot properly. Four -years later, in 2010, the option was attempted to be removed as most of -userspace should have been fixed up properly by then, but some kernel -developers clung to those old systems and refused to update, so we added -CONFIG_SYSFS_DEPRECATED_V2 in commit e52eec13cd6b ("SYSFS: Allow boot -time switching between deprecated and modern sysfs layout") to allow -them to continue to boot properly, and we allowed a boot time parameter -to be used to switch back to the old format if needed. - -Over time, the logic that was covered under these config options was -slowly removed from individual driver subsystems successfully, removed, -and the only thing that is now left in the kernel are some changes in -the block layer's representation in sysfs where real directories are -used instead of symlinks like normal. - -Because the original changes were done to userspace tools in 2006, and -all distros that use those tools are long end-of-life, and older -non-udev-based systems do not care about the block layer's sysfs -representation, it is time to finally remove this old logic and the -config entries from the kernel. - -Cc: Jonathan Corbet -Cc: "Rafael J. Wysocki" -Cc: linux-block@vger.kernel.org -Cc: linux-doc@vger.kernel.org -Acked-by: Jens Axboe -Link: https://lore.kernel.org/r/20230223073326.2073220-1-gregkh@linuxfoundation.org -Signed-off-by: Greg Kroah-Hartman -Stable-dep-of: 5fa3d1a00c2d ("block: Set memalloc_noio to false on device_add_disk() error path") -Signed-off-by: Sasha Levin ---- - .../admin-guide/kernel-parameters.txt | 9 ----- - block/genhd.c | 19 ++++------ - drivers/base/class.c | 2 +- - drivers/base/core.c | 37 ------------------ - include/linux/device.h | 6 --- - init/Kconfig | 38 ------------------- - 6 files changed, 8 insertions(+), 103 deletions(-) - -diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 34b093e7f891..3734e8be3dad 100644 ---- a/Documentation/admin-guide/kernel-parameters.txt -+++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -5727,15 +5727,6 @@ - later by a loaded module cannot be set this way. - Example: sysctl.vm.swappiness=40 - -- sysfs.deprecated=0|1 [KNL] -- Enable/disable old style sysfs layout for old udev -- on older distributions. When this option is enabled -- very new udev will not work anymore. When this option -- is disabled (or CONFIG_SYSFS_DEPRECATED not compiled) -- in older udev will not work anymore. -- Default depends on CONFIG_SYSFS_DEPRECATED_V2 set in -- the kernel configuration. -- - sysrq_always_enabled - [KNL] - Ignore sysrq setting - this boot parameter will -diff --git a/block/genhd.c b/block/genhd.c -index 6123f13e148e..62dd331db639 100644 ---- a/block/genhd.c -+++ b/block/genhd.c -@@ -451,12 +451,10 @@ int device_add_disk(struct device *parent, struct gendisk *disk, - if (ret) - goto out_device_del; - -- if (!sysfs_deprecated) { -- ret = sysfs_create_link(block_depr, &ddev->kobj, -- kobject_name(&ddev->kobj)); -- if (ret) -- goto out_device_del; -- } -+ ret = sysfs_create_link(block_depr, &ddev->kobj, -+ kobject_name(&ddev->kobj)); -+ if (ret) -+ goto out_device_del; - - /* - * avoid probable deadlock caused by allocating memory with -@@ -536,8 +534,7 @@ int device_add_disk(struct device *parent, struct gendisk *disk, - out_del_integrity: - blk_integrity_del(disk); - out_del_block_link: -- if (!sysfs_deprecated) -- sysfs_remove_link(block_depr, dev_name(ddev)); -+ sysfs_remove_link(block_depr, dev_name(ddev)); - out_device_del: - device_del(ddev); - out_free_ext_minor: -@@ -629,8 +626,7 @@ void del_gendisk(struct gendisk *disk) - - part_stat_set_all(disk->part0, 0); - disk->part0->bd_stamp = 0; -- if (!sysfs_deprecated) -- sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk))); -+ sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk))); - pm_runtime_set_memalloc_noio(disk_to_dev(disk), false); - device_del(disk_to_dev(disk)); - -@@ -848,8 +844,7 @@ static int __init genhd_device_init(void) - register_blkdev(BLOCK_EXT_MAJOR, "blkext"); - - /* create top-level block dir */ -- if (!sysfs_deprecated) -- block_depr = kobject_create_and_add("block", NULL); -+ block_depr = kobject_create_and_add("block", NULL); - return 0; - } - -diff --git a/drivers/base/class.c b/drivers/base/class.c -index 0e44a68e90a0..88465c42c2ed 100644 ---- a/drivers/base/class.c -+++ b/drivers/base/class.c -@@ -176,7 +176,7 @@ int __class_register(struct class *cls, struct lock_class_key *key) - - #if defined(CONFIG_BLOCK) - /* let the block class directory show up in the root of sysfs */ -- if (!sysfs_deprecated || cls != &block_class) -+ if (cls != &block_class) - cp->subsys.kobj.kset = class_kset; - #else - cp->subsys.kobj.kset = class_kset; -diff --git a/drivers/base/core.c b/drivers/base/core.c -index adf003a7e8d6..d1ff9fa7bbe1 100644 ---- a/drivers/base/core.c -+++ b/drivers/base/core.c -@@ -34,19 +34,6 @@ - #include "base.h" - #include "power/power.h" - --#ifdef CONFIG_SYSFS_DEPRECATED --#ifdef CONFIG_SYSFS_DEPRECATED_V2 --long sysfs_deprecated = 1; --#else --long sysfs_deprecated = 0; --#endif --static int __init sysfs_deprecated_setup(char *arg) --{ -- return kstrtol(arg, 10, &sysfs_deprecated); --} --early_param("sysfs.deprecated", sysfs_deprecated_setup); --#endif -- - /* Device links support. */ - static LIST_HEAD(deferred_sync); - static unsigned int defer_sync_state_count = 1; -@@ -2963,15 +2950,6 @@ static struct kobject *get_device_parent(struct device *dev, - struct kobject *parent_kobj; - struct kobject *k; - --#ifdef CONFIG_BLOCK -- /* block disks show up in /sys/block */ -- if (sysfs_deprecated && dev->class == &block_class) { -- if (parent && parent->class == &block_class) -- return &parent->kobj; -- return &block_class.p->subsys.kobj; -- } --#endif -- - /* - * If we have no parent, we live in "virtual". - * Class-devices with a non class-device as parent, live -@@ -3126,12 +3104,6 @@ static int device_add_class_symlinks(struct device *dev) - goto out_subsys; - } - --#ifdef CONFIG_BLOCK -- /* /sys/block has directories and does not need symlinks */ -- if (sysfs_deprecated && dev->class == &block_class) -- return 0; --#endif -- - /* link in the class directory pointing to the device */ - error = sysfs_create_link(&dev->class->p->subsys.kobj, - &dev->kobj, dev_name(dev)); -@@ -3161,10 +3133,6 @@ static void device_remove_class_symlinks(struct device *dev) - if (dev->parent && device_is_not_partition(dev)) - sysfs_remove_link(&dev->kobj, "device"); - sysfs_remove_link(&dev->kobj, "subsystem"); --#ifdef CONFIG_BLOCK -- if (sysfs_deprecated && dev->class == &block_class) -- return; --#endif - sysfs_delete_link(&dev->class->p->subsys.kobj, &dev->kobj, dev_name(dev)); - } - -@@ -4442,11 +4410,6 @@ int device_change_owner(struct device *dev, kuid_t kuid, kgid_t kgid) - if (error) - goto out; - --#ifdef CONFIG_BLOCK -- if (sysfs_deprecated && dev->class == &block_class) -- goto out; --#endif -- - /* - * Change the owner of the symlink located in the class directory of - * the device class associated with @dev which points to the actual -diff --git a/include/linux/device.h b/include/linux/device.h -index e270cb740b9e..7ed8625e2173 100644 ---- a/include/linux/device.h -+++ b/include/linux/device.h -@@ -981,10 +981,4 @@ int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); - #define MODULE_ALIAS_CHARDEV_MAJOR(major) \ - MODULE_ALIAS("char-major-" __stringify(major) "-*") - --#ifdef CONFIG_SYSFS_DEPRECATED --extern long sysfs_deprecated; --#else --#define sysfs_deprecated 0 --#endif -- - #endif /* _DEVICE_H_ */ -diff --git a/init/Kconfig b/init/Kconfig -index dafc3ba6fa7a..e319e10afd94 100644 ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -1278,44 +1278,6 @@ config SCHED_AUTOGROUP - desktop applications. Task group autogeneration is currently based - upon task session. - --config SYSFS_DEPRECATED -- bool "Enable deprecated sysfs features to support old userspace tools" -- depends on SYSFS -- default n -- help -- This option adds code that switches the layout of the "block" class -- devices, to not show up in /sys/class/block/, but only in -- /sys/block/. -- -- This switch is only active when the sysfs.deprecated=1 boot option is -- passed or the SYSFS_DEPRECATED_V2 option is set. -- -- This option allows new kernels to run on old distributions and tools, -- which might get confused by /sys/class/block/. Since 2007/2008 all -- major distributions and tools handle this just fine. -- -- Recent distributions and userspace tools after 2009/2010 depend on -- the existence of /sys/class/block/, and will not work with this -- option enabled. -- -- Only if you are using a new kernel on an old distribution, you might -- need to say Y here. -- --config SYSFS_DEPRECATED_V2 -- bool "Enable deprecated sysfs features by default" -- default n -- depends on SYSFS -- depends on SYSFS_DEPRECATED -- help -- Enable deprecated sysfs by default. -- -- See the CONFIG_SYSFS_DEPRECATED option for more details about this -- option. -- -- Only if you are using a new kernel on an old distribution, you might -- need to say Y here. Even then, odds are you would not need it -- enabled, you can always pass the boot option if absolutely necessary. -- - config RELAY - bool "Kernel->user space relay support (formerly relayfs)" - select IRQ_WORK --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 76273fefd10..4c45dfc5a05 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -136,7 +136,6 @@ arm64-dts-qcom-qrb5165-rb5-correct-led-panic-indicat.patch arm64-dts-qcom-sdm845-db845c-correct-led-panic-indic.patch arm64-dts-qcom-sc7280-fix-usb_2-wakeup-interrupt-typ.patch bpf-fix-verification-of-indirect-var-off-stack-acces.patch -driver-core-remove-config_sysfs_deprecated-and-confi.patch block-set-memalloc_noio-to-false-on-device_add_disk-.patch scsi-hisi_sas-rename-hisi_sas_-reset-resetting-_bit.patch scsi-hisi_sas-prevent-parallel-flr-and-controller-re.patch diff --git a/queue-6.1/block-set-memalloc_noio-to-false-on-device_add_disk-.patch b/queue-6.1/block-set-memalloc_noio-to-false-on-device_add_disk-.patch index 0b23fcd8f70..347d04d1044 100644 --- a/queue-6.1/block-set-memalloc_noio-to-false-on-device_add_disk-.patch +++ b/queue-6.1/block-set-memalloc_noio-to-false-on-device_add_disk-.patch @@ -19,21 +19,16 @@ Link: https://lore.kernel.org/r/20231211075356.1839282-1-linan666@huaweicloud.co Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- - block/genhd.c | 1 + + block/genhd.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/block/genhd.c b/block/genhd.c -index 886e75213f6a..5b23f2c3d692 100644 --- a/block/genhd.c +++ b/block/genhd.c -@@ -564,6 +564,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, - blk_integrity_del(disk); +@@ -567,6 +567,7 @@ out_del_integrity: out_del_block_link: - sysfs_remove_link(block_depr, dev_name(ddev)); + if (!sysfs_deprecated) + sysfs_remove_link(block_depr, dev_name(ddev)); + pm_runtime_set_memalloc_noio(ddev, false); out_device_del: device_del(ddev); out_free_ext_minor: --- -2.43.0 - diff --git a/queue-6.1/driver-core-remove-config_sysfs_deprecated-and-confi.patch b/queue-6.1/driver-core-remove-config_sysfs_deprecated-and-confi.patch deleted file mode 100644 index 1f73bd1aafa..00000000000 --- a/queue-6.1/driver-core-remove-config_sysfs_deprecated-and-confi.patch +++ /dev/null @@ -1,278 +0,0 @@ -From 59215e74fb040fb277b4635b3a4ad1189a0b5e6e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 23 Feb 2023 08:33:26 +0100 -Subject: driver core: remove CONFIG_SYSFS_DEPRECATED and - CONFIG_SYSFS_DEPRECATED_V2 - -From: Greg Kroah-Hartman - -[ Upstream commit 721da5cee9d43901105f5b8bd33fcb9101b12fc3 ] - -CONFIG_SYSFS_DEPRECATED was added in commit 88a22c985e35 -("CONFIG_SYSFS_DEPRECATED") in 2006 to allow systems with older versions -of some tools (i.e. Fedora 3's version of udev) to boot properly. Four -years later, in 2010, the option was attempted to be removed as most of -userspace should have been fixed up properly by then, but some kernel -developers clung to those old systems and refused to update, so we added -CONFIG_SYSFS_DEPRECATED_V2 in commit e52eec13cd6b ("SYSFS: Allow boot -time switching between deprecated and modern sysfs layout") to allow -them to continue to boot properly, and we allowed a boot time parameter -to be used to switch back to the old format if needed. - -Over time, the logic that was covered under these config options was -slowly removed from individual driver subsystems successfully, removed, -and the only thing that is now left in the kernel are some changes in -the block layer's representation in sysfs where real directories are -used instead of symlinks like normal. - -Because the original changes were done to userspace tools in 2006, and -all distros that use those tools are long end-of-life, and older -non-udev-based systems do not care about the block layer's sysfs -representation, it is time to finally remove this old logic and the -config entries from the kernel. - -Cc: Jonathan Corbet -Cc: "Rafael J. Wysocki" -Cc: linux-block@vger.kernel.org -Cc: linux-doc@vger.kernel.org -Acked-by: Jens Axboe -Link: https://lore.kernel.org/r/20230223073326.2073220-1-gregkh@linuxfoundation.org -Signed-off-by: Greg Kroah-Hartman -Stable-dep-of: 5fa3d1a00c2d ("block: Set memalloc_noio to false on device_add_disk() error path") -Signed-off-by: Sasha Levin ---- - .../admin-guide/kernel-parameters.txt | 9 ----- - block/genhd.c | 19 ++++------ - drivers/base/class.c | 2 +- - drivers/base/core.c | 37 ------------------ - include/linux/device.h | 6 --- - init/Kconfig | 38 ------------------- - 6 files changed, 8 insertions(+), 103 deletions(-) - -diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 4ad60e127e04..d44a25ed43d7 100644 ---- a/Documentation/admin-guide/kernel-parameters.txt -+++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6127,15 +6127,6 @@ - later by a loaded module cannot be set this way. - Example: sysctl.vm.swappiness=40 - -- sysfs.deprecated=0|1 [KNL] -- Enable/disable old style sysfs layout for old udev -- on older distributions. When this option is enabled -- very new udev will not work anymore. When this option -- is disabled (or CONFIG_SYSFS_DEPRECATED not compiled) -- in older udev will not work anymore. -- Default depends on CONFIG_SYSFS_DEPRECATED_V2 set in -- the kernel configuration. -- - sysrq_always_enabled - [KNL] - Ignore sysrq setting - this boot parameter will -diff --git a/block/genhd.c b/block/genhd.c -index afab646d12c8..886e75213f6a 100644 ---- a/block/genhd.c -+++ b/block/genhd.c -@@ -473,12 +473,10 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, - if (ret) - goto out_device_del; - -- if (!sysfs_deprecated) { -- ret = sysfs_create_link(block_depr, &ddev->kobj, -- kobject_name(&ddev->kobj)); -- if (ret) -- goto out_device_del; -- } -+ ret = sysfs_create_link(block_depr, &ddev->kobj, -+ kobject_name(&ddev->kobj)); -+ if (ret) -+ goto out_device_del; - - /* - * avoid probable deadlock caused by allocating memory with -@@ -565,8 +563,7 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk, - out_del_integrity: - blk_integrity_del(disk); - out_del_block_link: -- if (!sysfs_deprecated) -- sysfs_remove_link(block_depr, dev_name(ddev)); -+ sysfs_remove_link(block_depr, dev_name(ddev)); - out_device_del: - device_del(ddev); - out_free_ext_minor: -@@ -663,8 +660,7 @@ void del_gendisk(struct gendisk *disk) - - part_stat_set_all(disk->part0, 0); - disk->part0->bd_stamp = 0; -- if (!sysfs_deprecated) -- sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk))); -+ sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk))); - pm_runtime_set_memalloc_noio(disk_to_dev(disk), false); - device_del(disk_to_dev(disk)); - -@@ -916,8 +912,7 @@ static int __init genhd_device_init(void) - register_blkdev(BLOCK_EXT_MAJOR, "blkext"); - - /* create top-level block dir */ -- if (!sysfs_deprecated) -- block_depr = kobject_create_and_add("block", NULL); -+ block_depr = kobject_create_and_add("block", NULL); - return 0; - } - -diff --git a/drivers/base/class.c b/drivers/base/class.c -index 8ceafb7d0203..254963a226ba 100644 ---- a/drivers/base/class.c -+++ b/drivers/base/class.c -@@ -176,7 +176,7 @@ int __class_register(struct class *cls, struct lock_class_key *key) - - #if defined(CONFIG_BLOCK) - /* let the block class directory show up in the root of sysfs */ -- if (!sysfs_deprecated || cls != &block_class) -+ if (cls != &block_class) - cp->subsys.kobj.kset = class_kset; - #else - cp->subsys.kobj.kset = class_kset; -diff --git a/drivers/base/core.c b/drivers/base/core.c -index af90bfb0cc3d..578b21f08763 100644 ---- a/drivers/base/core.c -+++ b/drivers/base/core.c -@@ -35,19 +35,6 @@ - #include "physical_location.h" - #include "power/power.h" - --#ifdef CONFIG_SYSFS_DEPRECATED --#ifdef CONFIG_SYSFS_DEPRECATED_V2 --long sysfs_deprecated = 1; --#else --long sysfs_deprecated = 0; --#endif --static int __init sysfs_deprecated_setup(char *arg) --{ -- return kstrtol(arg, 10, &sysfs_deprecated); --} --early_param("sysfs.deprecated", sysfs_deprecated_setup); --#endif -- - /* Device links support. */ - static LIST_HEAD(deferred_sync); - static unsigned int defer_sync_state_count = 1; -@@ -3216,15 +3203,6 @@ static struct kobject *get_device_parent(struct device *dev, - struct kobject *parent_kobj; - struct kobject *k; - --#ifdef CONFIG_BLOCK -- /* block disks show up in /sys/block */ -- if (sysfs_deprecated && dev->class == &block_class) { -- if (parent && parent->class == &block_class) -- return &parent->kobj; -- return &block_class.p->subsys.kobj; -- } --#endif -- - /* - * If we have no parent, we live in "virtual". - * Class-devices with a non class-device as parent, live -@@ -3396,12 +3374,6 @@ static int device_add_class_symlinks(struct device *dev) - goto out_subsys; - } - --#ifdef CONFIG_BLOCK -- /* /sys/block has directories and does not need symlinks */ -- if (sysfs_deprecated && dev->class == &block_class) -- return 0; --#endif -- - /* link in the class directory pointing to the device */ - error = sysfs_create_link(&dev->class->p->subsys.kobj, - &dev->kobj, dev_name(dev)); -@@ -3431,10 +3403,6 @@ static void device_remove_class_symlinks(struct device *dev) - if (dev->parent && device_is_not_partition(dev)) - sysfs_remove_link(&dev->kobj, "device"); - sysfs_remove_link(&dev->kobj, "subsystem"); --#ifdef CONFIG_BLOCK -- if (sysfs_deprecated && dev->class == &block_class) -- return; --#endif - sysfs_delete_link(&dev->class->p->subsys.kobj, &dev->kobj, dev_name(dev)); - } - -@@ -4742,11 +4710,6 @@ int device_change_owner(struct device *dev, kuid_t kuid, kgid_t kgid) - if (error) - goto out; - --#ifdef CONFIG_BLOCK -- if (sysfs_deprecated && dev->class == &block_class) -- goto out; --#endif -- - /* - * Change the owner of the symlink located in the class directory of - * the device class associated with @dev which points to the actual -diff --git a/include/linux/device.h b/include/linux/device.h -index 7cf24330d681..a46b3b4e3126 100644 ---- a/include/linux/device.h -+++ b/include/linux/device.h -@@ -1102,10 +1102,4 @@ int dev_err_probe(const struct device *dev, int err, const char *fmt, ...); - #define MODULE_ALIAS_CHARDEV_MAJOR(major) \ - MODULE_ALIAS("char-major-" __stringify(major) "-*") - --#ifdef CONFIG_SYSFS_DEPRECATED --extern long sysfs_deprecated; --#else --#define sysfs_deprecated 0 --#endif -- - #endif /* _DEVICE_H_ */ -diff --git a/init/Kconfig b/init/Kconfig -index 148704640252..8219099a0326 100644 ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -1292,44 +1292,6 @@ config SCHED_AUTOGROUP - desktop applications. Task group autogeneration is currently based - upon task session. - --config SYSFS_DEPRECATED -- bool "Enable deprecated sysfs features to support old userspace tools" -- depends on SYSFS -- default n -- help -- This option adds code that switches the layout of the "block" class -- devices, to not show up in /sys/class/block/, but only in -- /sys/block/. -- -- This switch is only active when the sysfs.deprecated=1 boot option is -- passed or the SYSFS_DEPRECATED_V2 option is set. -- -- This option allows new kernels to run on old distributions and tools, -- which might get confused by /sys/class/block/. Since 2007/2008 all -- major distributions and tools handle this just fine. -- -- Recent distributions and userspace tools after 2009/2010 depend on -- the existence of /sys/class/block/, and will not work with this -- option enabled. -- -- Only if you are using a new kernel on an old distribution, you might -- need to say Y here. -- --config SYSFS_DEPRECATED_V2 -- bool "Enable deprecated sysfs features by default" -- default n -- depends on SYSFS -- depends on SYSFS_DEPRECATED -- help -- Enable deprecated sysfs by default. -- -- See the CONFIG_SYSFS_DEPRECATED option for more details about this -- option. -- -- Only if you are using a new kernel on an old distribution, you might -- need to say Y here. Even then, odds are you would not need it -- enabled, you can always pass the boot option if absolutely necessary. -- - config RELAY - bool "Kernel->user space relay support (formerly relayfs)" - select IRQ_WORK --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 606b69ac93f..ab5519c1a52 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -110,7 +110,6 @@ dt-bindings-media-mediatek-mdp3-correct-rdma-and-wro.patch arm64-dts-mediatek-mt8183-correct-mdp3-dma-related-n.patch wifi-mt76-mt7921-fix-country-count-limitation-for-cl.patch selftests-bpf-relax-time_tai-test-for-equal-timestam.patch -driver-core-remove-config_sysfs_deprecated-and-confi.patch block-set-memalloc_noio-to-false-on-device_add_disk-.patch arm64-dts-renesas-white-hawk-cpu-fix-missing-serial-.patch arm64-dts-imx8mm-reduce-gpu-to-nominal-speed.patch -- 2.47.3