From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg Ungerer <gerg@snapgear•com>
Cc: linux-next@vger•kernel.org,
Harvey Harrison <harvey.harrison@gmail•com>,
Sam Ravnborg <sam@ravnborg•org>
Subject: linux-next: manual merge of the m68knommu tree with Linus' treee
Date: Tue, 20 Jan 2009 10:55:51 +1100 [thread overview]
Message-ID: <20090120105551.a01eb74f.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 647 bytes --]
Hi Greg,
Today's linux-next merge of the m68knommu tree got a conflict in
arch/m68knommu/include/asm/Kbuild between commit
74d96f018673759d04d032c137d132f6447bfb1e ("byteorder: make swab.h include
asm/swab.h like a regular header") from Linus' tree and commit
49148020bcb6910ce71417bd990a5ce7017f9bd3 ("m68k,m68knommu: merge header
files") from the m68knommu tree.
The latter removed the file and the former removed a line from it. So I
just removed the file. I can keep doing that or you could do a merge
with Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-01-19 23:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-19 23:55 Stephen Rothwell [this message]
2009-01-20 0:24 ` linux-next: manual merge of the m68knommu tree with Linus' treee Greg Ungerer
2009-01-20 7:06 ` Sam Ravnborg
2009-01-21 0:59 ` 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=20090120105551.a01eb74f.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gerg@snapgear$(echo .)com \
--cc=harvey.harrison@gmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sam@ravnborg$(echo .)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