| 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
| ||
|
Message-Id: <20081013.012015.107936001.davem@davemloft.net> Date: Mon, 13 Oct 2008 01:20:15 -0700 (PDT) From: David Miller <davem@...emloft.net> To: adobriyan@...il.com Cc: torvalds@...l.org, linux-kernel@...r.kernel.org Subject: Re: [GIT] /proc From: Alexey Dobriyan <adobriyan@...il.com> Date: Mon, 13 Oct 2008 12:19:08 +0400 > Linus, please, pull from > > git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git proc It doesn't merge without conflicts: davem@...set:~/src/GIT/linux-2.6$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git proc remote: Counting objects: 100, done. remote: Compressing objects: 100% (17/17), done. remote: Total 71 (delta 60), reused 64 (delta 53) Unpacking objects: 100% (71/71), done. >From git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc * branch proc -> FETCH_HEAD Auto-merged Documentation/filesystems/proc.txt CONFLICT (delete/modify): arch/sparc/include/asm/dma_32.h deleted in HEAD and modified in 3bbfe0596746e1590888a6e1e6a07583265238b7. Version 3bbfe0596746e1590888a6e1e6a07583265238b7 of arch/sparc/include/asm/dma_32.h left in tree. Auto-merged kernel/sysctl.c Automatic merge failed; fix conflicts and then commit the result. davem@...set:~/src/GIT/linux-2.6$ This is caused by my sparc merge that Linux took in mid-day Sunday. -- 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/
Powered by blists - more mailing lists