linux-kernel - Re: linux-next: manual merge of the staging 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:	Fri, 15 Mar 2013 08:01:42 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Eric W. Biederman" <ebiederm@...ssion.com>
Subject: Re: linux-next: manual merge of the staging tree with Linus' tree

On Fri, Mar 15, 2013 at 03:13:34PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/ccg/f_fs.c between commit 7f78e0351394 ("fs: Limit
> sys_mount to only request filesystem modules") from Linus' tree and
> commit 515e6dd20b3f ("Staging: ccg: delete it from the tree") from the
> staging tree.
> 
> The latter deleted the file, so I did that and can carry the fix as
> necessary (no action is required).

Thanks, that's the correct fix :)

greg k-h
--
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/