Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGoldwyn Rodrigues <rgoldwyn@suse.com>2018-03-15 10:35:19 -0500
committerGoldwyn Rodrigues <rgoldwyn@suse.com>2018-03-15 10:35:19 -0500
commit70d2dc4e218e92104cf4ba5d93d181331e7bae13 (patch)
tree39ffcd0b70628fbf53ef617f16bb76da75f06825
parent2e547fe95b0e7b56fcf1bb771e95cefba84ea324 (diff)
Correct placement of apparmor-next patches
This needed a new section for jj/linux-apparmor for apparmor-next branch.
-rw-r--r--series.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/series.conf b/series.conf
index ceafd9e1cb..80945459c2 100644
--- a/series.conf
+++ b/series.conf
@@ -9203,7 +9203,6 @@
patches.suse/KVM-x86-Add-memory-barrier-on-vmcs-field-lookup.patch
patches.suse/tools-objtool-Makefile-don-t-assume-sync-check.sh-is.patch
patches.apparmor/apparmor-fix-ptrace-label-match-when-matching-stacke.patch
- patches.apparmor/apparmor-fix-resource-audit-messages-when-auditing-peer.patch
patches.fixes/Bluetooth-Prevent-stack-info-leak-from-the-EFS-element.patch
patches.arch/11-x86-pti-unbreak-efi-old_memmap.patch
patches.arch/12-x86-documentation-add-pti-description.patch
@@ -10851,6 +10850,9 @@
patches.drivers/drm-i915-dp-limit-DP-link-rate-based-on-VBT-on-CNL
patches.drivers/drm-i915-cnl-WaPipeControlBefore3DStateSamplePattern
+ # jj/linux-apparmor apparmor-next
+ patches.apparmor/apparmor-fix-resource-audit-messages-when-auditing-peer.patch
+
# out-of-tree patches
patches.suse/arm64-add-PTE_ADDR_MASK.patch
patches.suse/btrfs-use-kvzalloc-to-allocate-btrfs_fs_info.patch