lkml.org 
[lkml]   [2008]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [GIT] /proc
From
From: Alexey Dobriyan <adobriyan@gmail.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@sunset:~/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@sunset:~/src/GIT/linux-2.6$

This is caused by my sparc merge that Linux took in mid-day Sunday.


\
 
 \ /
  Last update: 2008-10-13 10:23    [W:0.235 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site