From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Subject: linux-next: manual merge of the pm tree with the pci tree
Date: Wed, 11 Feb 2015 12:07:55 +1100 [thread overview]
Message-ID: <20150211120755.50217078@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 707 bytes --]
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/of/of_pci.c between commit d2be00c0fb5a ("of/pci: Free
resources on failure in of_pci_get_host_bridge_resources()") from the
pci tree and commit 5c493df25a0d ("Merge branch 'pci/host-generic' of
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci into
acpi-resources") from the pm tree.
I fixed it up (I just use the latter version, please check when it
comes out) and can carry the fix as necessary (no action is required,
though someone might want to tell Linus how to resolve it - including
the removal of the "kfree(bus_range);").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-02-11 1:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-11 1:07 Stephen Rothwell [this message]
2015-02-11 1:41 ` linux-next: manual merge of the pm tree with the pci tree Rafael J. Wysocki
2015-02-11 2:03 ` Rafael J. Wysocki
2015-02-11 2:05 ` Lorenzo Pieralisi
-- strict thread matches above, loose matches on Subject: below --
2019-11-24 23:13 Stephen Rothwell
2019-11-25 14:06 ` Rafael J. Wysocki
2019-11-27 23:58 ` Stephen Rothwell
2019-07-01 3:24 Stephen Rothwell
2013-06-27 3:02 Stephen Rothwell
2013-04-16 2:46 Stephen Rothwell
2013-04-16 17:53 ` Rafael J. Wysocki
2013-02-20 1:55 Stephen Rothwell
2013-02-20 12:57 ` Rafael J. Wysocki
2013-02-18 1:17 Stephen Rothwell
2013-02-18 12:28 ` Rafael J. Wysocki
2013-02-18 1:11 Stephen Rothwell
2013-02-18 12:30 ` Rafael J. Wysocki
2013-02-15 1:23 Stephen Rothwell
2013-02-15 12:51 ` Rafael J. Wysocki
2013-01-30 8:35 Stephen Rothwell
2013-01-30 12:48 ` Rafael J. Wysocki
2013-01-10 0:28 Stephen Rothwell
2013-01-10 13:12 ` Rafael J. Wysocki
2013-01-10 18:30 ` Bjorn Helgaas
2012-11-06 2:48 Stephen Rothwell
2012-11-06 16:52 ` Bjorn Helgaas
2012-11-16 10:17 ` Rafael J. Wysocki
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=20150211120755.50217078@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=rjw@rjwysocki.net \
/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