Skip to contentSkip to conversation

Bring linux-mips in sync with Linus' tree

PATCH New Martin Michlmayr 2 participants 9 messages Mar 20, 2006

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

The following is a series of six patches to bring the linux-mips tree in sync with Linus' tree. These are changes that have to be made on the linux-mips side. Another series will be posted for inclusion in -mm to bring the Linus' tree in sync with linux-mips where necessary.

[PATCH 1/6] [CHAR] Remove obsolete IBM z50 (vr41xx) keyboard map [PATCH 2/6] [VIDEO] Remove trailing whitespace from drivers/video/Kconfig [PATCH 3/6] Remove bogus blank lines - sync with Linus' tree [PATCH 4/6] [NET] Fix NET_SB1250_MAC Kconfig order to match Linus' tree [PATCH 5/6] [MIPS] vr41xx: remove timex.h
[PATCH 6/6] [MTD] Remove typecast from drivers/mtd/maps/lasat.c

Signature · 2 lines
Martin Michlmayr
http://www.cyrius.com/
#1 lore raw

PATCH 1/6 Remove obsolete IBM z50 (vr41xx) keyboard map

Remove the keymap for the IBM z50 workpad since 2.6 doesn't include a keyboard driver for this platform. This also brings the linux-mips tree in sync with mainline.

drivers/char/Makefile +1 -2
@@ -121,8 +115,7 @@
 
 ifdef GENERATE_KEYMAP
 
-$(obj)/defkeymap.c $(obj)/qtronixmap.c $(obj)/ibm_workpad_keymap.c: \
-		$(obj)/%.c: $(src)/%.map
+$(obj)/defkeymap.c $(obj)/qtronixmap.c: $(obj)/%.c: $(src)/%.map
 	loadkeys --mktable $< > [email protected]
 	sed -e 's/^static *//' [email protected] > $@
 	rm [email protected]
drivers/char/ibm_workpad_keymap.map +0 -343

343 lines not on this page · raw message

Signature · 2 lines
Martin Michlmayr
http://www.cyrius.com/
#2 lore raw

PATCH 2/6 Remove trailing whitespace from drivers/video/Kconfig

In reply to Martin Michlmayr

Remove trailing whitespace from drivers/video/Kconfig, thereby syncing with with Linus' tree.

drivers/video/Kconfig +2 -2
@@ -1336,8 +1336,8 @@ config FB_PMAGB_B
  	select FB_CFB_IMAGEBLIT
 	help
 	  Support for the PMAGB-B TURBOchannel framebuffer card used mainly
-	  in the MIPS-based DECstation series. The card is currently only 
-	  supported in 1280x1024x8 mode.  
+	  in the MIPS-based DECstation series. The card is currently only
+	  supported in 1280x1024x8 mode.
 
 config FB_MAXINE
 	bool "Maxine (Personal DECstation) onboard framebuffer support"
Signature · 2 lines
Martin Michlmayr
http://www.cyrius.com/
#3 lore raw

PATCH 3/6 Remove bogus blank lines - sync with Linus' tree

In reply to Martin Michlmayr

This brings video/au1100fb.c and mach-au1x00/au1xxx_ide.h in sync with Linus' tree by removing two blank lines.

drivers/video/au1100fb.c +0 -1
@@ -38,7 +38,6 @@
  *  with this program; if not, write  to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
include/asm-mips/mach-au1x00/au1xxx_ide.h +0 -1
@@ -84,7 +84,6 @@
 } _auide_hwif;
 
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-
 /* HD white list */
 static const struct drive_list_entry dma_white_list [] = {
 /*
Signature · 2 lines
Martin Michlmayr
http://www.cyrius.com/
#4 lore raw

PATCH 4/6 Fix NET_SB1250_MAC Kconfig order to match Linus' tree

In reply to Martin Michlmayr

The Kconfig option NET_SB1250_MAC is listed in different places in drivers/net/Kconfig in the Linus' and linux-mips trees. Bring them into sync.

drivers/net/Kconfig +4 -4
@@ -460,6 +452,10 @@
 	  If you have an Alchemy Semi AU1X00 based system
 	  say Y.  Otherwise, say N.
 
+config NET_SB1250_MAC
+	tristate "SB1250 Ethernet support"
+	depends on NET_ETHERNET && SIBYTE_SB1xxx_SOC
+
 config SGI_IOC3_ETH
 	bool "SGI IOC3 Ethernet"
 	depends on NET_ETHERNET && PCI && SGI_IP27
@@ -2009,10 +1997,6 @@
 
 	  If in doubt, say N.
 
-config NET_SB1250_MAC
-	tristate "SB1250 Ethernet support"
-	depends on SIBYTE_SB1xxx_SOC
-
 config R8169_VLAN
 	bool "VLAN support"
 	depends on R8169 && VLAN_8021Q
Signature · 2 lines
Martin Michlmayr
http://www.cyrius.com/
#5 lore raw

PATCH 5/6 vr41xx: remove timex.h

In reply to Martin Michlmayr

From: Yoichi Yuasa <[email protected]>

vr41xx doesn't need mach-vr41xx/timex.h so remove it. This also brings the linux-mips tree in sync with Linus' tree.

include/asm-mips/mach-vr41xx/timex.h +0 -18
@@ -1,18 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2003 by Ralf Baechle
- */
-/*
- * Changes:
- *  Yoichi Yuasa <[email protected]>
- *  - CLOCK_TICK_RATE is changed into 32768 from 6144000.
- */
-#ifndef __ASM_MACH_VR41XX_TIMEX_H
-#define __ASM_MACH_VR41XX_TIMEX_H
-
-#define CLOCK_TICK_RATE		32768
-
-#endif /* __ASM_MACH_VR41XX_TIMEX_H */
Signature · 2 lines
Martin Michlmayr
http://www.cyrius.com/
#6 lore raw

PATCH 6/6 Remove typecast from drivers/mtd/maps/lasat.c

In reply to Martin Michlmayr

Remove an unneeded typecast from drivers/mtd/maps/lasat.c, thereby bringing the file in sync with Linus' tree.

drivers/mtd/maps/lasat.c +3 -2
@@ -7,7 +7,8 @@
  * modify it under the terms of the GNU General Public License version
  * 2 as published by the Free Software Foundation.
  *
- * $Id: lasat.c,v 1.7 2004/07/12 21:59:44 dwmw2 Exp $
+ * $Id: lasat.c,v 1.9 2004/11/04 13:24:15 gleixner Exp $
+ *
  *
  */
 
@@ -50,7 +51,7 @@ static int __init init_lasat(void)
 	ENABLE_VPP((&lasat_map));
 
 	lasat_map.phys = lasat_flash_partition_start(LASAT_MTD_BOOTLOADER);
-	lasat_map.virt = (unsigned long)ioremap_nocache(
+	lasat_map.virt = ioremap_nocache(
 		        lasat_map.phys, lasat_board_info.li_flash_size);
 	lasat_map.size = lasat_board_info.li_flash_size;
 
Signature · 2 lines
Martin Michlmayr
http://www.cyrius.com/
#7 lore raw
In reply to Martin Michlmayr
Quoted 4 lines · Martin Michlmayr

The following is a series of six patches to bring the linux-mips tree
in sync with Linus' tree. These are changes that have to be made on the linux-mips side.

Confused. Isn't all this stuff in Ralf's git tree? It should be.

That way, it all gets merged when Ralf does his next Linus merge.

#8 lore raw
Quoted 4 lines · Andrew Morton
Quoted 3 lines

The following is a series of six patches to bring the linux-mips tree
in sync with Linus' tree. These are changes that have to be made on the linux-mips side.

Confused. Isn't all this stuff in Ralf's git tree? It should be.

I CCed you on this series not because you have to do anything about it, but just as a reference since I mentioned this series in the series that is for you (the 12 patches, for which I put you in the To:
line).

The point is that these six patches are missing from Ralf's tree, even though they're in mainline, or that random changes were made in Ralf's tree that no longer apply and should be reverted.

Quoted 1 line

That way, it all gets merged when Ralf does his next Linus merge.

Well, in theory, yes. In practice, they have always fallen through the cracks so far when Ralf did a merge... or, rather, most of these changes are changes that were made on the linux-mips at same time but need to be reverted because they no longer apply.

I'm not sure I'm expressing myself very clear, so please ask if none of this makes sense.

Okay, let me summarize:

[PATCH 1/6] [CHAR] Remove obsolete IBM z50 (vr41xx) keyboard map
-> got applied to linux-mips, never made it into mainline. There's
no keyboard support anyway, so this should just be removed.

[PATCH 2/6] [VIDEO] Remove trailing whitespace from drivers/video/Kconfig
-> I suppose the trailing whitespace got dropped when those patches
made it into mainline, but for some reason the whitespace changes never got merged back into linux-mips when Ralf synced.

[PATCH 3/6] Remove bogus blank lines - sync with Linus' tree
-> These were introduced while doctoring around some bogus changes
instead of pulling from mainline.

[PATCH 4/6] [NET] Fix NET_SB1250_MAC Kconfig order to match Linus' tree
-> no idea why we differ here, but we shouldn't.

[PATCH 5/6] [MIPS] vr41xx: remove timex.h
-> mips-linux specific addition that no longer applies

[PATCH 6/6] [MTD] Remove typecast from drivers/mtd/maps/lasat.c
-> no idea why this never got synced from mainline

Clearer now?

Signature · 2 lines
Martin Michlmayr
http://www.cyrius.com/