From: Mark Brown <broonie@kernel.org>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Russell King <rmk+kernel@armlinux.org.uk>,
Florian Fainelli <f.fainelli@gmail.com>,
linux-arm-kernel@lists.infradead.org,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the userns tree with the arm tree
Date: Sun, 27 May 2018 19:42:43 +0100 [thread overview]
Message-ID: <20180527184243.GC1564@sirena.org.uk> (raw)
In-Reply-To: <876039uf30.fsf@xmission.com>
[-- Attachment #1: Type: text/plain, Size: 705 bytes --]
On Sun, May 27, 2018 at 01:29:55PM -0500, Eric W. Biederman wrote:
> Mark Brown <broonie@kernel.org> 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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-05-27 18:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-25 10:14 linux-next: manual merge of the userns tree with the arm tree Mark Brown
2018-05-27 18:29 ` Eric W. Biederman
2018-05-27 18:42 ` Mark Brown [this message]
2018-05-30 8:30 Stephen Rothwell
2018-06-06 0:16 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180527184243.GC1564@sirena.org.uk \
--to=broonie@kernel.org \
--cc=ebiederm@xmission.com \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).