linux-next: manual merge of the akpm tree with Linus' tree

Stephen Rothwell
2018-03-26T08:58:00Z

[-- Attachment #1: Type: text/plain, Size: 746 bytes --]

Hi Andrew,

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

ipc/mqueue.c

between commit:

cfb2f6f6e0ba ("Revert "mqueue: switch to on-demand creation of internal mount"")

from Linus' tree and patch:

"ipc/mqueue: add missing error code in init_mqueue_fs()"

from the akpm tree.

I fixed it up (I dropped the akpm tree patch) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]