Re: [GIT] /proc

[Alexey Dobriyan]

On Mon, Oct 13, 2008 at 01:20:15AM -0700, David Miller wrote:
> From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
> 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:

So be it. Linus should just rm arch/sparc/include/asm/dma_32.h and commit.

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