linux-kernel - Re: linux-next: manual merge of the staging tree with the vfs 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]

Message-ID: <20130410145727.GA19302@kroah.com>
Date:	Wed, 10 Apr 2013 07:57:27 -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,
	Al Viro <viro@...iv.linux.org.uk>,
	Joe Perches <joe@...ches.com>
Subject: Re: linux-next: manual merge of the staging tree with the vfs tree

On Wed, Apr 10, 2013 at 03:54:51PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/vt6655/device_main.c between commit f805442e130c
> ("vt6655: slightly clean reading config file") from the vfs tree and
> commits 915006cddc79 ("staging:vt6655:device_main: Whitespace cleanups")
> and 5e0cc8a231be ("staging: vt6655: Convert to kernel brace style") from
> the staging tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).

Looks correct to me, thanks.

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/