From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, "Rafael J. Wysocki" <rjw@sisk.pl>
Subject: Re: linux-next: manual merge of the pci tree with the pci-current tree
Date: Fri, 6 Feb 2009 09:09:31 -0800 [thread overview]
Message-ID: <200902060909.32549.jbarnes@virtuousgeek.org> (raw)
In-Reply-To: <20090206135041.fd7a8e7e.sfr@canb.auug.org.au>
On Thursday, February 5, 2009 6:50 pm Stephen Rothwell wrote:
> Hi Jesse,
>
> Today's linux-next merge of the pci tree got a conflict in
> drivers/pci/pcie/portdrv_pci.c between commit
> 27be54a65c89c4b4aa9b25fc6fba31ffd01a08ca ("PCI: PCIe portdrv: Simplify
> suspend and resume") from the pci-current tree and commit
> 120d3f44dd4c7a16ac71f26d4ff44ad7498cb81a ("PCI: PCIe portdrv: Implement
> pm object") from the pci tree.
>
> I fixed it up (I used the pci tree version) and assume it will be fixed in
> the pci tree soon.
Oops yeah, thanks for bringing this up. I didn't rebase my linux-next branch
on top of my for-linus branch with the last set of changes... Will do.
--
Jesse Barnes, Intel Open Source Technology Center
next prev parent reply other threads:[~2009-02-06 17:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-06 2:50 linux-next: manual merge of the pci tree with the pci-current tree Stephen Rothwell
2009-02-06 17:09 ` Jesse Barnes [this message]
2009-02-06 23:49 ` Rafael J. Wysocki
2009-02-07 0:07 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-03-26 0:57 Stephen Rothwell
2010-03-26 2:10 ` Jesse Barnes
2010-03-26 2:48 ` Stephen Rothwell
2010-03-26 16:03 ` Jesse Barnes
2010-03-26 14:43 ` Bjorn Helgaas
2014-03-12 13:00 Mark Brown
2016-02-24 0:02 Stephen Rothwell
2018-08-01 0:42 Stephen Rothwell
2024-06-03 0:24 Stephen Rothwell
2024-10-24 0:25 Stephen Rothwell
2024-10-24 6:56 ` Bartosz Golaszewski
2024-10-24 18:50 ` Bjorn Helgaas
2026-01-05 0:55 Stephen Rothwell
2026-10-09 19:27 Mark Brown
2026-10-13 7:55 ` Geert Uytterhoeven
2026-10-13 11:15 ` Lukas Wunner
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=200902060909.32549.jbarnes@virtuousgeek.org \
--to=jbarnes@virtuousgeek.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.