Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2018-03-16 14:06:29 +0100
committerJiri Kosina <jkosina@suse.cz>2018-03-16 14:06:29 +0100
commit075d4ac5bfe826fe8f866b1b0410512bcffd8d2a (patch)
tree7c873b39bfd643ff8dbd4ff3cf758224135e8b37
parente802267c5ef859be0b7e6830f6ceeaf0fb5231a3 (diff)
parent70d2dc4e218e92104cf4ba5d93d181331e7bae13 (diff)
Merge remote-tracking branch 'origin/users/rgoldwyn/SLE15/for-next' into SLE15
Conflicts: series.conf
-rw-r--r--series.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/series.conf b/series.conf
index 7c150f0cc7..44c40f7180 100644
--- a/series.conf
+++ b/series.conf
@@ -10998,6 +10998,9 @@
# mkp/scsi 4.17/scsi-queue
patches.drivers/scsi-lpfc-make-several-unions-static-fix-non-ansi.patch
+ # jj/linux-apparmor apparmor-next
+ patches.apparmor/apparmor-fix-resource-audit-messages-when-auditing-peer.patch
+
# out-of-tree patches
patches.drivers/qla2xxx-Remove-unneeded-message-and-minor-cleanup-fo.patch
patches.drivers/qla2xxx-Set-IIDMA-and-fcport-state-before-qla_nvme_r.patch
@@ -11036,7 +11039,6 @@
########################################################
# end of sorted patches
########################################################
- patches.apparmor/apparmor-fix-resource-audit-messages-when-auditing-peer.patch
########################################################
#