From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Steven Miao <realmz6@gmail.com>,
Mike Frysinger <vapier.adi@gmail.com>,
Bob Liu <lliubbo@gmail.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
Nicholas Mc Guire <hofrat@osadl.org>
Subject: linux-next: manual merge of the blackfin tree with Linus' tree
Date: Fri, 24 Apr 2015 10:16:19 +1000 [thread overview]
Message-ID: <20150424101619.1eaa6cdc@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 594 bytes --]
Hi all,
Today's linux-next merge of the blackfin tree got a conflict in
arch/blackfin/mach-common/smp.c between commit a17b4b7487eb ("blackfin:
Use common outgoing-CPU-notification code") from Linus' tree and commit
ca2b83264d99 ("blackfin: make timeout HZ independent") from the
blackfin tree.
I fixed it up (the former supercedes the latter, I think) and can carry
the fix as necessary (no action is required).
P.S. Steven, you committed that blackfin tree patch, but did not add you
Signed-off-by ...
--
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-04-24 0:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-24 0:16 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-09-17 1:26 linux-next: manual merge of the blackfin tree with Linus' tree Stephen Rothwell
2009-09-17 1:34 ` Mike Frysinger
2009-09-17 2:00 ` 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=20150424101619.1eaa6cdc@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hofrat@osadl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lliubbo@gmail.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=realmz6@gmail.com \
--cc=vapier.adi@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).