aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2007-12-11 09:21:11 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2007-12-11 09:21:11 -0800
commitac56b1e33bdcfc88f140434fdf6e5f8bfae22e99 (patch)
treee43b6511cb32940336c641c3cecabf5590794988
parent3a06612fafd3d888fa75407c7e277268da20ac68 (diff)
downloadpatches-ac56b1e33bdcfc88f140434fdf6e5f8bfae22e99.tar.gz
2.6.24-rc5 refresh
Diffstat
-rw-r--r--driver/block-device.patch6
-rw-r--r--driver/driver-core-add-way-to-get-to-bus-device-klist.patch2
-rw-r--r--driver/kobject-convert-kernel_kset-to-be-a-kobject.patch2
-rw-r--r--driver/kset-convert-slub-to-use-kset_create.patch10
-rw-r--r--driver/kset-move-sys-slab-to-sys-kernel-slab.patch2
-rw-r--r--driver/remove-struct-kobj_type-from-struct-kset.patch4
-rw-r--r--f2.patch2
-rw-r--r--pci/pci-always-export-pci_scan_single_device.patch4
-rw-r--r--pci/pci-drivers-pci-remove-unused-exports.patch2
-rw-r--r--pci/pci_bridge-device.patch2
-rw-r--r--series3
-rw-r--r--version2
12 files changed, 20 insertions, 21 deletions
diff --git a/driver/block-device.patch b/driver/block-device.patch
index b8a83453d84787..cbbbcf63bfc90a 100644
--- a/driver/block-device.patch
+++ b/driver/block-device.patch
@@ -855,7 +855,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
-@@ -14,8 +14,10 @@
+@@ -15,8 +15,10 @@
static struct kmem_cache *buf_pool_cache;
@@ -867,7 +867,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
struct aoedev *d = disk->private_data;
return snprintf(page, PAGE_SIZE,
-@@ -25,50 +27,47 @@ static ssize_t aoedisk_show_state(struct
+@@ -26,50 +28,47 @@ static ssize_t aoedisk_show_state(struct
(d->nopen && !(d->flags & DEVFL_UP)) ? ",closewait" : "");
/* I'd rather see nopen exported so we can ditch closewait */
}
@@ -938,7 +938,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
};
static const struct attribute_group attr_group = {
-@@ -78,12 +77,12 @@ static const struct attribute_group attr
+@@ -79,12 +78,12 @@ static const struct attribute_group attr
static int
aoedisk_add_sysfs(struct aoedev *d)
{
diff --git a/driver/driver-core-add-way-to-get-to-bus-device-klist.patch b/driver/driver-core-add-way-to-get-to-bus-device-klist.patch
index e02ce26e055c72..4252c77d0c8ac6 100644
--- a/driver/driver-core-add-way-to-get-to-bus-device-klist.patch
+++ b/driver/driver-core-add-way-to-get-to-bus-device-klist.patch
@@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
bus_kset = kset_create_and_add("bus", &bus_uevent_ops, NULL);
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
-@@ -1251,16 +1251,19 @@ static void __init pci_sort_breadthfirst
+@@ -1227,16 +1227,19 @@ static void __init pci_sort_breadthfirst
struct klist_node *n;
struct device *dev;
struct pci_dev *pdev;
diff --git a/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch b/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch
index 19357a721a4edf..2f4da5d7de80c7 100644
--- a/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch
+++ b/driver/kobject-convert-kernel_kset-to-be-a-kobject.patch
@@ -146,7 +146,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/mm/slub.c
+++ b/mm/slub.c
-@@ -4087,8 +4087,7 @@ static int __init slab_sysfs_init(void)
+@@ -4094,8 +4094,7 @@ static int __init slab_sysfs_init(void)
struct kmem_cache *s;
int err;
diff --git a/driver/kset-convert-slub-to-use-kset_create.patch b/driver/kset-convert-slub-to-use-kset_create.patch
index 82ec1dcf7f3b80..d880845581ac14 100644
--- a/driver/kset-convert-slub-to-use-kset_create.patch
+++ b/driver/kset-convert-slub-to-use-kset_create.patch
@@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/mm/slub.c
+++ b/mm/slub.c
-@@ -3958,7 +3958,7 @@ static struct kset_uevent_ops slab_ueven
+@@ -3965,7 +3965,7 @@ static struct kset_uevent_ops slab_ueven
.filter = uevent_filter,
};
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define ID_STR_LENGTH 64
-@@ -4011,7 +4011,7 @@ static int sysfs_slab_add(struct kmem_ca
+@@ -4018,7 +4018,7 @@ static int sysfs_slab_add(struct kmem_ca
* This is typically the case for debug situations. In that
* case we can catch duplicate names easily.
*/
@@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
name = s->name;
} else {
/*
-@@ -4022,7 +4022,7 @@ static int sysfs_slab_add(struct kmem_ca
+@@ -4029,7 +4029,7 @@ static int sysfs_slab_add(struct kmem_ca
}
kobject_set_name(&s->kobj, name);
@@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
s->kobj.ktype = &slab_ktype;
kobject_init(&s->kobj);
err = kobject_add(&s->kobj);
-@@ -4067,9 +4067,8 @@ static int sysfs_slab_alias(struct kmem_
+@@ -4074,9 +4074,8 @@ static int sysfs_slab_alias(struct kmem_
/*
* If we have a leftover link then remove it.
*/
@@ -55,7 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
al = kmalloc(sizeof(struct saved_alias), GFP_KERNEL);
-@@ -4088,8 +4087,8 @@ static int __init slab_sysfs_init(void)
+@@ -4095,8 +4094,8 @@ static int __init slab_sysfs_init(void)
struct kmem_cache *s;
int err;
diff --git a/driver/kset-move-sys-slab-to-sys-kernel-slab.patch b/driver/kset-move-sys-slab-to-sys-kernel-slab.patch
index 165068170937d9..02834c24a7b274 100644
--- a/driver/kset-move-sys-slab-to-sys-kernel-slab.patch
+++ b/driver/kset-move-sys-slab-to-sys-kernel-slab.patch
@@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
corresponding debug option. All options can be set on a slab that does
--- a/mm/slub.c
+++ b/mm/slub.c
-@@ -4087,7 +4087,8 @@ static int __init slab_sysfs_init(void)
+@@ -4094,7 +4094,8 @@ static int __init slab_sysfs_init(void)
struct kmem_cache *s;
int err;
diff --git a/driver/remove-struct-kobj_type-from-struct-kset.patch b/driver/remove-struct-kobj_type-from-struct-kset.patch
index 8b50c4a248aedd..8e20fd2c8d82d1 100644
--- a/driver/remove-struct-kobj_type-from-struct-kset.patch
+++ b/driver/remove-struct-kobj_type-from-struct-kset.patch
@@ -782,7 +782,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/**
--- a/mm/slub.c
+++ b/mm/slub.c
-@@ -3958,7 +3958,7 @@ static struct kset_uevent_ops slab_ueven
+@@ -3965,7 +3965,7 @@ static struct kset_uevent_ops slab_ueven
.filter = uevent_filter,
};
@@ -791,7 +791,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define ID_STR_LENGTH 64
-@@ -4021,8 +4021,9 @@ static int sysfs_slab_add(struct kmem_ca
+@@ -4028,8 +4028,9 @@ static int sysfs_slab_add(struct kmem_ca
name = create_unique_id(s);
}
diff --git a/f2.patch b/f2.patch
index ab8140405c8e9c..bf439988927737 100644
--- a/f2.patch
+++ b/f2.patch
@@ -321,7 +321,7 @@
done:
--- a/mm/slub.c
+++ b/mm/slub.c
-@@ -4021,13 +4021,12 @@ static int sysfs_slab_add(struct kmem_ca
+@@ -4028,13 +4028,12 @@ static int sysfs_slab_add(struct kmem_ca
name = create_unique_id(s);
}
diff --git a/pci/pci-always-export-pci_scan_single_device.patch b/pci/pci-always-export-pci_scan_single_device.patch
index ae7530fd196bda..e5aca8323f36da 100644
--- a/pci/pci-always-export-pci_scan_single_device.patch
+++ b/pci/pci-always-export-pci_scan_single_device.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
-@@ -1012,6 +1012,7 @@ struct pci_dev *pci_scan_single_device(s
+@@ -988,6 +988,7 @@ struct pci_dev *pci_scan_single_device(s
return dev;
}
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/**
* pci_scan_slot - scan a PCI slot on a bus for devices.
-@@ -1199,7 +1200,6 @@ EXPORT_SYMBOL(pci_add_new_bus);
+@@ -1175,7 +1176,6 @@ EXPORT_SYMBOL(pci_add_new_bus);
EXPORT_SYMBOL(pci_do_scan_bus);
EXPORT_SYMBOL(pci_scan_slot);
EXPORT_SYMBOL(pci_scan_bridge);
diff --git a/pci/pci-drivers-pci-remove-unused-exports.patch b/pci/pci-drivers-pci-remove-unused-exports.patch
index 006db6a0e542b2..5e45fb3bee60bb 100644
--- a/pci/pci-drivers-pci-remove-unused-exports.patch
+++ b/pci/pci-drivers-pci-remove-unused-exports.patch
@@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* pci_osc_control_set - commit requested control to Firmware
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
-@@ -1181,7 +1181,6 @@ err_out:
+@@ -1157,7 +1157,6 @@ err_out:
kfree(b);
return NULL;
}
diff --git a/pci/pci_bridge-device.patch b/pci/pci_bridge-device.patch
index 3199670a976e6d..9bc2b0e002e16c 100644
--- a/pci/pci_bridge-device.patch
+++ b/pci/pci_bridge-device.patch
@@ -213,7 +213,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr)
-@@ -1143,32 +1134,27 @@ struct pci_bus * pci_create_bus(struct d
+@@ -1119,32 +1110,27 @@ struct pci_bus * pci_create_bus(struct d
goto dev_reg_err;
b->bridge = get_device(dev);
diff --git a/series b/series
index d6c60b834dc167..604cfd3981d117 100644
--- a/series
+++ b/series
@@ -114,6 +114,7 @@ driver/driver-core-clean-up-device_shutdown.patch
driver/driver-core-make-sys-power-a-kobject.patch
driver/kobject-grab-the-kset-reference-in-kobject_add-not-kobject_init.patch
driver/kobject-clean-up-debugging-messages.patch
+driver/uio-fix-kobject-usage.patch
driver/driver-core-remove-owner-field-from-struct-bus_type.patch
@@ -228,8 +229,6 @@ usb/usb-gotemp.patch
# work in progress goes here...
#
-driver/uio-fix-kobject-usage.patch
-
f2.patch
k1.patch
diff --git a/version b/version
index 58433fd04a8a93..e0d3683d098d1a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.24-rc4
+2.6.24-rc5
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:21:03 +0000