From: Mike Frysinger <vapier.adi@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tejun Heo <tj@kernel.org>
Subject: Re: linux-next: manual merge of the blackfin tree with Linus' tree
Date: Wed, 16 Sep 2009 21:34:15 -0400 [thread overview]
Message-ID: <8bd0f97a0909161834j328abe5aq96b7cb69893d1094@mail.gmail.com> (raw)
In-Reply-To: <20090917112604.acbae122.sfr@canb.auug.org.au>
On Wed, Sep 16, 2009 at 21:26, Stephen Rothwell wrote:
> Today's linux-next merge of the blackfin tree got a conflict in
> arch/blackfin/mm/sram-alloc.c between commit
> b9bf3121af348d9255f1c917830fe8c2df52efcb ("percpu: use
> DEFINE_PER_CPU_SHARED_ALIGNED()") from Linus' tree and commit
> 40bf94d6d1158fb6d6d67a666e6b16ab6ac3986e ("Blackfin: push SRAM locks down
> into related ifdefs") from the blackfin tree.
>
> The latter moved the code that the former modified. I fixed it up (see
> below) and can carry the fix for a while.
ive pulled down the latest mainline and rebased my branch onto it.
thanks for the heads up.
-mike
next prev parent reply other threads:[~2009-09-17 1:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2009-09-17 2:00 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2015-04-24 0:16 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=8bd0f97a0909161834j328abe5aq96b7cb69893d1094@mail.gmail.com \
--to=vapier.adi@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tj@kernel.org \
/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).