---

yaml
---
r: 179555
b: refs/heads/master
c: c8e20be
h: refs/heads/master
i:
  179553: 26eab26
  179551: 463660f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2faae42233778676607a2a45b95aeb375bebe2c6
+refs/heads/master: c8e20be020f234c8d492927a424a7d8bbefd5b5d

trunk/Documentation/feature-removal-schedule.txt

@@ -493,52 +493,3 @@ Why:	These two features use non-standard interfaces. There are the
 Who:	Corentin Chary <corentin.chary@gmail.com>
 
 ----------------------------
-
-What:	usbvideo quickcam_messenger driver
-When:	2.6.35
-Files:	drivers/media/video/usbvideo/quickcam_messenger.[ch]
-Why:	obsolete v4l1 driver replaced by gspca_stv06xx
-Who:	Hans de Goede <hdegoede@redhat.com>
-
-----------------------------
-
-What:	ov511 v4l1 driver
-When:	2.6.35
-Files:	drivers/media/video/ov511.[ch]
-Why:	obsolete v4l1 driver replaced by gspca_ov519
-Who:	Hans de Goede <hdegoede@redhat.com>
-
-----------------------------
-
-What:	w9968cf v4l1 driver
-When:	2.6.35
-Files:	drivers/media/video/w9968cf*.[ch]
-Why:	obsolete v4l1 driver replaced by gspca_ov519
-Who:	Hans de Goede <hdegoede@redhat.com>
-
-----------------------------
-
-What:	ovcamchip sensor framework
-When:	2.6.35
-Files:	drivers/media/video/ovcamchip/*
-Why:	Only used by obsoleted v4l1 drivers
-Who:	Hans de Goede <hdegoede@redhat.com>
-
-----------------------------
-
-What:	stv680 v4l1 driver
-When:	2.6.35
-Files:	drivers/media/video/stv680.[ch]
-Why:	obsolete v4l1 driver replaced by gspca_stv0680
-Who:	Hans de Goede <hdegoede@redhat.com>
-
-----------------------------
-
-What:	zc0301 v4l driver
-When:	2.6.35
-Files:	drivers/media/video/zc0301/*
-Why:	Duplicate functionality with the gspca_zc3xx driver, zc0301 only
-	supports 2 USB-ID's (because it only supports a limited set of
-	sensors) wich are also supported by the gspca_zc3xx driver
-	(which supports 53 USB-ID's in total)
-Who:	Hans de Goede <hdegoede@redhat.com>

trunk/MAINTAINERS

@@ -410,8 +410,9 @@ F:	drivers/i2c/busses/i2c-ali1563.c
 
 ALPHA PORT
 M:	Richard Henderson <rth@twiddle.net>
+S:	Odd Fixes for 2.4; Maintained for 2.6.
 M:	Ivan Kokshaysky <ink@jurassic.park.msu.ru>
-M:	Matt Turner <mattst88@gmail.com>
+S:	Maintained for 2.4; PCI support for 2.6.
 L:	linux-alpha@vger.kernel.org
 F:	arch/alpha/
 
@@ -1637,8 +1638,9 @@ S:	Maintained
 F:	sound/pci/cs5535audio/
 
 CX18 VIDEO4LINUX DRIVER
+M:	Hans Verkuil <hverkuil@xs4all.nl>
 M:	Andy Walls <awalls@radix.net>
-L:	ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
+L:	ivtv-devel@ivtvdriver.org
 L:	linux-media@vger.kernel.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:	http://linuxtv.org
@@ -3010,8 +3012,8 @@ S:	Maintained
 F:	drivers/isdn/hardware/eicon/
 
 IVTV VIDEO4LINUX DRIVER
-M:	Andy Walls <awalls@radix.net>
-L:	ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
+M:	Hans Verkuil <hverkuil@xs4all.nl>
+L:	ivtv-devel@ivtvdriver.org
 L:	linux-media@vger.kernel.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 W:	http://www.ivtvdriver.org

trunk/Makefile

@@ -18,9 +18,10 @@ MAKEFLAGS += -rR --no-print-directory
 
 # Avoid funny character set dependencies
 unexport LC_ALL
+LC_CTYPE=C
 LC_COLLATE=C
 LC_NUMERIC=C
-export LC_COLLATE LC_NUMERIC
+export LC_CTYPE LC_COLLATE LC_NUMERIC
 
 # We are using a recursive build, so we need to do a little thinking
 # to get the ordering right.

trunk/arch/alpha/include/asm/topology.h

@@ -28,9 +28,6 @@ static const struct cpumask *cpumask_of_node(int node)
 {
 	int cpu;
 
-	if (node == -1)
-		return cpu_all_mask;
-
 	cpumask_clear(&node_to_cpumask_map[node]);
 
 	for_each_online_cpu(cpu) {

trunk/arch/arm/mach-davinci/include/mach/keyscan.h

@@ -29,7 +29,6 @@ enum davinci_matrix_types {
 };
 
 struct davinci_ks_platform_data {
-	int		(*device_enable)(struct device *dev);
 	unsigned short	*keymap;
 	u32		keymapsize;
 	u8		rep:1;

trunk/arch/arm/mach-s3c2440/mach-mini2440.c

@@ -288,7 +288,7 @@ static struct s3c2410_platform_nand mini2440_nand_info __initdata = {
 
 /* DM9000AEP 10/100 ethernet controller */
 
-static struct resource mini2440_dm9k_resource[] = {
+static struct resource mini2440_dm9k_resource[] __initdata = {
 	[0] = {
 		.start = MACH_MINI2440_DM9K_BASE,
 		.end   = MACH_MINI2440_DM9K_BASE + 3,
@@ -310,11 +310,11 @@ static struct resource mini2440_dm9k_resource[] = {
  * The DM9000 has no eeprom, and it's MAC address is set by
  * the bootloader before starting the kernel.
  */
-static struct dm9000_plat_data mini2440_dm9k_pdata = {
+static struct dm9000_plat_data mini2440_dm9k_pdata __initdata = {
 	.flags		= (DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM),
 };
 
-static struct platform_device mini2440_device_eth = {
+static struct platform_device mini2440_device_eth __initdata = {
 	.name		= "dm9000",
 	.id		= -1,
 	.num_resources	= ARRAY_SIZE(mini2440_dm9k_resource),
@@ -341,7 +341,7 @@ static struct platform_device mini2440_device_eth = {
  *	|  |  +----+  +----+
  *	  .....
  */
-static struct gpio_keys_button mini2440_buttons[] = {
+static struct gpio_keys_button mini2440_buttons[] __initdata = {
 	{
 		.gpio		= S3C2410_GPG(0),		/* K1 */
 		.code		= KEY_F1,
@@ -384,12 +384,12 @@ static struct gpio_keys_button mini2440_buttons[] = {
 #endif
 };
 
-static struct gpio_keys_platform_data mini2440_button_data = {
+static struct gpio_keys_platform_data mini2440_button_data __initdata = {
 	.buttons	= mini2440_buttons,
 	.nbuttons	= ARRAY_SIZE(mini2440_buttons),
 };
 
-static struct platform_device mini2440_button_device = {
+static struct platform_device mini2440_button_device __initdata = {
 	.name		= "gpio-keys",
 	.id		= -1,
 	.dev		= {
@@ -399,73 +399,73 @@ static struct platform_device mini2440_button_device = {
 
 /* LEDS */
 
-static struct s3c24xx_led_platdata mini2440_led1_pdata = {
+static struct s3c24xx_led_platdata mini2440_led1_pdata __initdata = {
 	.name		= "led1",
 	.gpio		= S3C2410_GPB(5),
 	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
 	.def_trigger	= "heartbeat",
 };
 
-static struct s3c24xx_led_platdata mini2440_led2_pdata = {
+static struct s3c24xx_led_platdata mini2440_led2_pdata __initdata = {
 	.name		= "led2",
 	.gpio		= S3C2410_GPB(6),
 	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
 	.def_trigger	= "nand-disk",
 };
 
-static struct s3c24xx_led_platdata mini2440_led3_pdata = {
+static struct s3c24xx_led_platdata mini2440_led3_pdata __initdata = {
 	.name		= "led3",
 	.gpio		= S3C2410_GPB(7),
 	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
 	.def_trigger	= "mmc0",
 };
 
-static struct s3c24xx_led_platdata mini2440_led4_pdata = {
+static struct s3c24xx_led_platdata mini2440_led4_pdata __initdata = {
 	.name		= "led4",
 	.gpio		= S3C2410_GPB(8),
 	.flags		= S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
 	.def_trigger	= "",
 };
 
-static struct s3c24xx_led_platdata mini2440_led_backlight_pdata = {
+static struct s3c24xx_led_platdata mini2440_led_backlight_pdata __initdata = {
 	.name		= "backlight",
 	.gpio		= S3C2410_GPG(4),
 	.def_trigger	= "backlight",
 };
 
-static struct platform_device mini2440_led1 = {
+static struct platform_device mini2440_led1 __initdata = {
 	.name		= "s3c24xx_led",
 	.id		= 1,
 	.dev		= {
 		.platform_data	= &mini2440_led1_pdata,
 	},
 };
 
-static struct platform_device mini2440_led2 = {
+static struct platform_device mini2440_led2 __initdata = {
 	.name		= "s3c24xx_led",
 	.id		= 2,
 	.dev		= {
 		.platform_data	= &mini2440_led2_pdata,
 	},
 };
 
-static struct platform_device mini2440_led3 = {
+static struct platform_device mini2440_led3 __initdata = {
 	.name		= "s3c24xx_led",
 	.id		= 3,
 	.dev		= {
 		.platform_data	= &mini2440_led3_pdata,
 	},
 };
 
-static struct platform_device mini2440_led4 = {
+static struct platform_device mini2440_led4 __initdata = {
 	.name		= "s3c24xx_led",
 	.id		= 4,
 	.dev		= {
 		.platform_data	= &mini2440_led4_pdata,
 	},
 };
 
-static struct platform_device mini2440_led_backlight = {
+static struct platform_device mini2440_led_backlight __initdata = {
 	.name		= "s3c24xx_led",
 	.id		= 5,
 	.dev		= {
@@ -475,14 +475,14 @@ static struct platform_device mini2440_led_backlight = {
 
 /* AUDIO */
 
-static struct s3c24xx_uda134x_platform_data mini2440_audio_pins = {
+static struct s3c24xx_uda134x_platform_data mini2440_audio_pins __initdata = {
 	.l3_clk = S3C2410_GPB(4),
 	.l3_mode = S3C2410_GPB(2),
 	.l3_data = S3C2410_GPB(3),
 	.model = UDA134X_UDA1341
 };
 
-static struct platform_device mini2440_audio = {
+static struct platform_device mini2440_audio __initdata = {
 	.name		= "s3c24xx_uda134x",
 	.id		= 0,
 	.dev		= {

trunk/arch/arm/mach-s3c6410/mach-smdk6410.c

@@ -211,7 +211,6 @@ static struct fixed_voltage_config smdk6410_b_pwr_5v_pdata = {
 	.supply_name = "B_PWR_5V",
 	.microvolts = 5000000,
 	.init_data = &smdk6410_b_pwr_5v_data,
-	.gpio = -EINVAL,
 };
 
 static struct platform_device smdk6410_b_pwr_5v = {

trunk/arch/arm/plat-s3c/dev-nand.c

@@ -58,8 +58,8 @@ static int __init s3c_nand_copy_set(struct s3c2410_nand_set *set)
 			return -ENOMEM;
 	}
 
-	if (set->nr_map && set->nr_chips) {
-		size = sizeof(int) * set->nr_chips;
+	size = sizeof(int) * set->nr_chips;
+	if (size) {
 		ptr = kmemdup(set->nr_map, size, GFP_KERNEL);
 		set->nr_map = ptr;
 

trunk/arch/m68knommu/platform/coldfire/pit.c

@@ -146,6 +146,7 @@ static struct clocksource pit_clk = {
 	.read	= pit_read_clk,
 	.shift	= 20,
 	.mask	= CLOCKSOURCE_MASK(32),
+	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 /***************************************************************************/

trunk/arch/powerpc/boot/Makefile

@@ -20,7 +20,7 @@
 all: $(obj)/zImage
 
 BOOTCFLAGS    := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-		 -fno-strict-aliasing -Os -msoft-float -pipe \
+		 -fno-strict-aliasing -Os -msoft-float -pipe -D__KERNEL__\
 		 -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \
 		 -isystem $(shell $(CROSS32CC) -print-file-name=include)
 BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
@@ -34,6 +34,8 @@ BOOTCFLAGS	+= -fno-stack-protector
 endif
 
 BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj)
+BOOTCFLAGS	+= -include include/linux/autoconf.h -Iarch/powerpc/include
+BOOTCFLAGS	+= -Iinclude
 
 DTS_FLAGS	?= -p 1024
 

trunk/arch/s390/include/asm/bug.h

@@ -52,10 +52,6 @@
 	unreachable();					\
 } while (0)
 
-#define __WARN() do {					\
-	__EMIT_BUG(BUGFLAG_WARNING);			\
-} while (0)
-
 #define WARN_ON(x) ({					\
 	int __ret_warn_on = !!(x);			\
 	if (__builtin_constant_p(__ret_warn_on)) {	\

trunk/arch/s390/include/asm/sigp.h

@@ -15,19 +15,11 @@
 #ifndef __SIGP__
 #define __SIGP__
 
-#include <asm/system.h>
+#include <asm/ptrace.h>
+#include <asm/atomic.h>
 
 /* get real cpu address from logical cpu number */
-extern int __cpu_logical_map[];
-
-static inline int cpu_logical_map(int cpu)
-{
-#ifdef CONFIG_SMP
-	return __cpu_logical_map[cpu];
-#else
-	return stap();
-#endif
-}
+extern volatile int __cpu_logical_map[];
 
 typedef enum
 {
@@ -87,7 +79,7 @@ signal_processor(__u16 cpu_addr, sigp_order_code order_code)
 		"	ipm	%0\n"
 		"	srl	%0,28\n"
 		:	"=d"	(ccode)
-		: "d" (reg1), "d" (cpu_logical_map(cpu_addr)),
+		: "d" (reg1), "d" (__cpu_logical_map[cpu_addr]),
 		  "a" (order_code) : "cc" , "memory");
 	return ccode;
 }
@@ -106,7 +98,7 @@ signal_processor_p(__u32 parameter, __u16 cpu_addr, sigp_order_code order_code)
 		"	ipm	%0\n"
 		"	srl	%0,28\n"
 		: "=d" (ccode)
-		: "d" (reg1), "d" (cpu_logical_map(cpu_addr)),
+		: "d" (reg1), "d" (__cpu_logical_map[cpu_addr]),
 		  "a" (order_code) : "cc" , "memory");
 	return ccode;
 }
@@ -126,7 +118,7 @@ signal_processor_ps(__u32 *statusptr, __u32 parameter, __u16 cpu_addr,
 		"	ipm	%0\n"
 		"	srl	%0,28\n"
 		: "=d" (ccode), "+d" (reg1)
-		: "d" (cpu_logical_map(cpu_addr)), "a" (order_code)
+		: "d" (__cpu_logical_map[cpu_addr]), "a" (order_code)
 		: "cc" , "memory");
 	*statusptr = reg1;
 	return ccode;