From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Gregory Haskins <gregory.haskins@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the alacrity tree with Linus' tree
Date: Thu, 24 Mar 2011 13:06:07 +1100 [thread overview]
Message-ID: <20110324130607.520e2edf.sfr@canb.auug.org.au> (raw)
Hi Gregory,
Today's linux-next merge of the alacrity tree got a conflict in
MAINTAINERS between commit 4e850855d747 ("MAINTAINERS: remove SHARP
LH7A40X section") from Linus' tree and commit 86613d42e644 ("shm-signal:
shared-memory signals") from the alacrity tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
Is this stuff ever going to be merged into Linus' tree? It is based on
v2.6.34 and the last change was in May, 2010. If you have given up on it,
I need to remove it from linux-next.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc MAINTAINERS
index 749f9cd,5268733..0000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3406,10 -2990,16 +3406,16 @@@ F: drivers/net/ioc3-eth.
IOC3 SERIAL DRIVER
M: Pat Gefre <pfg@sgi•com>
-L: linux-mips@linux-mips•org
+L: linux-serial@vger•kernel.org
S: Maintained
-F: drivers/serial/ioc3_serial.c
+F: drivers/tty/serial/ioc3_serial.c
+ IOQ LIBRARY
+ M: Gregory Haskins <ghaskins@novell•com>
+ S: Maintained
+ F: include/linux/ioq.h
+ F: lib/ioq.c
+
IP MASQUERADING
M: Juanjo Ciarlante <jjciarla@raiz•uncu.edu.ar>
S: Maintained
@@@ -5660,6 -5032,23 +5666,12 @@@ M: Robin Holt <holt@sgi•com
S: Maintained
F: drivers/misc/sgi-xp/
-SHARP LH SUPPORT (LH7952X & LH7A40X)
-M: Marc Singer <elf@buici•com>
-W: http://projects.buici.com/arm
-L: linux-arm-kernel@lists•infradead.org (moderated for non-subscribers)
-S: Maintained
-F: Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
-F: arch/arm/mach-lh7a40x/
-F: drivers/serial/serial_lh7a40x.c
-F: drivers/usb/gadget/lh7a40*
-F: drivers/usb/host/ohci-lh7a40*
-
+ SHM-SIGNAL LIBRARY
+ M: Gregory Haskins <ghaskins@novell•com>
+ S: Maintained
+ F: include/linux/shm_signal.h
+ F: lib/shm_signal.c
+
SIMPLE FIRMWARE INTERFACE (SFI)
M: Len Brown <lenb@kernel•org>
L: sfi-devel@simplefirmware•org
next reply other threads:[~2011-03-24 2:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-24 2:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-25 4:06 linux-next: manual merge of the alacrity tree with Linus' tree Stephen Rothwell
2010-08-16 4:19 Stephen Rothwell
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=20110324130607.520e2edf.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gregory.haskins@gmail$(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