linux-kernel - 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-next>] [day] [month] [year] [list]

Message-Id: <20120924170741.34abbc462d1c405b0b447b72@canb.auug.org.au>
Date:	Mon, 24 Sep 2012 17:07:41 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sachin Kamat <sachin.kamat@...aro.org>,
	Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the staging tree with the vfs tree

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@...b.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;
  

Content of type "application/pgp-signature" skipped