From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Heiko Stuebner <heiko@sntech•de>,
Kevin Hilman <khilman@baylibre•com>,
Carlo Caione <carlo@caione•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Martin Blumenstingl <martin.blumenstingl@googlemail•com>,
Enric Balletbo i Serra <enric.balletbo@collabora•com>
Subject: linux-next: manual merge of the rockchip tree with the amlogic tree
Date: Wed, 24 Apr 2019 09:31:37 +1000 [thread overview]
Message-ID: <20190424093137.241407fe@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
Hi all,
Today's linux-next merge of the rockchip tree got a conflict in:
arch/arm/configs/multi_v7_defconfig
between commit:
029da5e5266c ("ARM: multi_v7_defconfig: enable the Amlogic Meson ADC and eFuse drivers")
from the amlogic tree and commit:
366391f04177 ("ARM: multi_v7_defconfig: Enable missing drivers for supported Chromebooks")
from the rockchip 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 1fd4b8fcce2e,d160ac4bad21..000000000000
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -984,7 -989,7 +994,8 @@@ CONFIG_PHY_UNIPHIER_USB2=
CONFIG_OMAP_USB2=y
CONFIG_TI_PIPE3=y
CONFIG_TWL4030_USB=m
+CONFIG_MESON_MX_EFUSE=m
+ CONFIG_ROCKCHIP_EFUSE=m
CONFIG_NVMEM_IMX_OCOTP=y
CONFIG_NVMEM_SUNXI_SID=y
CONFIG_NVMEM_VF610_OCOTP=y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-04-23 23:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-23 23:31 Stephen Rothwell [this message]
2019-04-26 19:25 ` linux-next: manual merge of the rockchip tree with the amlogic tree Martin Blumenstingl
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=20190424093137.241407fe@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=carlo@caione$(echo .)org \
--cc=enric.balletbo@collabora$(echo .)com \
--cc=heiko@sntech$(echo .)de \
--cc=khilman@baylibre$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.blumenstingl@googlemail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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