From: David Howells <dhowells@redhat.com>
To: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: dhowells@redhat.com, jejb@parisc-linux.org,
linux-parisc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] Disintegrate UAPI for parisc [ver #2]
Date: Tue, 16 Oct 2012 20:08:06 +0100 [thread overview]
Message-ID: <31900.1350414486@warthog.procyon.org.uk> (raw)
In-Reply-To: <1350413336.8077.6.camel@dabdike>
James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
> I'm getting a fairly massive merge failure over our misc tree:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.0 misc
>
> It looks like a conflict with the motion to using wrappered Kbuild for
> our asm-generic clones.
I can try merging your branch in and then disintegrating on top of that.
David
prev parent reply other threads:[~2012-10-16 19:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-09 9:15 [GIT PULL] Disintegrate UAPI for parisc [ver #2] David Howells
2012-10-16 18:48 ` James Bottomley
2012-10-16 19:08 ` David Howells [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=31900.1350414486@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=jejb@parisc-linux.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.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