From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
David Miller <davem@davemloft•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Howells <dhowells@redhat•com>
Subject: linux-next: manual merge of the akpm-current tree with the sparc tree
Date: Fri, 21 Feb 2014 17:42:38 +1100 [thread overview]
Message-ID: <20140221174238.acefa05c8a5e71b06155d32d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
Hi Andrew,
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 fixed it up (I used the version from the sparc tree) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-02-21 6:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-21 6:42 Stephen Rothwell [this message]
2014-02-21 11:32 ` linux-next: manual merge of the akpm-current tree with the sparc tree David Howells
2014-02-21 17:19 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
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=20140221174238.acefa05c8a5e71b06155d32d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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