From 29f4f19ba2b6a512d21a8c0dfd7980a90db1f1f0 Mon Sep 17 00:00:00 2001
From: Denis Kirjanov <dkirjanov@suse.com>
Date: Apr 17 2020 10:07:01 +0000
Subject: Merge remote-tracking branch 'origin/SLE12-SP4' into SLE12-SP5


 Conflicts:
	patches.suse/net-smc-add-fallback-check-to-connect
	series.conf

---

diff --git a/series.conf b/series.conf
index 045c2da..52da4c6 100644
--- a/series.conf
+++ b/series.conf
@@ -53987,7 +53987,6 @@
 	patches.suse/reiserfs-add-check-to-detect-corrupted-directory-entry.patch
 	patches.suse/reiserfs-don-t-panic-on-bad-directory-entries.patch
 	patches.suse/reiserfs-fix-extended-attributes-on-the-root-directory.patch
-
 	patches.suse/ext4-dont-warn-when-enabling-DAX.patch
 
 	########################################################