From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg Ungerer <gerg@snapgear•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christian Dietrich <qy03fugy@stud•informatik.uni-erlangen.de>,
Geert Uytterhoeven <geert@linux-m68k•org>
Subject: linux-next: manual merge of the m68knommu tree with the m68k tree
Date: Tue, 14 Sep 2010 10:51:29 +1000 [thread overview]
Message-ID: <20100914105129.02eb5b13.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
Hi Greg,
Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/sun3/sun3ints.c between commit
72fe185cd9acbfc6e8a7afa884ae1152be706e52 ("m68k/m68knommu: Remove dead
SMP config option") from the m68k tree and commit
5313b581e4efc214c6132d32f580db6668e5c5a8 ("arch/m68k{,nommu}: Removing
dead SMP config option") from the m68knommu tree.
These appear to be the same patch with some formatting differences. I
used the version from the m68k tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-09-14 0:51 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-14 0:51 Stephen Rothwell [this message]
2010-09-14 1:21 ` linux-next: manual merge of the m68knommu tree with the m68k tree Greg Ungerer
2010-09-14 8:47 ` Geert Uytterhoeven
-- strict thread matches above, loose matches on Subject: below --
2022-05-09 23:44 Stephen Rothwell
2022-05-10 3:37 ` Michael Schmitz
2022-05-10 4:15 ` Greg Ungerer
2020-09-09 23:34 Stephen Rothwell
2020-10-13 7:24 ` Stephen Rothwell
2019-07-01 23:09 Stephen Rothwell
2019-07-09 0:25 ` Stephen Rothwell
2011-11-14 0:03 Stephen Rothwell
2011-11-14 0:29 ` Greg Ungerer
2011-11-09 0:15 Stephen Rothwell
2011-11-09 7:08 ` Greg Ungerer
2011-11-09 7:13 ` Geert Uytterhoeven
2011-11-09 7:37 ` Greg Ungerer
2011-11-09 8:19 ` Geert Uytterhoeven
2011-11-09 0:15 Stephen Rothwell
2011-06-22 1:12 Stephen Rothwell
2011-06-22 6:34 ` Greg Ungerer
2011-06-22 8:29 ` Geert Uytterhoeven
2011-06-23 6:12 ` Greg Ungerer
2009-11-26 0:58 Stephen Rothwell
2009-11-26 21:29 ` Geert Uytterhoeven
2009-11-27 4:43 ` Greg Ungerer
2009-11-27 8:43 ` Geert Uytterhoeven
2009-11-27 11:23 ` Greg Ungerer
2009-11-27 21:21 ` Geert Uytterhoeven
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=20100914105129.02eb5b13.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=geert@linux-m68k$(echo .)org \
--cc=gerg@snapgear$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=qy03fugy@stud$(echo .)informatik.uni-erlangen.de \
/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