Re: linux-next: manual merge of the staging tree with the vfs tree

Greg KH
2013-04-10T14:57:31Z

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