From: Joerg Roedel <joro@8bytes.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Rafael J. Wysocki" <rjw@sisk.pl>
Subject: Re: linux-next: manual merge of the iommu tree with the pci-current tree
Date: Fri, 16 Dec 2011 16:30:11 +0100 [thread overview]
Message-ID: <20111216153011.GC28302@8bytes.org> (raw)
In-Reply-To: <20111216071840.6e06864f@jbarnes-vaio.home>
On Fri, Dec 16, 2011 at 07:18:40AM -0800, Jesse Barnes wrote:
> Yeah, this is probably my fault; pri-changes has drifted relative to my
> linux-next branch. I'll rebase it onto linux-next and push again.
> That should fix things.
Please don't rebase. I already pulled in the changes and don't want to
rebase that :) Can you just merge the pri-changes branch into your
linux-next branch?
Joerg
prev parent reply other threads:[~2011-12-16 15:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-16 2:30 linux-next: manual merge of the iommu tree with the pci-current tree Stephen Rothwell
2011-12-16 8:52 ` Joerg Roedel
2011-12-16 15:18 ` Jesse Barnes
2011-12-16 15:30 ` Joerg Roedel [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=20111216153011.GC28302@8bytes.org \
--to=joro@8bytes.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.