linux-kernel - Re: linux-next: manual merge of the userns tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 22 May 2012 08:29:24 -0600
From:	ebiederm@...ssion.com (Eric W. Biederman)
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Linus <torvalds@...ux-foundation.org>
Subject: Re: linux-next: manual merge of the userns tree with Linus' tree

Stephen Rothwell <sfr@...b.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/