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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 17 Feb 2017 15:40:24 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Andrew Morton <akpm@...ux-foundation.org>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Frederic Weisbecker <fweisbec@...il.com>, Davidlohr Bueso <dave@...olabs.net> Subject: linux-next: manual merge of the akpm-current tree with the tip tree Hi all, Today's linux-next merge of the akpm-current tree got conflicts in: arch/cris/include/asm/Kbuild arch/m32r/include/asm/Kbuild arch/parisc/include/asm/Kbuild arch/score/include/asm/Kbuild between commit: b672592f0221 ("sched/cputime: Remove generic asm headers") from the tip tree and commits: ccbd143eeee3 ("cris: use generic current.h") 103c58f13b54 ("m32r: use generic current.h") 35a25dde31aa ("score: remove asm/current.h") c6b552bc22c7 ("parisc: use generic current.h") from the akpm-current tree. I fixed it up (see below) 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 diff --cc arch/cris/include/asm/Kbuild index 9f19e19bff9d,5e320f660c3c..000000000000 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@@ -4,6 -4,8 +4,7 @@@ generic-y += barrier. generic-y += bitsperlong.h generic-y += clkdev.h generic-y += cmpxchg.h -generic-y += cputime.h + generic-y += current.h generic-y += device.h generic-y += div64.h generic-y += errno.h diff --cc arch/m32r/include/asm/Kbuild index 652100b64a71,30ee92ff0244..000000000000 --- a/arch/m32r/include/asm/Kbuild +++ b/arch/m32r/include/asm/Kbuild @@@ -1,5 -1,7 +1,6 @@@ generic-y += clkdev.h -generic-y += cputime.h + generic-y += current.h generic-y += exec.h generic-y += irq_work.h generic-y += kvm_para.h diff --cc arch/parisc/include/asm/Kbuild index 4e179d770d69,7ac070267672..000000000000 --- a/arch/parisc/include/asm/Kbuild +++ b/arch/parisc/include/asm/Kbuild @@@ -2,6 -2,8 +2,7 @@@ generic-y += auxvec.h generic-y += barrier.h generic-y += clkdev.h -generic-y += cputime.h + generic-y += current.h generic-y += device.h generic-y += div64.h generic-y += emergency-restart.h diff --cc arch/score/include/asm/Kbuild index 51970bb6c4fe,620970f837bc..000000000000 --- a/arch/score/include/asm/Kbuild +++ b/arch/score/include/asm/Kbuild @@@ -4,6 -4,8 +4,7 @@@ header-y + generic-y += barrier.h generic-y += clkdev.h -generic-y += cputime.h + generic-y += current.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h
Powered by blists - more mailing lists