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: Mon, 13 Jan 2014 20:51:43 -0800 From: "H. Peter Anvin" <hpa@...or.com> To: Stephen Rothwell <sfr@...b.auug.org.au>, Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...nel.org>, Peter Zijlstra <peterz@...radead.org>, David Miller <davem@...emloft.net>, netdev@...r.kernel.org CC: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: manual merge of the tip tree with the net-next tree On 01/13/2014 07:02 PM, Stephen Rothwell wrote: > Hi all, > > On Mon, 13 Jan 2014 14:20:59 +1100 Stephen Rothwell > <sfr@...b.auug.org.au> wrote: >> >> On Mon, 13 Jan 2014 14:18:24 +1100 Stephen Rothwell >> <sfr@...b.auug.org.au> wrote: >>> >>> Today's linux-next merge of the tip tree got conflicts in >>> arch/arc/include/asm/Kbuild, arch/cris/include/asm/Kbuild, >>> arch/hexagon/include/asm/Kbuild, >>> arch/microblaze/include/asm/Kbuild, >>> arch/parisc/include/asm/Kbuild and >>> arch/score/include/asm/Kbuild between commit e3fec2f74f7f >>> ("lib: Add missing arch generic-y entries for >>> asm-generic/hash.h") from the net-next tree and commit >>> 93ea02bb8435 ("arch: Clean up asm/barrier.h implementations >>> using asm-generic/barrier.h") from the tip tree. >>> >>> I fixed it up (see below) and can carry the fix as necessary >>> (no action is required). >>> >>> BTW: thanks for not keeping the Kbuild files sorted :-( >> >> I missed arch/mn10300/include/asm/Kbuild the first time round. > > And ... git rerere does not work well here. It stores resolutions > by a hash of the (sanitised) conflict and since most of these files > have exactly the same conflict, I am going to have to edit 5 of > them by hand every day. > Well, you probably can keep a diff from the conflict-merge tree to the fix, but still. Is there a sensible way we can fix this in either net-next or tip? -hpa -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists