From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Maxime Ripard <maxime.ripard@free-electrons.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the sunxi tree with the arm-soc tree
Date: Mon, 24 Nov 2014 11:16:34 +1100 [thread overview]
Message-ID: <20141124111634.1498b6c1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
Hi Maxime,
Today's linux-next merge of the sunxi tree got a conflict in
arch/arm/boot/dts/sun6i-a31.dtsi between commit 123ccfcc632a ("Revert
merge of sunxi/dt") from the arm-soc tree and commits from the sunxi
tree.
I fixed it up (I just used the version from the sunxi tree) 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 --]
next reply other threads:[~2014-11-24 0:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-24 0:16 Stephen Rothwell [this message]
2014-11-27 23:36 Stephen Rothwell
2014-11-28 8:37 ` Maxime Ripard
2016-12-08 0:13 Stephen Rothwell
2017-10-30 12:22 Mark Brown
2017-10-30 13:51 ` Arnd Bergmann
2020-10-06 3:56 Stephen Rothwell
2020-10-08 13:20 ` Maxime Ripard
2020-10-25 21:54 ` Stephen Rothwell
2020-10-26 12:35 ` Maxime Ripard
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=20141124111634.1498b6c1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=olof@lixom.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®