diff --git a/debian/changelog b/debian/changelog index 1dd27283c..c6a9bcaa3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux (4.17~rc2-1~exp1) UNRELEASED; urgency=medium +linux (4.17~rc3-1~exp1) UNRELEASED; urgency=medium * New upstream release candidate diff --git a/debian/patches/bugfix/all/documentation-typec.rst-use-literal-block-element-wi.patch b/debian/patches/bugfix/all/documentation-typec.rst-use-literal-block-element-wi.patch deleted file mode 100644 index e09f3bbb1..000000000 --- a/debian/patches/bugfix/all/documentation-typec.rst-use-literal-block-element-wi.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Heikki Krogerus -Date: Fri, 6 Apr 2018 15:41:22 +0300 -Subject: Documentation: typec.rst: Use literal-block element with ascii art -Origin: git://git.lwn.net/linux.git#6d9094862b70020c684588147e5eff52dec19c8d - -Using reStructuredText literal-block element with ascii-art. -That prevents the ascii art from being processed as -reStructuredText. - -Reported-by: Masanari Iida -Reviewed-and-tested-by: Jani Nikula -Fixes: bdecb33af34f ("usb: typec: API for controlling USB Type-C Multiplexers") -Signed-off-by: Heikki Krogerus -Signed-off-by: Jonathan Corbet ---- - Documentation/driver-api/usb/typec.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Documentation/driver-api/usb/typec.rst b/Documentation/driver-api/usb/typec.rst -index feb31946490b..48ff58095f11 100644 ---- a/Documentation/driver-api/usb/typec.rst -+++ b/Documentation/driver-api/usb/typec.rst -@@ -210,7 +210,7 @@ If the connector is dual-role capable, there may also be a switch for the data - role. USB Type-C Connector Class does not supply separate API for them. The - port drivers can use USB Role Class API with those. - --Illustration of the muxes behind a connector that supports an alternate mode: -+Illustration of the muxes behind a connector that supports an alternate mode:: - - ------------------------ - | Connector | diff --git a/debian/patches/bugfix/all/documentation-update-references-to-drivers-base-firm.patch b/debian/patches/bugfix/all/documentation-update-references-to-drivers-base-firm.patch deleted file mode 100644 index d83af6a37..000000000 --- a/debian/patches/bugfix/all/documentation-update-references-to-drivers-base-firm.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Ben Hutchings -Date: Fri, 20 Apr 2018 00:55:42 +0100 -Subject: Documentation: Update references to drivers/base/firmware_class.c - -This source file has been renamed in 4.17. - -Signed-off-by: Ben Hutchings ---- - Documentation/driver-api/firmware/request_firmware.rst | 10 +++++----- - Documentation/driver-api/infrastructure.rst | 2 +- - Documentation/power/suspend-and-cpuhotplug.txt | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) - ---- a/Documentation/driver-api/firmware/request_firmware.rst -+++ b/Documentation/driver-api/firmware/request_firmware.rst -@@ -17,17 +17,17 @@ an error is returned. - - request_firmware - ---------------- --.. kernel-doc:: drivers/base/firmware_class.c -+.. kernel-doc:: drivers/base/firmware_loader/main.c - :functions: request_firmware - - request_firmware_direct - ----------------------- --.. kernel-doc:: drivers/base/firmware_class.c -+.. kernel-doc:: drivers/base/firmware_loader/main.c - :functions: request_firmware_direct - - request_firmware_into_buf - ------------------------- --.. kernel-doc:: drivers/base/firmware_class.c -+.. kernel-doc:: drivers/base/firmware_loader/main.c - :functions: request_firmware_into_buf - - Asynchronous firmware requests -@@ -41,7 +41,7 @@ in atomic contexts. - - request_firmware_nowait - ----------------------- --.. kernel-doc:: drivers/base/firmware_class.c -+.. kernel-doc:: drivers/base/firmware_loader/main.c - :functions: request_firmware_nowait - - Special optimizations on reboot -@@ -55,7 +55,7 @@ firmare to be loaded. - - firmware_request_cache() - ----------------------- --.. kernel-doc:: drivers/base/firmware_class.c -+.. kernel-doc:: drivers/base/firmware_loader/main.c - :functions: firmware_request_cache - - request firmware API expected driver use ---- a/Documentation/driver-api/infrastructure.rst -+++ b/Documentation/driver-api/infrastructure.rst -@@ -28,7 +28,7 @@ Device Drivers Base - .. kernel-doc:: drivers/base/node.c - :internal: - --.. kernel-doc:: drivers/base/firmware_class.c -+.. kernel-doc:: drivers/base/firmware_loader/main.c - :export: - - .. kernel-doc:: drivers/base/transport_class.c ---- a/Documentation/power/suspend-and-cpuhotplug.txt -+++ b/Documentation/power/suspend-and-cpuhotplug.txt -@@ -168,7 +168,7 @@ update on the CPUs, as discussed below: - - [Please bear in mind that the kernel requests the microcode images from - userspace, using the request_firmware() function defined in --drivers/base/firmware_class.c] -+drivers/base/firmware_loader/main.c] - - - a. When all the CPUs are identical: diff --git a/debian/patches/bugfix/all/ext4-fix-bitmap-position-validation.patch b/debian/patches/bugfix/all/ext4-fix-bitmap-position-validation.patch deleted file mode 100644 index 14b3dab08..000000000 --- a/debian/patches/bugfix/all/ext4-fix-bitmap-position-validation.patch +++ /dev/null @@ -1,76 +0,0 @@ -From: Lukas Czerner -Date: Tue, 24 Apr 2018 11:31:44 -0400 -Subject: ext4: fix bitmap position validation -Origin: https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git/commit?id=22be37acce25d66ecf6403fc8f44df9c5ded2372 - -Currently in ext4_valid_block_bitmap() we expect the bitmap to be -positioned anywhere between 0 and s_blocksize clusters, but that's -wrong because the bitmap can be placed anywhere in the block group. This -causes false positives when validating bitmaps on perfectly valid file -system layouts. Fix it by checking whether the bitmap is within the group -boundary. - -The problem can be reproduced using the following - -mkfs -t ext3 -E stride=256 /dev/vdb1 -mount /dev/vdb1 /mnt/test -cd /mnt/test -wget https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.16.3.tar.xz -tar xf linux-4.16.3.tar.xz - -This will result in the warnings in the logs - -EXT4-fs error (device vdb1): ext4_validate_block_bitmap:399: comm tar: bg 84: block 2774529: invalid block bitmap - -[ Changed slightly for clarity and to not drop a overflow test -- TYT ] - -Signed-off-by: Lukas Czerner -Signed-off-by: Theodore Ts'o -Reported-by: Ilya Dryomov -Fixes: 7dac4a1726a9 ("ext4: add validity checks for bitmap block numbers") -Cc: stable@vger.kernel.org ---- - fs/ext4/balloc.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c -index a33d8fb1bf2a..508b905d744d 100644 ---- a/fs/ext4/balloc.c -+++ b/fs/ext4/balloc.c -@@ -321,6 +321,7 @@ static ext4_fsblk_t ext4_valid_block_bitmap(struct super_block *sb, - struct ext4_sb_info *sbi = EXT4_SB(sb); - ext4_grpblk_t offset; - ext4_grpblk_t next_zero_bit; -+ ext4_grpblk_t max_bit = EXT4_CLUSTERS_PER_GROUP(sb); - ext4_fsblk_t blk; - ext4_fsblk_t group_first_block; - -@@ -338,7 +339,7 @@ static ext4_fsblk_t ext4_valid_block_bitmap(struct super_block *sb, - /* check whether block bitmap block number is set */ - blk = ext4_block_bitmap(sb, desc); - offset = blk - group_first_block; -- if (offset < 0 || EXT4_B2C(sbi, offset) >= sb->s_blocksize || -+ if (offset < 0 || EXT4_B2C(sbi, offset) >= max_bit || - !ext4_test_bit(EXT4_B2C(sbi, offset), bh->b_data)) - /* bad block bitmap */ - return blk; -@@ -346,7 +347,7 @@ static ext4_fsblk_t ext4_valid_block_bitmap(struct super_block *sb, - /* check whether the inode bitmap block number is set */ - blk = ext4_inode_bitmap(sb, desc); - offset = blk - group_first_block; -- if (offset < 0 || EXT4_B2C(sbi, offset) >= sb->s_blocksize || -+ if (offset < 0 || EXT4_B2C(sbi, offset) >= max_bit || - !ext4_test_bit(EXT4_B2C(sbi, offset), bh->b_data)) - /* bad block bitmap */ - return blk; -@@ -354,8 +355,8 @@ static ext4_fsblk_t ext4_valid_block_bitmap(struct super_block *sb, - /* check whether the inode table block number is set */ - blk = ext4_inode_table(sb, desc); - offset = blk - group_first_block; -- if (offset < 0 || EXT4_B2C(sbi, offset) >= sb->s_blocksize || -- EXT4_B2C(sbi, offset + sbi->s_itb_per_group) >= sb->s_blocksize) -+ if (offset < 0 || EXT4_B2C(sbi, offset) >= max_bit || -+ EXT4_B2C(sbi, offset + sbi->s_itb_per_group) >= max_bit) - return blk; - next_zero_bit = ext4_find_next_zero_bit(bh->b_data, - EXT4_B2C(sbi, offset + sbi->s_itb_per_group), diff --git a/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch b/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch index 9b5b3b84f..66bf2c3c3 100644 --- a/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch +++ b/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch @@ -12,24 +12,25 @@ Signed-off-by: Ben Hutchings --- --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c -@@ -2473,3 +2473,4 @@ late_initcall(init_btrfs_fs); +@@ -2500,3 +2500,4 @@ late_initcall(init_btrfs_fs); module_exit(exit_btrfs_fs) MODULE_LICENSE("GPL"); +MODULE_SOFTDEP("pre: crypto-crc32c"); --- a/fs/crypto/crypto.c +++ b/fs/crypto/crypto.c -@@ -614,3 +614,4 @@ static void __exit fscrypt_exit(void) +@@ -468,3 +468,4 @@ static void __exit fscrypt_exit(void) module_exit(fscrypt_exit); MODULE_LICENSE("GPL"); +MODULE_SOFTDEP("pre: crypto-aes crypto-ecb"); --- a/fs/ext4/super.c +++ b/fs/ext4/super.c -@@ -5692,5 +5692,13 @@ static void __exit ext4_exit_fs(void) +@@ -5886,6 +5886,13 @@ static void __exit ext4_exit_fs(void) MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others"); MODULE_DESCRIPTION("Fourth Extended Filesystem"); MODULE_LICENSE("GPL"); +-MODULE_SOFTDEP("pre: crc32c"); + +#ifdef CONFIG_EXT4_FS_ENCRYPTION +#define EXT4_ENC_EXTRA_SOFTDEPS " crypto-aes crypto-ecb" @@ -42,7 +43,7 @@ Signed-off-by: Ben Hutchings module_exit(ext4_exit_fs) --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c -@@ -2244,4 +2244,5 @@ module_exit(exit_f2fs_fs) +@@ -3134,4 +3134,5 @@ module_exit(exit_f2fs_fs) MODULE_AUTHOR("Samsung Electronics's Praesto Team"); MODULE_DESCRIPTION("Flash Friendly File System"); MODULE_LICENSE("GPL"); @@ -50,7 +51,7 @@ Signed-off-by: Ben Hutchings --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c -@@ -2674,6 +2674,7 @@ static void __exit journal_exit(void) +@@ -2726,6 +2726,7 @@ static void __exit journal_exit(void) } MODULE_LICENSE("GPL"); @@ -60,7 +61,7 @@ Signed-off-by: Ben Hutchings --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c -@@ -1308,5 +1308,8 @@ static void __exit exit_nfsd(void) +@@ -1334,5 +1334,8 @@ static void __exit exit_nfsd(void) MODULE_AUTHOR("Olaf Kirch "); MODULE_LICENSE("GPL"); diff --git a/debian/patches/series b/debian/patches/series index ca89ca346..96e11fc66 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -79,8 +79,6 @@ bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch debian/revert-objtool-fix-config_stack_validation-y-warning.patch bugfix/all/i40e-build-for-64-bit-targets-only.patch -bugfix/all/documentation-typec.rst-use-literal-block-element-wi.patch -bugfix/all/documentation-update-references-to-drivers-base-firm.patch # Miscellaneous features @@ -122,7 +120,6 @@ features/all/lockdown/arm64-add-kernel-config-option-to-lock-down-when.patch debian/i386-686-pae-pci-set-pci-nobios-by-default.patch bugfix/all/xfs-enhance-dinode-verifier.patch bugfix/all/xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch -bugfix/all/ext4-fix-bitmap-position-validation.patch # Fix exported symbol versions bugfix/all/module-disable-matching-missing-version-crc.patch