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

Stephen Rothwell
2012-09-24T07:07:59Z

[-- Attachment #1: Type: text/plain, Size: 1232 bytes --]

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).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/staging/android/binder.c
index f71d624,a807129..0000000
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@@ -362,9 -362,14 +362,9 @@@ struct binder_transaction
static void
binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer);

- int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
-/*
- * copied from get_unused_fd_flags
- */
+ static int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
{
struct files_struct *files = proc->files;
- int fd, error;
- struct fdtable *fdt;
unsigned long rlim_cur;
unsigned long irqs;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]