Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1659369 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-06-07 06:50 +0200 |
| Last post | 2017-06-07 06:50 +0200 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the kselftest tree with the jc_docs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-07 06:50 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-06-07 06:50 +0200 |
| Subject | linux-next: manual merge of the kselftest tree with the jc_docs tree |
| Message-ID | <tPB4R-1Mq-1@gated-at.bofh.it> |
Hi Shuah,
Today's linux-next merge of the kselftest tree got a conflict in:
MAINTAINERS
between commit:
c061f33f35be ("doc: ReSTify seccomp_filter.txt")
from the jc_docs tree and commit:
11fe3c3f54f9 ("selftests: Make test_harness.h more generally available")
from the kselftest tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index d0cda330adbb,ef292b8c771d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11599,7 -11492,7 +11599,8 @@@ F: kernel/seccomp.
F: include/uapi/linux/seccomp.h
F: include/linux/seccomp.h
F: tools/testing/selftests/seccomp/*
+ F: tools/testing/selftests/kselftest_harness.h
+F: Documentation/userspace-api/seccomp_filter.rst
K: \bsecure_computing
K: \bTIF_SECCOMP\b
Back to top | Article view | linux.kernel
csiph-web