From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Marc Zyngier <marc.zyngier@arm.com>,
Bjorn Helgaas <bhelgaas@google.com>,
"Suthikulpanit, Suravee" <Suravee.Suthikulpanit@amd.com>
Subject: Re: linux-next: manual merge of the pm tree with Linus' tree
Date: Mon, 09 Nov 2015 01:46:01 +0100 [thread overview]
Message-ID: <4227495.5k86JKlag9@vostro.rjw.lan> (raw)
In-Reply-To: <20151109104512.781b6af2@canb.auug.org.au>
On Monday, November 09, 2015 10:45:12 AM Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> Today's linux-next merge of the pm tree got a conflict in:
>
> drivers/of/of_pci.c
> include/linux/of_pci.h
>
> between commits:
>
> f81c11af617c ("of/pci: Add of_pci_check_probe_only to parse "linux,pci-probe-only"")
>
> from Linus' tree and commit:
>
> 50230713b639 ("PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks a lot for taking care of this!
Rafael
next prev parent reply other threads:[~2015-11-09 0:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-08 23:45 linux-next: manual merge of the pm tree with Linus' tree Stephen Rothwell
2015-11-09 0:46 ` Rafael J. Wysocki [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-24 1:39 Stephen Rothwell
2025-11-24 10:32 ` Rafael J. Wysocki
2018-10-29 2:01 Stephen Rothwell
2018-10-30 7:33 ` Rafael J. Wysocki
2015-11-08 23:45 Stephen Rothwell
2014-08-11 1:43 Stephen Rothwell
2014-08-12 1:11 ` Rafael J. Wysocki
2014-08-11 1:41 Stephen Rothwell
2012-05-18 5:48 Stephen Rothwell
2012-05-18 19:08 ` 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=4227495.5k86JKlag9@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=Suravee.Suthikulpanit@amd.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox