Liu Yubao <yubao.liu@xxxxxxxxx> wrote: > $ git merge "sync from origin" HEAD origin > Updating 088406b..ff51a98 > include/linux/netfilter/xt_CONNMARK.h: needs update > include/linux/netfilter/xt_DSCP.h: needs update > include/linux/netfilter/xt_MARK.h: needs update > include/linux/netfilter_ipv4/ipt_CONNMARK.h: needs update > include/linux/netfilter_ipv4/ipt_DSCP.h: needs update > include/linux/netfilter_ipv4/ipt_ECN.h: needs update > include/linux/netfilter_ipv4/ipt_MARK.h: needs update > include/linux/netfilter_ipv4/ipt_TCPMSS.h: needs update > include/linux/netfilter_ipv4/ipt_TOS.h: needs update > include/linux/netfilter_ipv4/ipt_TTL.h: needs update > include/linux/netfilter_ipv6/ip6t_HL.h: needs update > include/linux/netfilter_ipv6/ip6t_MARK.h: needs update > net/ipv4/netfilter/ipt_ECN.c: needs update > net/ipv4/netfilter/ipt_TOS.c: needs update > net/ipv4/netfilter/ipt_TTL.c: needs update > net/ipv6/netfilter/ip6t_HL.c: needs update > net/netfilter/xt_CONNMARK.c: needs update > net/netfilter/xt_DSCP.c: needs update > net/netfilter/xt_MARK.c: needs update > fatal: Entry 'net/ipv4/netfilter/ipt_ECN.c' not uptodate. Cannot merge. > > I really have never modified these files manually. You are just *very unlucky*. :-) The Linux kernel has case sensitive file names. In other words there are two files in the kernel: net/netfilter/xt_MARK.c net/netfilter/xt_mark.c and they have different content! On NTFS or FAT, where filenames are not case sensitive, these become the same file. So Git now starts to think that the file was modified, because one of those files overwrote the other when they were checked out. Moral of the story: You cannot work with the linux.git repository on a case insensitive filesystem, like NTFS, FAT (Windows), or HFS+ (Mac OS X). -- Shawn. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html