All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
	Thierry Reding <treding@nvidia.com>,
	Heiko Stuebner <heiko@sntech.de>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Tony Lindgren <tony@atomide.com>,
	Enric Balletbo i Serra <enric.balletbo@collabora.com>
Subject: linux-next: manual merge of the tegra tree with the rockchip tree
Date: Wed, 24 Apr 2019 09:43:23 +1000	[thread overview]
Message-ID: <20190424094323.0ec123f0@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]

Hi all,

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

  arch/arm/configs/multi_v7_defconfig

between commit:

  366391f04177 ("ARM: multi_v7_defconfig: Enable missing drivers for supported Chromebooks")

from the rockchip tree and commit:

  35f8e2e29e74 ("ARM: multi_v7_defconfig: Update for moved options")

from the tegra 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 arch/arm/configs/multi_v7_defconfig
index 7a288d18e257,88d4da77ae9b..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -511,9 -501,6 +509,7 @@@ CONFIG_MFD_AC100=
  CONFIG_MFD_AXP20X_I2C=y
  CONFIG_MFD_AXP20X_RSB=y
  CONFIG_MFD_CROS_EC=m
- CONFIG_CROS_EC_I2C=m
- CONFIG_CROS_EC_SPI=m
 +CONFIG_MFD_CROS_EC_CHARDEV=m
  CONFIG_MFD_DA9063=m
  CONFIG_MFD_MAX14577=y
  CONFIG_MFD_MAX77686=y

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2019-04-23 23:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-23 23:43 Stephen Rothwell [this message]
2019-04-24 14:59 ` linux-next: manual merge of the tegra tree with the rockchip tree Tony Lindgren

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=20190424094323.0ec123f0@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=ccross@android.com \
    --cc=enric.balletbo@collabora.com \
    --cc=heiko@sntech.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=tony@atomide.com \
    --cc=treding@nvidia.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.