Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=063005e3231045366b2a2383e62ca0e0082f2f0b
commit 063005e3231045366b2a2383e62ca0e0082f2f0b Author: DeX77 <[email protected]> Date: Sat Aug 20 23:29:47 2016 +0200 kernel-4.7.2-1-x86_64 * bugfixes * btrfs-crash-fix is now upstream diff --git a/source/base/kernel/FrugalBuild b/source/base/kernel/FrugalBuild index 72d20ff..3b87e6f 100644 --- a/source/base/kernel/FrugalBuild +++ b/source/base/kernel/FrugalBuild @@ -19,7 +19,7 @@ options+=('nodocs' 'genscriptlet') _F_archive_grepv="rc" up2date="Flasttar $url" -_F_kernel_patches=('fix-i915.patch' 'btrfs-crash-fix.patch' \ +_F_kernel_patches=('fix-i915.patch' \ 'http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.7.0-v8r2/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.7.0.patch' \ 'http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.7.0-v8r2/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.7.0.patch' \ 'http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.7.0-v8r2/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch' \ diff --git a/source/base/kernel/btrfs-crash-fix.patch b/source/base/kernel/btrfs-crash-fix.patch deleted file mode 100644 index 8df982e..0000000 --- a/source/base/kernel/btrfs-crash-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c -index fac9b839..5842423 100644 ---- a/fs/btrfs/file.c -+++ b/fs/btrfs/file.c -@@ -1629,13 +1629,11 @@ again: - * managed to copy. - */ - if (num_sectors > dirty_sectors) { -- /* -- * we round down because we don't want to count -- * any partial blocks actually sent through the -- * IO machines -- */ -- release_bytes = round_down(release_bytes - copied, -- root->sectorsize); -+ -+ /* release everything except the sectors we dirtied */ -+ release_bytes -= dirty_sectors << -+ root->fs_info->sb->s_blocksize_bits; -+ - if (copied > 0) { - spin_lock(&BTRFS_I(inode)->lock); - BTRFS_I(inode)->outstanding_extents++; - diff --git a/source/include/kernel-version.sh b/source/include/kernel-version.sh index a82e98e..785444b 100644 --- a/source/include/kernel-version.sh +++ b/source/include/kernel-version.sh @@ -16,7 +16,7 @@ # * _F_kernelver_stable: the number of the -stable patch to use (if any) # * _F_kernelver_nextver: the next kernel version ### -_F_kernelver_ver=4.7.1 +_F_kernelver_ver=4.7.2 _F_kernelver_rel=1 ### _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
