Home Home > GIT Browse > SLE12-SP3-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMel Gorman <mgorman@suse.de>2019-02-18 10:31:54 +0000
committerMel Gorman <mgorman@suse.de>2019-02-18 10:31:54 +0000
commit2d0491e797224e6aac47734c0baf5df426be83f7 (patch)
tree7246a21ecb8c13764126735a066a5eba74455786
parentcfbcea74765d32e1a626094b41d87ac9e88680e0 (diff)
blacklist.conf: False positive due to different merge paths, patch already included
-rw-r--r--blacklist.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/blacklist.conf b/blacklist.conf
index f60e08b4b1..be5bcc613a 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -587,3 +587,4 @@ b31a8cc1a53dda3a33b6c9c62779869d4d5fc142 # the test is not in 4.4 yet
6e00f7dd5e4edc2443f030b226f66fe4f1267667 # 3e67f106f619 was reverted
e8c8b53ccaff568fef4c13a6ccaf08bf241aa01a # 88078d98d1bb was reverted
acc93d30d7d43f428272c20a047389c4cbca82ba # Possibly breaking existing setups
+368686a95e55fd66b88542b5b23d802a4886b1aa # False positive due to different merge paths, patch already included