Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-03-20 17:32:58 +0100
committerTakashi Iwai <tiwai@suse.de>2019-03-20 17:32:58 +0100
commit6cd23c78b26d6f75d33c7f842e14446179edd1de (patch)
tree38ab72f15e5bfe6012e0f4e35e995a8803a1af6a
parent434702917ae7264823d25fbf159beab262153abe (diff)
parentab2b2e435bad48f41778df965fb86815104ad8cf (diff)
Merge branch 'users/jack/SLE15/for-next' into SLE15
Pull ext4 patch update from Jan Kara
-rw-r--r--blacklist.conf15
-rw-r--r--patches.fixes/ext4-Fix-crash-during-online-resizing.patch4
2 files changed, 18 insertions, 1 deletions
diff --git a/blacklist.conf b/blacklist.conf
index 252da3f745..b3146fc46c 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -996,3 +996,18 @@ a3238924a820c1d7c977b632b769f3b5690cba09 # file not present: arch/arm/boot/dts/e
826c1362e79abcd36f99092acd083b5a2d576676 # only needed with 09abb5e3e5e50
5bc373ff254002b5ce1b7e7f37f8ed7074e45d2a # Cleanup, not needed in SLES
35f12f0f5c3bbd60caba89351f45c8eef8ffd423 # 75075168ae4546f7ae4de793444a6008620de7b0 already addresses end byte
+007d1e8395eaa59b0e7ad9eb2b53a40859446a88 # Just a cleanup
+310ca162d779efee8a2dc3731439680f3e9c1e86 # Makes existing deadlocks more probable (bsc#1129739)
+a13165441d58b216adbd50252a9cc829d78a6bce # Too intrusive locking rework
+a2505b799a496b7b84d9a4a14ec870ff9e42e11b # Too intrusive locking rework
+7ccd0791d98531df7cd59e92d55e4f063d48a070 # Too intrusive locking rework
+4a5ce9ba5877e4640200d84a735361306ad1a1b8 # Too intrusive locking rework
+550df5fdacff94229cde0ed9b8085155654c1696 # Too intrusive locking rework
+757ecf40b7e029529768eb5f9562d5eeb3002106 # Too intrusive locking rework
+c371077000f4138ee3c15fbed50101ff24bdc91d # Too intrusive locking rework
+d57f3374ba4817f7c8d26fae8a13d20ac8d31b92 # Too intrusive locking rework
+85b0a54a82e4fbceeb1aebb7cb6909edd1a24668 # Too intrusive locking rework
+0da03cab87e6323ff2e05b14bc7d5c6fcc531efd # Too intrusive locking rework
+1dded9acf6dc9a34cd27fcf8815507e4e65b3c4f # Too intrusive locking rework
+c28445fa06a3a54e06938559b9514c5a7f01c90f # Too intrusive locking rework
+a9519defc771d574888ffe01e84747889152ec35 # Just typo fix in a comment
diff --git a/patches.fixes/ext4-Fix-crash-during-online-resizing.patch b/patches.fixes/ext4-Fix-crash-during-online-resizing.patch
index 1aaf708fce..37946c53d3 100644
--- a/patches.fixes/ext4-Fix-crash-during-online-resizing.patch
+++ b/patches.fixes/ext4-Fix-crash-during-online-resizing.patch
@@ -3,7 +3,8 @@ From: Jan Kara <jack@suse.cz>
Date: Thu, 24 Jan 2019 17:00:06 +0100
Subject: [PATCH] ext4: Fix crash during online resizing
References: bsc#1122779
-Patch-mainline: Not yet, submitted Jan 24 2019
+Git-commit: f96c3ac8dfc24b4e38fc4c2eba5fea2107b929d1
+Patch-mainline: v5.1-rc1
When computing maximum size of filesystem possible with given number of
group descriptor blocks, we forget to include s_first_data_block into
@@ -25,6 +26,7 @@ computed number of filesystem blocks.
CC: stable@vger.kernel.org
Fixes: 1c6bd7173d66 "ext4: convert file system to meta_bg if needed..."
Signed-off-by: Jan Kara <jack@suse.cz>
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Acked-by: Jan Kara <jack@suse.cz>
---
fs/ext4/resize.c | 3 ++-