From 9048afa42fd63423120a692bfdd4720694d1d4e7 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Sep 29 2015 18:28:42 +0000
Subject: Linux v4.1.9


---

diff --git a/config-arm64 b/config-arm64
index af8db0a..14b2fd1 100644
--- a/config-arm64
+++ b/config-arm64
@@ -24,6 +24,7 @@ CONFIG_ARM64_ERRATUM_827319=y
 CONFIG_ARM64_ERRATUM_824069=y
 CONFIG_ARM64_ERRATUM_819472=y
 CONFIG_ARM64_ERRATUM_832075=y
+CONFIG_ARM64_ERRATUM_843419=y
 
 # CONFIG_AMBA_PL08X is not set
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
diff --git a/ext4-dont-manipulate-recovery-flag-when-freezing.patch b/ext4-dont-manipulate-recovery-flag-when-freezing.patch
deleted file mode 100644
index 0dbf21b..0000000
--- a/ext4-dont-manipulate-recovery-flag-when-freezing.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Eric Sandeen <sandeen@xxxxxxxxxx>
-Date: Wed, 05 Aug 2015 15:13:58 -0700
-Subject: [PATCH] ext4: don't manipulate recovery flag when freezing no-journal fs
-
-At some point along this sequence of changes:
-
-f6e63f9 ext4: fold ext4_nojournal_sops into ext4_sops
-bb04457 ext4: support freezing ext2 (nojournal) file systems
-9ca9238 ext4: Use separate super_operations structure for no_journal filesystems
-
-ext4 started setting needs_recovery on filesystems without journals
-when they are unfrozen.  This makes no sense, and in fact confuses
-blkid to the point where it doesn't recognize the filesystem at all.
-
-(freeze ext2; unfreeze ext2; run blkid; see no output; run dumpe2fs,
-see needs_recovery set on fs w/ no journal).
-
-To fix this, don't manipulate the INCOMPAT_RECOVER feature on
-filesystems without journals.
-
-Reported-by: Stu Mark <smark@xxxxxxxxx>
-Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
----
-
-Note, is there a reason that in ext4_freeze, if journal_flush
-fails, we skip the ext4_commit_super call?  I didn't change that
-here, but it seems odd.
-
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 58987b5..e7b345d 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -4833,10 +4833,11 @@ static int ext4_freeze(struct super_block *sb)
- 		error = jbd2_journal_flush(journal);
- 		if (error < 0)
- 			goto out;
-+
-+		/* Journal blocked and flushed, clear needs_recovery flag. */
-+		EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);
- 	}
- 
--	/* Journal blocked and flushed, clear needs_recovery flag. */
--	EXT4_CLEAR_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);
- 	error = ext4_commit_super(sb, 1);
- out:
- 	if (journal)
-@@ -4854,8 +4855,11 @@ static int ext4_unfreeze(struct super_block *sb)
- 	if (sb->s_flags & MS_RDONLY)
- 		return 0;
- 
--	/* Reset the needs_recovery flag before the fs is unlocked. */
--	EXT4_SET_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);
-+	if (EXT4_SB(sb)->s_journal) {
-+		/* Reset the needs_recovery flag before the fs is unlocked. */
-+		EXT4_SET_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);
-+	}
-+
- 	ext4_commit_super(sb, 1);
- 	return 0;
- }
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
-the body of a message to majordomo@xxxxxxxxxxxxxxx
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-
diff --git a/kernel.spec b/kernel.spec
index 13d6bfa..f65bef4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -52,7 +52,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 8
+%define stable_update 9
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -631,9 +631,6 @@ Patch509: ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch
 #rhbz 1253789
 Patch511: iSCSI-let-session-recovery_tmo-sysfs-writes-persist.patch
 
-#rhbz 1250717
-Patch512: ext4-dont-manipulate-recovery-flag-when-freezing.patch
-
 #CVE-2015-6666 rhbz 1256746 1256753
 Patch513: Revert-sched-x86_64-Don-t-save-flags-on-context-swit.patch
 
@@ -1405,9 +1402,6 @@ ApplyPatch ideapad-laptop-Add-Lenovo-Yoga-3-14-to-no_hw_rfkill-.patch
 #rhbz 1253789
 ApplyPatch iSCSI-let-session-recovery_tmo-sysfs-writes-persist.patch
 
-#rhbz 1250717
-ApplyPatch ext4-dont-manipulate-recovery-flag-when-freezing.patch
-
 #CVE-2015-6666 rhbz 1256746 1256753
 ApplyPatch Revert-sched-x86_64-Don-t-save-flags-on-context-swit.patch
 
@@ -2280,6 +2274,9 @@ fi
 #
 # 
 %changelog
+* Tue Sep 29 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.9-200
+- Linux v4.1.9
+
 * Thu Sep 24 2015 Josh Boyer <jwboyer@fedoraproject.org>
 - CVE-2015-5257 Null ptr deref in usb whiteheat driver (rhbz 1265607 1265612)
 
diff --git a/sources b/sources
index 015a420..1d79d28 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 fe9dc0f6729f36400ea81aa41d614c37  linux-4.1.tar.xz
 5b4d0e18c713a479a7b4c1aa53a7432b  perf-man-4.1.tar.gz
-8d941859273f8b3f7e0d7d6d14e3be91  patch-4.1.8.xz
+8e94d47fb46f0fc5962c65dd1ed0e79c  patch-4.1.9.xz