LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ralf Baechle <ralf@linux-mips.org>, James Hogan <james.hogan@imgtec.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Paul Burton <paul.burton@imgtec.com>,
	Tero Kristo <t-kristo@ti.com>,
	Stephen Boyd <sboyd@codeaurora.org>
Subject: linux-next: manual merge of the mips tree with Linus' tree
Date: Tue, 11 Jul 2017 10:04:25 +1000	[thread overview]
Message-ID: <20170711100425.3faaf38b@canb.auug.org.au> (raw)

Hi all,

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

  drivers/clk/Kconfig

between commit:

  b745c0794e2f ("clk: keystone: Add sci-clk driver support")

from Linus' tree and commit:

  5e2722808156 ("clk: boston: Add a driver for MIPS Boston board clocks")

from the mips 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/clk/Kconfig
index d406b087553f,251a22139e73..000000000000
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@@ -221,7 -219,7 +221,8 @@@ config COMMON_CLK_VC
  
  source "drivers/clk/bcm/Kconfig"
  source "drivers/clk/hisilicon/Kconfig"
+ source "drivers/clk/imgtec/Kconfig"
 +source "drivers/clk/keystone/Kconfig"
  source "drivers/clk/mediatek/Kconfig"
  source "drivers/clk/meson/Kconfig"
  source "drivers/clk/mvebu/Kconfig"

             reply	other threads:[~2017-07-11  0:04 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-11  0:04 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-05-25  0:05 Stephen Rothwell
2019-09-18 11:33 Mark Brown
2019-08-11 23:19 Stephen Rothwell
2019-08-07  0:25 Stephen Rothwell
2019-08-07  7:42 ` Arnd Bergmann
2019-05-12 23:47 Stephen Rothwell
2018-08-23 22:37 Stephen Rothwell
2017-01-03  0:26 Stephen Rothwell
2016-01-24 22:25 Stephen Rothwell
2016-01-25  7:42 ` Ralf Baechle
2015-10-01  1:13 Stephen Rothwell
2015-02-22  0:22 Stephen Rothwell
2015-02-22  0:15 Stephen Rothwell
2015-02-13  0:11 Stephen Rothwell
2015-02-13 10:28 ` Ralf Baechle
2014-06-03  0:50 Stephen Rothwell
2012-10-04  0:35 Stephen Rothwell
2012-10-01  3:58 Stephen Rothwell
2011-11-07  0:04 Stephen Rothwell
2011-11-07  0:04 Stephen Rothwell
2011-11-07 10:18 ` Ralf Baechle
2009-12-14 23:20 Stephen Rothwell
2009-12-15  7:26 ` Michal Simek
2009-12-15 19:27   ` Ralf Baechle
2009-08-18  8:23 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=20170711100425.3faaf38b@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=james.hogan@imgtec.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=paul.burton@imgtec.com \
    --cc=ralf@linux-mips.org \
    --cc=sboyd@codeaurora.org \
    --cc=t-kristo@ti.com \
    --subject='Re: linux-next: manual merge of the mips tree with Linus'\'' 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).