* linux-next: manual merge of the y2038 tree with the crypto tree
@ 2019-12-19 4:55 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2019-12-19 4:55 UTC (permalink / raw)
To: Arnd Bergmann, Herbert Xu, Linux Crypto List
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Daniel Jordan
[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]
Hi all,
Today's linux-next merge of the y2038 tree got a conflict in:
Documentation/core-api/index.rst
between commit:
bfcdcef8c8e3 ("padata: update documentation")
from the crypto tree and commit:
07430b71bd51 ("Documentation: document ioctl interfaces better")
from the y2038 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/core-api/index.rst
index ab0b9ec85506,3f28b2f668be..000000000000
--- a/Documentation/core-api/index.rst
+++ b/Documentation/core-api/index.rst
@@@ -39,7 -39,7 +39,8 @@@ Core utilitie
../RCU/index
gcc-plugins
symbol-namespaces
+ padata
+ ioctl
Interfaces for kernel debugging
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-12-19 4:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-19 4:55 linux-next: manual merge of the y2038 tree with the crypto tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).