diff for duplicates of <56CB029F.2060409@arm.com> diff --git a/a/1.txt b/N1/1.txt index 5da4a5e..a5ea118 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,7 +44,7 @@ Auto-merging arch/arm/kvm/arm.c CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c Auto-merging arch/arm/include/asm/kvm_asm.h Automatic merge failed; fix conflicts and then commit the result. -maz@approximate:~/Work/arm-platforms$ git diff arch/arm64/include/asm/kvm_host.h +maz at approximate:~/Work/arm-platforms$ git diff arch/arm64/include/asm/kvm_host.h diff --cc arch/arm64/include/asm/kvm_host.h index e3d67ff,31fe7d6..0000000 --- a/arch/arm64/include/asm/kvm_host.h diff --git a/a/content_digest b/N1/content_digest index 2730aa6..3f69ba5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,19 +4,10 @@ "ref\020160222115243.GA5779@e106950-lin.cambridge.arm.com\0" "ref\056CAF868.5020406@arm.com\0" "ref\020160222120730.GB5779@e106950-lin.cambridge.arm.com\0" - "From\0Marc Zyngier <marc.zyngier@arm.com>\0" - "Subject\0Re: next-20160222 build: 5 failures 9 warnings (next-20160222)\0" + "From\0marc.zyngier@arm.com (Marc Zyngier)\0" + "Subject\0next-20160222 build: 5 failures 9 warnings (next-20160222)\0" "Date\0Mon, 22 Feb 2016 12:44:15 +0000\0" - "To\0Brian Starkey <brian.starkey@arm.com>\0" - "Cc\0Mark Brown <broonie@kernel.org>" - Catalin Marinas <catalin.marinas@arm.com> - Will Deacon <will.deacon@arm.com> - Christoffer Dall <christoffer.dall@linaro.org> - linaro-kernel@lists.linaro.org - kvmarm@lists.cs.columbia.edu - linux-next@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " kernel-build-reports@lists.linaro.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 22/02/16 12:07, Brian Starkey wrote:\n" @@ -65,7 +56,7 @@ "CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c\n" "Auto-merging arch/arm/include/asm/kvm_asm.h\n" "Automatic merge failed; fix conflicts and then commit the result.\n" - "maz@approximate:~/Work/arm-platforms$ git diff arch/arm64/include/asm/kvm_host.h\n" + "maz at approximate:~/Work/arm-platforms$ git diff arch/arm64/include/asm/kvm_host.h\n" "diff --cc arch/arm64/include/asm/kvm_host.h\n" "index e3d67ff,31fe7d6..0000000\n" "--- a/arch/arm64/include/asm/kvm_host.h\n" @@ -93,4 +84,4 @@ "-- \n" Jazz is not dead. It just smells funny... -fb7998195b6972ad7aaf87d401efd54e65fa94167a0fa81edb742640ab86276d +640dd677d0900471392d190fb7bfab0ad1d9553b6c160fcc0b4cb56ca45a2e46
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.