linux-next: manual merge of the userns tree with the arm tree
From: broonie@kernel.org (Mark Brown)
Date: 2018-05-27 18:43:10
Also in:
linux-next, lkml
From: broonie@kernel.org (Mark Brown)
Date: 2018-05-27 18:43:10
Also in:
linux-next, lkml
On Sun, May 27, 2018 at 01:29:55PM -0500, Eric W. Biederman wrote:
Mark Brown [off-list ref] writes:
quoted
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.
Mark. Did you get a bounce from this email?
I saw this when perusing lkml but I did not receive a copy of this directly to myself.
Turns out xmission has decided to blacklist it, no idea why. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180527/33af2c40/attachment.sig>