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, 16 Feb 2016 14:00:19 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Amitoj Kaur Chawla <amitoj1606@...il.com>, Shraddha Barke <shraddha.6596@...il.com> Subject: linux-next: manual merge of the char-misc tree with the staging tree Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/staging/goldfish/goldfish_nand.c between commit: 814625b539d3 ("staging: goldfish: goldfish_nand: Return correct error code") from the staging tree and commit: 3e2fbc7feec4 ("Staging: goldfish: goldfish_nand: Add DMA Support using dmam_alloc_coherent") from the char-misc tree. I fixed it up (the latter incorporated the former) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists