From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758151Ab2EVO3h (ORCPT ); Tue, 22 May 2012 10:29:37 -0400 Received: from out02.mta.xmission.com ([166.70.13.232]:46540 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752960Ab2EVO3f (ORCPT ); Tue, 22 May 2012 10:29:35 -0400 From: ebiederm@xmission.com (Eric W. Biederman) To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Linus References: <20120522174426.1cd39ec7841e7545bb340cdd@canb.auug.org.au> Date: Tue, 22 May 2012 08:29:24 -0600 In-Reply-To: <20120522174426.1cd39ec7841e7545bb340cdd@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 22 May 2012 17:44:26 +1000") Message-ID: <87likkmgqj.fsf@xmission.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-XM-SPF: eid=;;;mid=;;;hst=in01.mta.xmission.com;;;ip=208.38.5.102;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX19AiUFwvWiTIQAzl0G64W/8X+uqFjC/TGE= X-SA-Exim-Connect-IP: 208.38.5.102 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 TVD_RCVD_IP TVD_RCVD_IP * 0.1 XMSubLong Long Subject * 0.0 T_TM2_M_HEADER_IN_MSG BODY: T_TM2_M_HEADER_IN_MSG * -3.0 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa06 1397; Body=1 Fuz1=1 Fuz2=1] X-Spam-DCC: XMission; sa06 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Stephen Rothwell X-Spam-Relay-Country: Subject: Re: linux-next: manual merge of the userns tree with Linus' tree X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Fri, 06 Aug 2010 16:31:04 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell 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