Messages in this thread | | | Date | Tue, 25 Sep 2012 15:38:44 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the vfs tree |
| |
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
| |