linux-kernel - git merge conflict resolution?

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 24 Sep 2009 18:18:30 -0700
From:	Joe Perches <joe@...ches.com>
To:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	git@...r.kernel.org
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Russell King <rmk+kernel@....linux.org.uk>
Subject: git merge conflict resolution?

Question about how git does merge conflict resolution.

This patch doesn't really apply, and the results after the
patch aren't what at least I expect.

Patch 1: ====================

On Fri, 2009-09-25 at 01:01 +0000, Linux Kernel Mailing List wrote:
> Gitweb:     http://git.kernel.org/linus/784546839fd45de485b9e9e4cd072b9d53100aa5
> Commit:     784546839fd45de485b9e9e4cd072b9d53100aa5
> Parent:     07198871dac00e9c250d647e1976d7aee527b805
>     ARM: Update mailing list addresses
>     The old list has now been closed off; update the now invalid addresses.
>     Signed-off-by: Russell King <rmk+kernel@....linux.org.uk>
> ---
>  MAINTAINERS |  106 +++++++++++++++++++++++++++++-----------------------------
>  1 files changed, 53 insertions(+), 53 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 837b598..12be157 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -497,7 +497,7 @@ F:	arch/arm/include/asm/floppy.h
>  
>  ARM PORT
>  M:	Russell King <linux@....linux.org.uk>
> -L:	linux-arm-kernel@...ts.arm.linux.org.uk	(subscribers-only)
> +L:	linux-arm-kernel@...ts.infradead.org
>  W:	http://www.arm.linux.org.uk/
>  S:	Maintained
>  F:	arch/arm/

====================

vs the patch that was applied a bit earlier:

Patch 2: ====================

commit efc03ecb9d674588a13aee27289c2af2afe5e6b4
Author: Joe Perches <joe@...ches.com>
Date:   Mon Sep 21 17:04:27 2009 -0700

    MAINTAINERS: move ARM lists to infradead

====================

Patch 2 was applied before patch 1.

Russell's patch removes the "(moderated for non-subscribers)"
from each entry, yet the final result includes it.

Can someone help me understand why?

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/