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,
Greg Ungerer <gerg@uclinux•org>
Subject: linux-next: manual merge of the m68knommu tree with Linus' tree
Date: Wed, 25 May 2011 11:04:24 +1000 [thread overview]
Message-ID: <20110525110424.0f3dbe85.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
Hi Greg,
Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68k/kernel/m68k_ksyms.c between commit a697dc934f52 ("m68k: merge
non-mmu and mmu versions of m68k_ksyms.c") from Linus' tree and commit
e05f64c1bac9 ("m68k: merge non-mmu and mmu versions of m68k_ksyms.c")
from the m68knommu tree.
Two (slightly different) versions of the same change I used the version
from the m68knommu tree as that was comitted later.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
P.S. Greg, do I need to change your contact address?
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-05-25 1:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-25 1:04 Stephen Rothwell [this message]
2011-05-26 0:19 ` linux-next: manual merge of the m68knommu tree with Linus' tree Greg Ungerer
-- strict thread matches above, loose matches on Subject: below --
2012-06-29 1:33 Stephen Rothwell
2012-06-29 4:48 ` Greg Ungerer
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=20110525110424.0f3dbe85.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gerg@snapgear$(echo .)com \
--cc=gerg@uclinux$(echo .)org \
--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