From: David Howells <dhowells@redhat.com>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: dhowells@redhat.com, tglx@linutronix.de, x86@kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] Disintegrate UAPI for x86
Date: Fri, 05 Oct 2012 13:54:02 +0100 [thread overview]
Message-ID: <24355.1349441642@warthog.procyon.org.uk> (raw)
In-Reply-To: <506E092A.6050405@zytor.com>
H. Peter Anvin <hpa@zytor.com> wrote:
> That branch does have generic patches which are not yet in upstream. I
> presume that is intentional.
Yeah. It works better if the generic patches are there first. I thought that
as long as everyone pulls the same disintegrate-asm-generic branch at the
bottom of their tree, then git merging should work just fine.
OTOH, not everyone is willing to pull their branch in this window, so, if
Linus pulls the prep patches and Arnd pushes the asm-generic bits, then the
lower layers can go away and everyone gets a branch with only their bits on.
David
prev parent reply other threads:[~2012-10-05 12:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-04 19:51 David Howells
2012-10-04 22:09 ` H. Peter Anvin
2012-10-05 12:54 ` 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=24355.1349441642@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@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
Powered by JetHome