* linux-next: manual merge of the pci-current tree
@ 2008-08-01 0:22 Stephen Rothwell
2008-08-01 0:40 ` Jesse Barnes
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-08-01 0:22 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, Prarit Bhargava
[-- Attachment #1: Type: text/plain, Size: 649 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the pci-current tree
2008-08-01 0:22 linux-next: manual merge of the pci-current tree Stephen Rothwell
@ 2008-08-01 0:40 ` Jesse Barnes
2008-08-01 3:43 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Jesse Barnes @ 2008-08-01 0:40 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Prarit Bhargava
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the pci-current tree
2008-08-01 0:40 ` Jesse Barnes
@ 2008-08-01 3:43 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-08-01 3:43 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, Prarit Bhargava
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
Hi Jesse,
On Thu, 31 Jul 2008 17:40:34 -0700 Jesse Barnes <jbarnes@virtuousgeek•org> wrote:
>
> 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...
Yeah, hopefully.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-08-01 3:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-01 0:22 linux-next: manual merge of the pci-current tree Stephen Rothwell
2008-08-01 0:40 ` Jesse Barnes
2008-08-01 3:43 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox