From 957351c76267007e50668ffd1b424ec48a593fe2 Mon Sep 17 00:00:00 2001
From: Denis Kirjanov <dkirjanov@suse.com>
Date: May 22 2023 13:04:21 +0000
Subject: Merge remote-tracking branch 'origin/cve/linux-4.12' into SLE12-SP5


 Conflicts:
	patches.suse/ext4-fix-use-after-free-in-ext4_xattr_set_entry.patch
	series.conf

---

diff --git a/patches.suse/ext4-fix-use-after-free-in-ext4_xattr_set_entry.patch b/patches.suse/ext4-fix-use-after-free-in-ext4_xattr_set_entry.patch
index 2bd4782..406c0f1 100644
--- a/patches.suse/ext4-fix-use-after-free-in-ext4_xattr_set_entry.patch
+++ b/patches.suse/ext4-fix-use-after-free-in-ext4_xattr_set_entry.patch
@@ -4,7 +4,7 @@ Date: Thu, 16 Jun 2022 10:13:56 +0800
 Subject: [PATCH] ext4: fix use-after-free in ext4_xattr_set_entry
 Git-commit: 67d7d8ad99beccd9fe92d585b87f1760dc9018e3
 Patch-mainline: v6.0-rc1
-References: bsc#1206878
+References: bsc#1206878 bsc#1211105 CVE-2023-2513
 
 Hulk Robot reported a issue:
 ==================================================================