From: Jesse Barnes <jbarnes@virtuousgeek•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, Prarit Bhargava <prarit@redhat•com>
Subject: Re: linux-next: manual merge of the pci-current tree
Date: Thu, 31 Jul 2008 17:40:34 -0700 [thread overview]
Message-ID: <200807311740.34603.jbarnes@virtuousgeek.org> (raw)
In-Reply-To: <20080801102245.2c25f666.sfr@canb.auug.org.au>
On Thursday, July 31, 2008 5:22 pm Stephen Rothwell wrote:
> Hi Jesse,
>
> Today's linux-next merge of the pci-current tree got a conflict in
> arch/x86/kernel/pci-gart_64.c between commit
> 7968531880c89b3c987e6a7a0d33eafb0962d8d9 ("Revert "Merge branch
> 'x86/iommu' of
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into
> for-linus"") from the linux-next tree and commit
> 074ec1727196c4a2ba2f909902d55ec5014e50c3 ("PCI: GART iommu alignment
> fixes") from the pci-current tree.
>
> This is, of course caused by my revert of the iommu_num_pages patches. I
> fixed it up as best I could.
Hopefully Linus will pull the iommu fixes soon and your revert won't be
necessary. Otherwise I'll take care of things tomorrow or so...
Thanks,
Jesse
next prev parent reply other threads:[~2008-08-01 0:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-01 0:22 linux-next: manual merge of the pci-current tree Stephen Rothwell
2008-08-01 0:40 ` Jesse Barnes [this message]
2008-08-01 3:43 ` Stephen Rothwell
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=200807311740.34603.jbarnes@virtuousgeek.org \
--to=jbarnes@virtuousgeek$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=prarit@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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