---

yaml
---
r: 58143
b: refs/heads/master
c: 8da32de
h: refs/heads/master
i:
  58141: 64abf55
  58139: 7b3b342
  58135: 0a57865
  58127: 8eeedab
  58111: aeda7c6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36f9d0c5e9dc650de26b112079f46e6160a881a0
+refs/heads/master: 8da32de5c845b711a500f89342baf10c662e2ecb

trunk/Makefile

@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 22
-EXTRAVERSION = -rc7
+EXTRAVERSION = -rc6
 NAME = Holy Dancing Manatees, Batman!
 
 # *DOCUMENTATION*

trunk/arch/arm/mach-at91/pm.c

@@ -53,7 +53,7 @@ static suspend_state_t target_state;
 /*
  * Called after processes are frozen, but before we shutdown devices.
  */
-static int at91_pm_set_target(suspend_state_t state)
+static int at91_pm_prepare(suspend_state_t state)
 {
 	target_state = state;
 	return 0;
@@ -201,7 +201,7 @@ static int at91_pm_enter(suspend_state_t state)
 
 static struct pm_ops at91_pm_ops ={
 	.valid		= at91_pm_valid_state,
-	.set_target	= at91_pm_set_target,
+	.prepare	= at91_pm_prepare,
 	.enter		= at91_pm_enter,
 };
 

trunk/arch/i386/kernel/cpu/mtrr/generic.c

@@ -65,8 +65,7 @@ get_fixed_ranges(mtrr_type * frs)
 
 void mtrr_save_fixed_ranges(void *info)
 {
-	if (cpu_has_mtrr)
-		get_fixed_ranges(mtrr_state.fixed_ranges);
+	get_fixed_ranges(mtrr_state.fixed_ranges);
 }
 
 static void print_fixed(unsigned base, unsigned step, const mtrr_type*types)
@@ -470,6 +469,11 @@ int generic_validate_add_page(unsigned long base, unsigned long size, unsigned i
 		}
 	}
 
+	if (base < 0x100) {
+		printk(KERN_WARNING "mtrr: cannot set region below 1 MiB (0x%lx000,0x%lx000)\n",
+		       base, size);
+		return -EINVAL;
+	}
 	/*  Check upper bits of base and last are equal and lower bits are 0
 	    for base and 1 for last  */
 	last = base + size - 1;

trunk/arch/powerpc/kernel/vdso64/gettimeofday.S

@@ -31,7 +31,7 @@ V_FUNCTION_BEGIN(__kernel_gettimeofday)
 	mr	r11,r3			/* r11 holds tv */
 	mr	r10,r4			/* r10 holds tz */
 	bl	V_LOCAL_FUNC(__get_datapage)	/* get data page */
-	cmpldi	r11,0			/* check if tv is NULL */
+	cmpldi	r10,0			/* check if tv is NULL */
 	beq	2f
 	bl	V_LOCAL_FUNC(__do_get_xsec)	/* get xsec from tb & kernel */
 	lis     r7,15			/* r7 = 1000000 = USEC_PER_SEC */

trunk/arch/sparc64/kernel/irq.c

@@ -329,10 +329,6 @@ static void sun4v_irq_enable(unsigned int virt_irq)
 		if (err != HV_EOK)
 			printk("sun4v_intr_settarget(%x,%lu): err(%d)\n",
 			       ino, cpuid, err);
-		err = sun4v_intr_setstate(ino, HV_INTR_STATE_IDLE);
-		if (err != HV_EOK)
-			printk("sun4v_intr_setstate(%x): "
-			       "err(%d)\n", ino, err);
 		err = sun4v_intr_setenabled(ino, HV_INTR_ENABLED);
 		if (err != HV_EOK)
 			printk("sun4v_intr_setenabled(%x): err(%d)\n",
@@ -404,12 +400,6 @@ static void sun4v_virq_enable(unsigned int virt_irq)
 			       "err(%d)\n",
 			       dev_handle, dev_ino, cpuid, err);
 		err = sun4v_vintr_set_state(dev_handle, dev_ino,
-					    HV_INTR_STATE_IDLE);
-		if (err != HV_EOK)
-			printk("sun4v_vintr_set_state(%lx,%lx,"
-				"HV_INTR_STATE_IDLE): err(%d)\n",
-			       dev_handle, dev_ino, err);
-		err = sun4v_vintr_set_valid(dev_handle, dev_ino,
 					    HV_INTR_ENABLED);
 		if (err != HV_EOK)
 			printk("sun4v_vintr_set_state(%lx,%lx,"
@@ -430,7 +420,7 @@ static void sun4v_virq_disable(unsigned int virt_irq)
 		dev_handle = ino & IMAP_IGN;
 		dev_ino = ino & IMAP_INO;
 
-		err = sun4v_vintr_set_valid(dev_handle, dev_ino,
+		err = sun4v_vintr_set_state(dev_handle, dev_ino,
 					    HV_INTR_DISABLED);
 		if (err != HV_EOK)
 			printk("sun4v_vintr_set_state(%lx,%lx,"

trunk/drivers/acpi/asus_acpi.c

@@ -1398,7 +1398,7 @@ static int __init asus_acpi_init(void)
 	if (!asus_hotk_found) {
 		acpi_bus_unregister_driver(&asus_hotk_driver);
 		remove_proc_entry(PROC_ASUS, acpi_root_dir);
-		return -ENODEV;
+		return result;
 	}
 
 	asus_backlight_device = backlight_device_register("asus",NULL,NULL,
@@ -1407,7 +1407,6 @@ static int __init asus_acpi_init(void)
 		printk(KERN_ERR "Could not register asus backlight device\n");
 		asus_backlight_device = NULL;
 		asus_acpi_exit();
-		return -ENODEV;
 	}
         asus_backlight_device->props.max_brightness = 15;
 

trunk/drivers/misc/blink.c

@@ -16,30 +16,12 @@ static void do_blink(unsigned long data)
 	add_timer(&blink_timer);
 }
 
-static int blink_panic_event(struct notifier_block *blk,
-			     unsigned long event, void *arg)
-{
-	do_blink(0);
-	return 0;
-}
-
-static struct notifier_block blink_notify = {
-	.notifier_call = blink_panic_event,
-};
-
-static __init int blink_init(void)
+static int blink_init(void)
 {
 	printk(KERN_INFO "Enabling keyboard blinking\n");
-	atomic_notifier_chain_register(&panic_notifier_list, &blink_notify);
+	do_blink(0);
 	return 0;
 }
 
-static __exit void blink_remove(void)
-{
-	del_timer_sync(&blink_timer);
-	atomic_notifier_chain_unregister(&panic_notifier_list, &blink_notify);
-}
-
 module_init(blink_init);
-module_exit(blink_remove);
 

trunk/drivers/net/gianfar.c

@@ -944,7 +944,7 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
 		flags |= TXFCB_UDP;
 		fcb->phcs = udp_hdr(skb)->check;
 	} else
-		fcb->phcs = udp_hdr(skb)->check;
+		fcb->phcs = tcp_hdr(skb)->check;
 
 	/* l3os is the distance between the start of the
 	 * frame (skb->data) and the start of the IP hdr.

trunk/drivers/net/irda/irport.c

@@ -509,7 +509,7 @@ static void irport_timeout(struct net_device *dev)
 	IRDA_DEBUG(0, "%s(), iir=%02x, lsr=%02x, iobase=%#x\n", 
 		   __FUNCTION__, iir, lsr, iobase);
 
-	IRDA_DEBUG(0, "%s(), transmitting=%d, remain=%d, done=%td\n",
+	IRDA_DEBUG(0, "%s(), transmitting=%d, remain=%d, done=%d\n", 
 		   __FUNCTION__, self->transmitting, self->tx_buff.len,
 		   self->tx_buff.data - self->tx_buff.head);
 

trunk/drivers/net/irda/smsc-ircc2.c

@@ -79,7 +79,7 @@ MODULE_AUTHOR("Daniele Peri <peri@csai.unipa.it>");
 MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver");
 MODULE_LICENSE("GPL");
 
-static int smsc_nopnp = 1;
+static int smsc_nopnp;
 module_param_named(nopnp, smsc_nopnp, bool, 0);
 MODULE_PARM_DESC(nopnp, "Do not use PNP to detect controller settings");
 

trunk/drivers/net/wireless/libertas/Makefile

@@ -2,7 +2,7 @@ libertas-objs := main.o fw.o wext.o \
 		rx.o tx.o cmd.o 	  \
 		cmdresp.o scan.o	  \
 		join.o 11d.o 		  \
-		debugfs.o	  \
+		ioctl.o debugfs.o	  \
 		ethtool.o assoc.o
 
 usb8xxx-objs += if_bootcmd.o