diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-13 19:35:30 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-13 19:35:30 +0100 |
commit | 2342b3fc5eb85550db82da6c889e94798ba3b161 (patch) | |
tree | 35f2438bb3eac15c327c20c5d019112407657011 | |
parent | 5f6f3129546b2ef22a4aede439b4e4140a7b4d0b (diff) | |
parent | caf831c1b1881da2f95eda74e84052450fa9a489 (diff) | |
download | kernel-2342b3fc5eb85550db82da6c889e94798ba3b161.tar.gz kernel-2342b3fc5eb85550db82da6c889e94798ba3b161.tar.xz kernel-2342b3fc5eb85550db82da6c889e94798ba3b161.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.6.0-0.rc1.git2.1.vanilla.knurd.2.fc33kernel-5.6.0-0.rc1.git2.1.vanilla.knurd.2.fc32kernel-5.6.0-0.rc1.git2.1.vanilla.knurd.2.fc31kernel-5.6.0-0.rc1.git2.1.vanilla.knurd.2.fc30
-rw-r--r-- | 0001-Replace-.ioctl-with-.compat_ioctl-in-three-appropria.patch | 59 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel.spec | 10 | ||||
-rw-r--r-- | sources | 2 |
4 files changed, 70 insertions, 3 deletions
diff --git a/0001-Replace-.ioctl-with-.compat_ioctl-in-three-appropria.patch b/0001-Replace-.ioctl-with-.compat_ioctl-in-three-appropria.patch new file mode 100644 index 000000000..fd34594ab --- /dev/null +++ b/0001-Replace-.ioctl-with-.compat_ioctl-in-three-appropria.patch @@ -0,0 +1,59 @@ +From 31218a134206dc0d1d74551852b5f7fc42c3c966 Mon Sep 17 00:00:00 2001 +From: Adam Williamson <awilliam@redhat.com> +Date: Wed, 12 Feb 2020 08:10:19 -0800 +Subject: [PATCH] Replace .ioctl with .compat_ioctl in three appropriate places + +Arnd Bergmann inadvertently typoed these in d320a9551e394 and +64cbfa96551a; they seem to be the cause of +https://bugzilla.redhat.com/show_bug.cgi?id=1801353 , invalid +SCSI commands when udev tries to query a DVD drive. + +Signed-off-by: Adam Williamson <awilliam@redhat.com> +--- + drivers/block/paride/pcd.c | 2 +- + drivers/cdrom/gdrom.c | 2 +- + drivers/scsi/sr.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c +index 117cfc8cd05a..cda5cf917e9a 100644 +--- a/drivers/block/paride/pcd.c ++++ b/drivers/block/paride/pcd.c +@@ -276,7 +276,7 @@ static const struct block_device_operations pcd_bdops = { + .release = pcd_block_release, + .ioctl = pcd_block_ioctl, + #ifdef CONFIG_COMPAT +- .ioctl = blkdev_compat_ptr_ioctl, ++ .compat_ioctl = blkdev_compat_ptr_ioctl, + #endif + .check_events = pcd_block_check_events, + }; +diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c +index 886b2638c730..0f3f9558716a 100644 +--- a/drivers/cdrom/gdrom.c ++++ b/drivers/cdrom/gdrom.c +@@ -519,7 +519,7 @@ static const struct block_device_operations gdrom_bdops = { + .check_events = gdrom_bdops_check_events, + .ioctl = gdrom_bdops_ioctl, + #ifdef CONFIG_COMPAT +- .ioctl = blkdev_compat_ptr_ioctl, ++ .compat_ioctl = blkdev_compat_ptr_ioctl, + #endif + }; + +diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c +index 0fbb8fe6e521..e4240e4ae8bb 100644 +--- a/drivers/scsi/sr.c ++++ b/drivers/scsi/sr.c +@@ -688,7 +688,7 @@ static const struct block_device_operations sr_bdops = + .release = sr_block_release, + .ioctl = sr_block_ioctl, + #ifdef CONFIG_COMPAT +- .ioctl = sr_block_compat_ioctl, ++ .compat_ioctl = sr_block_compat_ioctl, + #endif + .check_events = sr_block_check_events, + .revalidate_disk = sr_block_revalidate_disk, +-- +2.25.0 + @@ -1 +1 @@ -0a679e13ea30f85a1aef0669ee0c5a9fd7860b34 +0bf999f9c5e74c7ecf9dafb527146601e5c848b9 diff --git a/kernel.spec b/kernel.spec index 2a13d544d..926f253d3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -115,7 +115,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -881,6 +881,8 @@ Patch527: alsa-5.6.patch Patch529: 0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch +Patch530: 0001-Replace-.ioctl-with-.compat_ioctl-in-three-appropria.patch + # END OF PATCH DEFINITIONS %endif @@ -2913,6 +2915,12 @@ fi # # %changelog +* Thu Feb 13 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc1.git2.1 +- Linux v5.6-rc1-23-g0bf999f9c5e7 + +* Thu Feb 13 2020 Jeremy Cline <jcline@redhat.com> +- Pull in cdrom ioctl fix (rhbz 1801353) + * Tue Feb 11 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc1.git1.1 - Linux v5.6-rc1-5-g0a679e13ea30 @@ -1,3 +1,3 @@ SHA512 (linux-5.5.tar.xz) = fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86 SHA512 (patch-5.6-rc1.xz) = 14a250e7128fa5e72f077e8751d3aa759ed03f102405359445748765542da1d0afae90bf69e02526cbf003395114b546c716ffd93d0e230e5da3b088f6d4b573 -SHA512 (patch-5.6-rc1-git1.xz) = 16b771bbf7ae6e600a6d948d4849b3f54eb5cbad26a5d720c48270e47b2a895064da820a671f3177b81f21fbb36dad42e2f50daa319333bae4c19736268eba96 +SHA512 (patch-5.6-rc1-git2.xz) = fd1c1025e4bcdb73c7a265ea2ac10deac7dfeb72f56ed2eb51cd1311966f60f118ed2ddf32d945a1a41abf1573ecdcc56f99b607fa79fe3d47a76be392b77756 |