From mboxrd@z Thu Jan 1 00:00:00 1970 From: broonie@kernel.org (Mark Brown) Date: Sun, 27 May 2018 19:42:43 +0100 Subject: linux-next: manual merge of the userns tree with the arm tree In-Reply-To: <876039uf30.fsf@xmission.com> References: <20180525101455.GI4828@sirena.org.uk> <876039uf30.fsf@xmission.com> Message-ID: <20180527184243.GC1564@sirena.org.uk> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Sun, May 27, 2018 at 01:29:55PM -0500, Eric W. Biederman wrote: > Mark Brown writes: > > 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: