* linux-next: manual merge of the sunxi tree with the samsung tree
@ 2015-05-20 0:31 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-05-20 0:31 UTC (permalink / raw)
To: Maxime Ripard, Kukjin Kim; +Cc: linux-next, linux-kernel, Timo Sigurdsson
[-- Attachment #1: Type: text/plain, Size: 540 bytes --]
Hi Maxime,
Today's linux-next merge of the sunxi tree got a conflict in
arch/arm/configs/multi_v7_defconfig between commit 6d718eeef2c9 ("ARM:
multi_v7_defconfig: make savedefconfig for removing useless configs")
from the samsung tree and commit 51d275281c06 ("ARM: Remove deprecated
symbol from defconfig files") from the sunxi tree.
I fixed it up (they both removed CONFIG_POWER_RESET_SUN6I) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-05-20 0:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-20 0:31 linux-next: manual merge of the sunxi tree with the samsung tree Stephen Rothwell
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).