From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Gortmaker <paul.gortmaker@windriver•com>,
Russell King <linux@arm•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the init tree with the arm tree
Date: Wed, 3 Jun 2015 19:20:51 +1000 [thread overview]
Message-ID: <20150603192051.42a4c95b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
Hi Paul,
Today's linux-next merge of the init tree got a conflict in
arch/arm/mach-hisi/headsmp.S between commit 02b4e2756e01 ("ARM: v7
setup function should invalidate L1 cache") from the arm tree and
commit 43e92446f1d2 ("arm/mach-hisi: remove legacy __CPUINIT section
that crept in") from the init tree.
I fixed it up (the former removed the file) 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:[~2015-06-03 9:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-03 9:20 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-03 9:21 linux-next: manual merge of the init tree with the arm tree Stephen Rothwell
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=20150603192051.42a4c95b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=paul.gortmaker@windriver$(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