mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>,
	Lin Ming <ming.m.lin@intel.com>, Len Brown <len.brown@intel.com>,
	FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: linux-pci@vger.kernel.org,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [git pull] PCI changes for 2.6.33
Date: Fri, 11 Dec 2009 12:22:55 -0800 (PST)	[thread overview]
Message-ID: <alpine.LFD.2.00.0912111216431.3560@localhost.localdomain> (raw)
In-Reply-To: <20091211110222.0ae1d897@jbarnes-piketon>



On Fri, 11 Dec 2009, Jesse Barnes wrote:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 linux-next
> 
> I've got a section mismatch in here, but the fix will be part of the next
> pull req (updated patch just came in recently).
> 
> Probably the biggest change here (at least my change count) is Bjorn's
> MMCONFIG rework.  It sets the stage for hot plugging of host bridges and
> _CBA and includes some nice cleanups besides.

Ok, so I got a few conflicts with the iommu/dmar changes (ACS related 
changes versus the iommu_init changes) and with the ACPICA update 
(acpi_walk_namespace() change in acpiphp_glue - it now takes a post-order 
callback too).

I resolved them all, hopefully even correctly, but people should look over 
the end result.

		Linus

  reply	other threads:[~2009-12-11 20:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-11 19:02 Jesse Barnes
2009-12-11 20:22 ` Linus Torvalds [this message]
2009-12-14  4:51   ` Lin Ming

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=alpine.LFD.2.00.0912111216431.3560@localhost.localdomain \
    --to=torvalds@linux-foundation.org \
    --cc=fujita.tomonori@lab.ntt.co.jp \
    --cc=jbarnes@virtuousgeek.org \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=ming.m.lin@intel.com \
    /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

all inboxes | Powered by JetHome®