Messages in this thread | | | Date | Fri, 24 Mar 2023 11:46:09 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the jc_docs tree with the driver-core.current tree |
| |
Hi all,
Today's linux-next merge of the jc_docs tree got a conflict in:
Documentation/admin-guide/index.rst
between commit:
44ac5abac86b ("Documentation/security-bugs: move from admin-guide/ to process/")
from the driver-core.current tree and commit:
efe920466f51 ("docs: describe how to quickly build a trimmed kernel")
from the jc_docs 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 Documentation/admin-guide/index.rst index 09a563bbe3e7,7840fdbab585..000000000000 --- a/Documentation/admin-guide/index.rst +++ b/Documentation/admin-guide/index.rst @@@ -36,6 -36,8 +36,7 @@@ problems and bugs in particular reporting-issues reporting-regressions - security-bugs + quickly-build-trimmed-linux bug-hunting bug-bisect tainted-kernels [unhandled content-type:application/pgp-signature] | |