From: Alexey Dobriyan <adobriyan@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: torvalds@osdl.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT] /proc
Date: Mon, 13 Oct 2008 12:33:21 +0400 [thread overview]
Message-ID: <20081013083321.GC19572@x200.localdomain> (raw)
In-Reply-To: <20081013.012015.107936001.davem@davemloft.net>
On Mon, Oct 13, 2008 at 01:20:15AM -0700, David Miller wrote:
> 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:
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.
prev parent reply other threads:[~2008-10-13 8:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-13 8:19 Alexey Dobriyan
2008-10-13 8:20 ` David Miller
2008-10-13 8:33 ` Alexey Dobriyan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081013083321.GC19572@x200.localdomain \
--to=adobriyan@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®