Re: [git pull] PCI changes (including maintainer change)

On Thu, Mar 22, 2012 at 2:48 PM, Jesse Barnes [off-list ref] wrote:

The following changes since commit
4f262acfde22b63498b5e4f165e53d3bb4e96400:

 Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm (2012-03-07 08:33:03 -0800)

are available in the git repository at:

 git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci linux-next

This pull has some good cleanups from Bjorn and Yinghai, as well as
some more code from Yinghai to better handle resource re-allocation
when enabled.

There's also a new initcall_debug feature from Arjan which will print
out quirk timing information to help identify slow quirks for fixing or
refinement (Yinghai sent in a few patches to do just that once the new
debug code landed).

Beyond that, I'm handing off PCI maintainership to Bjorn Helgaas.  He's
been a core PCI and Linux contributor for some time now, and has kindly
volunteered to take over.  I just don't feel I have the time for PCI
review and work that it deserves lately (I've taken on some other
projects), and haven't been as responsive lately as I'd like, so I
approached Bjorn asking if he'd like to manage things.  He's going to
give it a try, and I'm confident he'll do at least as well as I have in
keeping the tree managed, patches flowing, and keeping things stable.

There are some merge conflicts. Hope attached patch could help Linus a
little bit.

     Yinghai

On Fri, Mar 23, 2012 at 12:58 PM, Yinghai Lu [off-list ref] wrote:

There are some merge conflicts. Hope attached patch could help Linus a
little bit.

Hmm. My merge does not agree with yours at all in the MIPS
pcibios_fixup_bus() area.

Your patch re-introduces the device resource fixup that Bjorn removed,
for example.

I think my merge is correct, but hey, people should double-check.

                       Linus

On Fri, Mar 23, 2012 at 2:10 PM, Linus Torvalds
[off-list ref] wrote:

On Fri, Mar 23, 2012 at 12:58 PM, Yinghai Lu [off-list ref] wrote:

quoted

There are some merge conflicts. Hope attached patch could help Linus a
little bit.

Hmm. My merge does not agree with yours at all in the MIPS
pcibios_fixup_bus() area.

Your patch re-introduces the device resource fixup that Bjorn removed,
for example.

I think my merge is correct, but hey, people should double-check.

yes, you are right.

Yinghai