From: ebiederm@xmission.com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: manual merge of the userns tree with Linus' tree
Date: Tue, 22 May 2012 08:29:24 -0600 [thread overview]
Message-ID: <87likkmgqj.fsf@xmission.com> (raw)
In-Reply-To: <20120522174426.1cd39ec7841e7545bb340cdd@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 22 May 2012 17:44:26 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Eric,
>
> Today's linux-next merge of the userns tree got a conflict in fs/stat.c
> between commit a52dd971f947 ("vfs: de-crapify "cp_new_stat()" function")
> from Linus' tree and commit a7c1938e22c0 ("userns: Convert stat to return
> values mapped from kuids and kgids") from the userns tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks good thanks.
Eric
next prev parent reply other threads:[~2012-05-22 14:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-22 7:44 linux-next: manual merge of the userns tree with Linus' tree Stephen Rothwell
2012-05-22 14:29 ` Eric W. Biederman [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-09 2:39 Stephen Rothwell
2014-04-09 2:40 Stephen Rothwell
2014-04-09 2:45 Stephen Rothwell
2014-04-17 5:06 Stephen Rothwell
2014-04-17 5:25 ` Al Viro
2014-04-17 8:44 ` Eric W. Biederman
2014-04-22 1:37 ` Stephen Rothwell
2014-04-22 1:37 ` Stephen Rothwell
2016-06-24 4:41 Stephen Rothwell
2016-07-08 6:13 Stephen Rothwell
2016-11-22 8:17 Stephen Rothwell
2016-11-22 17:44 ` Eric W. Biederman
2016-11-22 22:56 ` Stephen Rothwell
2016-11-22 22:56 ` Stephen Rothwell
2021-05-26 4:32 Stephen Rothwell
2021-05-26 4:38 Stephen Rothwell
2021-05-26 4:51 Stephen Rothwell
2021-06-25 8:22 Stephen Rothwell
2021-06-28 7: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=87likkmgqj.fsf@xmission.com \
--to=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.