[lkml]   [2019]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the y2038 tree with the crypto tree
Hi all,

Today's linux-next merge of the y2038 tree got a conflict in:


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.

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
+ padata
+ ioctl

Interfaces for kernel debugging
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2019-12-19 05:55    [W:0.044 / U:0.600 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site