From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Maxime Ripard <maxime.ripard@free-electrons•com>,
Kukjin Kim <kgene.kim@samsung•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Timo Sigurdsson <public_timo.s@silentcreek•de>
Subject: linux-next: manual merge of the sunxi tree with the samsung tree
Date: Wed, 20 May 2015 10:31:39 +1000 [thread overview]
Message-ID: <20150520103139.14600def@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2015-05-20 0:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20150520103139.14600def@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=kgene.kim@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxime.ripard@free-electrons$(echo .)com \
--cc=public_timo.s@silentcreek$(echo .)de \
/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