From: David Howells <dhowells@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: dhowells@redhat.com, Andrew Morton <akpm@linux-foundation.org>,
David Miller <davem@davemloft.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the akpm-current tree with the sparc tree
Date: Fri, 21 Feb 2014 11:32:44 +0000 [thread overview]
Message-ID: <28092.1392982364@warthog.procyon.org.uk> (raw)
In-Reply-To: <20140221174238.acefa05c8a5e71b06155d32d@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the akpm-current tree got a conflict in
> drivers/sbus/char/jsflash.c between commit 967f038e491b ("Sparc:
> sparc_cpu_model isn't in asm/system.h any more [ver #2]") from the sparc
> tree and commit 695f43eb1721 ("asm/system.h: sparc: sparc_cpu_model isn't
> in asm/system.h any more") from the akpm-current tree.
I think Andrew's is an old version.
David
next prev parent reply other threads:[~2014-02-21 11:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-21 6:42 linux-next: manual merge of the akpm-current tree with the sparc tree Stephen Rothwell
2014-02-21 11:32 ` David Howells [this message]
2014-02-21 17:19 ` David Miller
2017-03-29 5:37 Stephen Rothwell
2017-03-29 5:43 ` David Miller
2017-04-11 17:27 ` Pasha Tatashin
2017-04-11 17:39 ` David Miller
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=28092.1392982364@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).