aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-11-27 15:40:46 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2021-11-28 16:32:45 +0100
commit81995a5e77c0cc5bf5b59ef4bec78b969c020013 (patch)
treea8bb8c23ad03ec3f8de366e5ce550810ea61a4d0 /target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
parentbbdc13b15b383b8b8d5492575e0a83cbe2af139b (diff)
downloadupstream-81995a5e77c0cc5bf5b59ef4bec78b969c020013.tar.gz
upstream-81995a5e77c0cc5bf5b59ef4bec78b969c020013.tar.bz2
upstream-81995a5e77c0cc5bf5b59ef4bec78b969c020013.zip
kernel: bump 5.4 to 5.4.162
All patches automatically rebased. Build system: x86_64 Build-tested: ramips/mt7621* *I am hit with the binutils 2.37 bug so I had to revert 7f1edbd41295dff9f2127b169fbc086c0fb2c14e in order to downgrade to 2.35.1 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch')
-rw-r--r--target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch b/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
index 8c18d5df6d..2133280e88 100644
--- a/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
+++ b/target/linux/generic/backport-5.4/800-v5.5-scsi-core-Add-sysfs-attributes-for-VPD-pages-0h-and-.patch
@@ -68,7 +68,7 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
kfree(sdev->inquiry);
kfree(sdev);
-@@ -883,6 +892,8 @@ static struct bin_attribute dev_attr_vpd
+@@ -891,6 +900,8 @@ static struct bin_attribute dev_attr_vpd
sdev_vpd_pg_attr(pg83);
sdev_vpd_pg_attr(pg80);
@@ -77,7 +77,7 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
static ssize_t show_inquiry(struct file *filep, struct kobject *kobj,
struct bin_attribute *bin_attr,
-@@ -1215,12 +1226,18 @@ static umode_t scsi_sdev_bin_attr_is_vis
+@@ -1223,12 +1234,18 @@ static umode_t scsi_sdev_bin_attr_is_vis
struct scsi_device *sdev = to_scsi_device(dev);
@@ -96,7 +96,7 @@ Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
return S_IRUGO;
}
-@@ -1263,8 +1280,10 @@ static struct attribute *scsi_sdev_attrs
+@@ -1271,8 +1288,10 @@ static struct attribute *scsi_sdev_attrs
};
static struct bin_attribute *scsi_sdev_bin_attrs[] = {