Merge redhat.com:/spare/repo/linux-2.5

into redhat.com:/spare/repo/netdev-2.6/netdev-alloc-6

Makefile

 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 3
-EXTRAVERSION =-rc4
+EXTRAVERSION =
 NAME=Feisty Dunnart
 
 # *DOCUMENTATION*

drivers/char/drm/radeon_state.c

@@ -2185,10 +2185,21 @@ int radeon_cp_getparam( DRM_IOCTL_ARGS )
 	case RADEON_PARAM_STATUS_HANDLE:
 		value = dev_priv->ring_rptr_offset;
 		break;
+#if BITS_PER_LONG == 32
+	/*
+	 * This ioctl() doesn't work on 64-bit platforms because hw_lock is a
+	 * pointer which can't fit into an int-sized variable.  According to
+	 * Michel Dnzer, the ioctl() is only used on embedded platforms, so
+	 * not supporting it shouldn't be a problem.  If the same functionality
+	 * is needed on 64-bit platforms, a new ioctl() would have to be added,
+	 * so backwards-compatibility for the embedded platforms can be
+	 * maintained.  --davidm 4-Feb-2004.
+	 */
 	case RADEON_PARAM_SAREA_HANDLE:
 		/* The lock is the first dword in the sarea. */
-		value = (int)dev->lock.hw_lock; 
+		value = (long)dev->lock.hw_lock;
 		break;
+#endif
 	case RADEON_PARAM_GART_TEX_HANDLE:
 		value = dev_priv->gart_textures_offset;
 		break;

drivers/media/video/tuner.c

@@ -1041,6 +1041,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
 
         i2c_attach_client(client);
 	if (type < TUNERS) {
+ 		t->type = type;
 		printk("tuner: type forced to %d (%s) [insmod]\n",
 		       t->type,tuners[t->type].name);
 		set_type(client,type);

drivers/video/Kconfig

@@ -462,6 +462,7 @@ config FB_I810_GTF
 config FB_MATROX
 	tristate "Matrox acceleration"
 	depends on FB && PCI
+	select I2C_ALGOBIT if FB_MATROX_I2C
 	---help---
 	  Say Y here if you have a Matrox Millennium, Matrox Millennium II,
 	  Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox
@@ -549,7 +550,6 @@ config FB_MATROX_G100
 config FB_MATROX_I2C
 	tristate "Matrox I2C support"
 	depends on FB_MATROX && I2C
-	select I2C_ALGOBIT
 	---help---
 	  This drivers creates I2C buses which are needed for accessing the
 	  DDC (I2C) bus present on all Matroxes, an I2C bus which
@@ -627,6 +627,7 @@ config FB_RADEON_OLD
 config FB_RADEON
 	tristate "ATI Radeon display support"
 	depends on FB && PCI
+	select I2C_ALGOBIT if FB_RADEON_I2C
 	help
 	  Choose this option if you want to use an ATI Radeon graphics card as
 	  a framebuffer device.  There are both PCI and AGP versions.  You
@@ -645,7 +646,6 @@ config FB_RADEON
 config FB_RADEON_I2C
 	bool "DDC/I2C for ATI Radeon support"
 	depends on FB_RADEON && I2C
-	select I2C_ALGOBIT
 	default y
 	help
 	  Say Y here if you want DDC/I2C support for your Radeon board. 

fs/block_dev.c

@@ -697,12 +697,7 @@ int blkdev_put(struct block_device *bdev, int kind)
 	down(&bdev->bd_sem);
 	lock_kernel();
 	if (!--bdev->bd_openers) {
-		switch (kind) {
-		case BDEV_FILE:
-		case BDEV_FS:
 		sync_blockdev(bdev);
-			break;
-		}
 		kill_bdev(bdev);
 	}
 	if (bdev->bd_contains == bdev) {

scripts/kconfig/symbol.c

@@ -706,7 +706,7 @@ struct symbol *sym_check_deps(struct symbol *sym)
 		goto out;
 
 	for (prop = sym->prop; prop; prop = prop->next) {
-		if (prop->type == P_CHOICE)
+		if (prop->type == P_CHOICE || prop->type == P_SELECT)
 			continue;
 		sym2 = sym_check_expr_deps(prop->visible.expr);
 		if (sym2)