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

[Greg KH]

On Mon, Sep 24, 2012 at 05:07:41PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/android/binder.c between commit 004223461eee ("new
> helper: __alloc_fd()") from the vfs tree and commits efde99cd281a
> ("Staging: android: binder: Make task_get_unused_fd_flags function
> static") and bf2023614201 ("Staging: android: binder: Remove an
> inconsequential conditional macro") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good 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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/