Home Home > GIT Browse > SLE12-SP5-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Kirjanov <dkirjanov@suse.com>2019-09-05 13:15:29 +0300
committerDenis Kirjanov <dkirjanov@suse.com>2019-09-05 13:15:29 +0300
commit41286fa9f3f95bd89e072ad0f7da666e7971665f (patch)
treefcc72fde87b8d66837dddee6b3ce5cbe4affa1a9
parent1f29e1012a1f23808e4fec2a0ebc66129448f027 (diff)
parenta6da4dc276ad2e96e03c680287f1c15d502fcc8e (diff)
Merge 'users/tiwai/SLE12-SP5/for-next' into SLE12-SP5
Pull pacthes tags fixes from Takashi Iwai
-rw-r--r--patches.suse/apparmor-compatibility-patch-for-v5-network-control3
-rw-r--r--patches.suse/apparmor-fix-open-after-profile-replacement.patch2
-rw-r--r--patches.suse/apparmor-fix-replacement-not-being-applied.patch2
3 files changed, 4 insertions, 3 deletions
diff --git a/patches.suse/apparmor-compatibility-patch-for-v5-network-control b/patches.suse/apparmor-compatibility-patch-for-v5-network-control
index 1bf19e115c..acb3be125c 100644
--- a/patches.suse/apparmor-compatibility-patch-for-v5-network-control
+++ b/patches.suse/apparmor-compatibility-patch-for-v5-network-control
@@ -1,7 +1,8 @@
From: John Johansen <john.johansen@canonical.com>
Date: Mon, 4 Oct 2010 15:03:36 -0700
Subject: AppArmor: compatibility patch for v5 network control
-Patch-mainline: Uncertain
+Patch-mainline: never, only for compatibility up to SLE15-SP1
+References: none
Add compatibility for v5 network rules.
diff --git a/patches.suse/apparmor-fix-open-after-profile-replacement.patch b/patches.suse/apparmor-fix-open-after-profile-replacement.patch
index d5dcd94340..d726a01674 100644
--- a/patches.suse/apparmor-fix-open-after-profile-replacement.patch
+++ b/patches.suse/apparmor-fix-open-after-profile-replacement.patch
@@ -1,6 +1,6 @@
From: Miklos Szeredi <mszeredi@suse.cz>
Subject: apparmor: fix open after profile replacement
-Patch-mainline: not yet
+Patch-mainline: never, deprecated since SLE15-SP1
References: bnc#885599
Don't use obsolete profile in apparmor_file_open().
diff --git a/patches.suse/apparmor-fix-replacement-not-being-applied.patch b/patches.suse/apparmor-fix-replacement-not-being-applied.patch
index 73ccc2330b..10e6c79806 100644
--- a/patches.suse/apparmor-fix-replacement-not-being-applied.patch
+++ b/patches.suse/apparmor-fix-replacement-not-being-applied.patch
@@ -1,7 +1,7 @@
From: John Johansen <john.johansen@canonical.com>
Date: Tue, 5 Aug 2014 09:48:54 -0700
Subject: apparmor: Fix: replacement not being applied due to cred not being updated
-Patch-mainline: not yet
+Patch-mainline: never, deprecated since SLE15-SP1
References: bnc#885599
The task cred can only be updated by the task it self. So profile
replacement is achieved by the task recognizing its profile is no longer