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
| ||
|
Date: Tue, 25 Sep 2012 15:38:44 -0700 From: Greg KH <greg@...ah.com> To: Stephen Rothwell <sfr@...b.auug.org.au> 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: 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists