Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1199364 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-08-04 03:20 +0200 |
| Last post | 2015-08-04 03:20 +0200 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the security tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-04 03:20 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-04 03:20 +0200 |
| Subject | linux-next: manual merge of the security tree with Linus' tree |
| Message-ID | <pTz3A-3Ep-7@gated-at.bofh.it> |
Hi James,
Today's linux-next merge of the security tree got a conflict in:
security/yama/yama_lsm.c
between commit:
5413fcdbe9e7 ("Adding YAMA hooks also when YAMA is not stacked.")
from Linus' tree and commit:
730daa164e7c ("Yama: remove needless CONFIG_SECURITY_YAMA_STACKED")
from the security tree.
I fixed it up (the latter removed the code updated by the former, so I
just did that) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to top | Article view | linux.kernel
csiph-web