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: Wed, 1 Nov 2017 17:10:07 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, Jens Axboe <axboe@...nel.dk> Cc: Linux-Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Kees Cook <keescook@...omium.org> Subject: linux-next: manual merge of the tip tree with the block tree Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/block/amiflop.c between commit: f37ecbfc238b ("amifloppy: Convert timers to use timer_setup()") from the block tree and commit: 3c557df67257 ("timer: Remove meaningless .data/.function assignments") from the tip tree. I fixed it up (I just used the former version of the motor_on_callback definition) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists