From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: David Howells <dhowells@redhat.com>
Cc: 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 11:48:56 -0700 [thread overview]
Message-ID: <1350413336.8077.6.camel@dabdike> (raw)
In-Reply-To: <21164.1349774145@warthog.procyon.org.uk>
On Tue, 2012-10-09 at 10:15 +0100, David Howells wrote:
> Can you merge the following branch into the parisc tree please.
>
> This is to complete part of the UAPI disintegration for which the preparatory
> patches were pulled recently.
>
> Now that the fixups and the asm-generic chunk have been merged, I've
> regenerated the patches to get rid of those dependencies and to take account of
> any changes made so far in the merge window. If you have already pulled the
> older version of the branch aimed at you, then please feel free to ignore this
> request.
>
> The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8:
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.
James
next prev parent reply other threads:[~2012-10-16 18:48 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 [this message]
2012-10-16 19:08 ` David Howells
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=1350413336.8077.6.camel@dabdike \
--to=james.bottomley@hansenpartnership.com \
--cc=dhowells@redhat.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