From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Sinan Kaya <okaya@kernel.org>, Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the pm tree with the kbuild tree
Date: Fri, 21 Dec 2018 11:59:44 +0100 [thread overview]
Message-ID: <1790706.irnnyc2D39@aspire.rjw.lan> (raw)
In-Reply-To: <20181221125945.0114b06c@canb.auug.org.au>
On Friday, December 21, 2018 2:59:45 AM CET Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> arch/arm64/Kconfig
>
> between commits:
>
> 2eac9c2dfb2b ("PCI: consolidate the PCI_DOMAINS and PCI_DOMAINS_GENERIC config options")
> 20f1b79d3359 ("PCI: consolidate the PCI_SYSCALL symbol")
>
> from the kbuild tree and commit:
>
> 52146173a033 ("arm64: select ACPI PCI code only when both features are enabled")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
The fix looks good to me, thank you!
prev parent reply other threads:[~2018-12-21 11:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-21 1:59 Stephen Rothwell
2018-12-21 10:59 ` Rafael J. Wysocki [this message]
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=1790706.irnnyc2D39@aspire.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=okaya@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=yamada.masahiro@socionext.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®