## Automatically generated incremental diff
## From:   linux-2.4.29-bk1
## To:     linux-2.4.29-bk2
## Robot:  $Id: make-incremental-diff,v 1.12 2004/01/06 07:19:36 hpa Exp $

diff -urN linux-2.4.29-bk1/Makefile linux-2.4.29-bk2/Makefile
--- linux-2.4.29-bk1/Makefile	2005-01-25 02:49:23.966453730 -0800
+++ linux-2.4.29-bk2/Makefile	2005-01-25 02:49:26.335555410 -0800
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 29
-EXTRAVERSION = -bk1
+EXTRAVERSION = -bk2
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.29-bk1/drivers/block/nbd.c linux-2.4.29-bk2/drivers/block/nbd.c
--- linux-2.4.29-bk1/drivers/block/nbd.c	2003-08-25 04:44:41.000000000 -0700
+++ linux-2.4.29-bk2/drivers/block/nbd.c	2005-01-25 02:49:26.337555496 -0800
@@ -408,10 +408,7 @@
 	int dev, error, temp;
 	struct request sreq ;
 
-	/* Anyone capable of this syscall can do *real bad* things */
 
-	if (!capable(CAP_SYS_ADMIN))
-		return -EPERM;
 	if (!inode)
 		return -EINVAL;
 	dev = MINOR(inode->i_rdev);
@@ -419,6 +416,20 @@
 		return -ENODEV;
 
 	lo = &nbd_dev[dev];
+
+	/* these are innocent, but.... */
+	switch (cmd) {
+	case BLKGETSIZE:
+		return put_user(nbd_bytesizes[dev] >> 9, (unsigned long *) arg);
+	case BLKGETSIZE64:
+		return put_user((u64)nbd_bytesizes[dev], (u64 *) arg);
+	}
+
+	/* ... anyone capable of any of the below ioctls can do *real bad* 
+	   things */
+	if (!capable(CAP_SYS_ADMIN))
+		return -EPERM;
+
 	switch (cmd) {
 	case NBD_DISCONNECT:
 	        printk("NBD_DISCONNECT\n");
@@ -524,10 +535,6 @@
 		       dev, lo->queue_head.next, lo->queue_head.prev, requests_in, requests_out);
 		return 0;
 #endif
-	case BLKGETSIZE:
-		return put_user(nbd_bytesizes[dev] >> 9, (unsigned long *) arg);
-	case BLKGETSIZE64:
-		return put_user((u64)nbd_bytesizes[dev], (u64 *) arg);
 	}
 	return -EINVAL;
 }
diff -urN linux-2.4.29-bk1/drivers/isdn/hisax/ipacx.c linux-2.4.29-bk2/drivers/isdn/hisax/ipacx.c
--- linux-2.4.29-bk1/drivers/isdn/hisax/ipacx.c	2002-11-28 15:53:13.000000000 -0800
+++ linux-2.4.29-bk2/drivers/isdn/hisax/ipacx.c	2005-01-25 02:49:26.338555539 -0800
@@ -152,7 +152,13 @@
 
 		case (HW_RESET | REQUEST):
 		case (HW_ENABLE | REQUEST):
-			ph_command(cs, IPACX_CMD_TIM);
+			if ((cs->dc.isac.ph_state == IPACX_IND_RES) ||
+			(cs->dc.isac.ph_state == IPACX_IND_DR) ||
+				(cs->dc.isac.ph_state == IPACX_IND_DC))
+				ph_command(cs, IPACX_CMD_TIM);
+			else
+				ph_command(cs, IPACX_CMD_RES);
+
 			break;
 
 		case (HW_INFO3 | REQUEST):
diff -urN linux-2.4.29-bk1/include/linux/pci_ids.h linux-2.4.29-bk2/include/linux/pci_ids.h
--- linux-2.4.29-bk1/include/linux/pci_ids.h	2005-01-19 06:10:12.000000000 -0800
+++ linux-2.4.29-bk2/include/linux/pci_ids.h	2005-01-25 02:49:26.342555711 -0800
@@ -1937,7 +1937,6 @@
 #define PCI_DEVICE_ID_INTEL_82801EB_5	0x24d5
 #define PCI_DEVICE_ID_INTEL_82801EB_6	0x24d6
 #define PCI_DEVICE_ID_INTEL_82801EB_7	0x24d7
-#define PCI_DEVICE_ID_INTEL_82801DB_10	0x24ca
 #define PCI_DEVICE_ID_INTEL_82801EB_11	0x24db
 #define PCI_DEVICE_ID_INTEL_82801EB_13	0x24dd
 #define PCI_DEVICE_ID_INTEL_ESB_0	0x25a0