linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>, Bjorn Helgaas <bhelgaas@google.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the devicetree tree with the pci tree
Date: Fri, 26 Jan 2018 07:34:13 +1100	[thread overview]
Message-ID: <20180126073413.56901025@canb.auug.org.au> (raw)

Hi Rob,

Today's linux-next merge of the devicetree tree got a conflict in:

  drivers/of/Kconfig

between commit:

  4670d610d592 ("PCI: Move OF-related PCI functions into PCI core")

from the pci tree and commit:

  6019a3d07d72 ("of: enable unittests on UML")

from the devicetree 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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/of/Kconfig
index ee244c2e8c2b,06898039d11e..000000000000
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@@ -61,7 -63,11 +63,7 @@@ config OF_DYNAMI
  
  config OF_ADDRESS
  	def_bool y
- 	depends on !SPARC && HAS_IOMEM
+ 	depends on !SPARC && (HAS_IOMEM || UML)
 -	select OF_ADDRESS_PCI if PCI
 -
 -config OF_ADDRESS_PCI
 -	bool
  
  config OF_IRQ
  	def_bool y

             reply	other threads:[~2018-01-25 20:34 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-25 20:34 Stephen Rothwell [this message]
2020-05-22  5:58 Stephen Rothwell
2020-07-28  5:49 Stephen Rothwell
2020-07-28  8:26 ` Sivaprakash Murugesan
2020-07-28 15:20   ` Rob Herring
2021-10-29  2:24 Stephen Rothwell
2021-10-29 13:45 ` Rob Herring
2022-01-10  0:50 Stephen Rothwell

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=20180126073413.56901025@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=robherring2@gmail.com \
    --subject='Re: linux-next: manual merge of the devicetree tree with the pci tree' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).