4 files changed, 6 insertions, 224 deletions
diff --git a/driver/put_device-might_sleep.patch b/driver/put_device-might_sleep.patch
index d4af2a31e7cfdf..870aec84ac5f69 100644
--- a/driver/put_device-might_sleep.patch
+++ b/driver/put_device-might_sleep.patch
@@ -12,7 +12,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- a/drivers/base/core.c
 +++ b/drivers/base/core.c
-@@ -458,6 +458,7 @@ EXPORT_SYMBOL_GPL(device_create_bin_file
+@@ -456,6 +456,7 @@ EXPORT_SYMBOL_GPL(device_create_bin_file
   */
  void device_remove_bin_file(struct device *dev, struct bin_attribute *attr)
  {
diff --git a/driver/warn-when-statically-allocated-kobjects-are-used.patch b/driver/warn-when-statically-allocated-kobjects-are-used.patch
index 50d8a6f0d23143..3ade82f6885577 100644
--- a/driver/warn-when-statically-allocated-kobjects-are-used.patch
+++ b/driver/warn-when-statically-allocated-kobjects-are-used.patch
@@ -127,9 +127,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +static void verify_dynamic_kobject_allocation(struct kobject *kobj) { }
 +#endif
  
- /**
-  *	populate_dir - populate directory with attributes.
-@@ -289,6 +340,7 @@ void kobject_init(struct kobject *kobj, 
+ /*
+  * populate_dir - populate directory with attributes.
+@@ -288,6 +339,7 @@ void kobject_init(struct kobject *kobj, 
  		       "object, something is seriously wrong.\n", kobj);
  		dump_stack();
  	}
diff --git a/series b/series
index 795151d3ab0ea8..bb7dd25c411aab 100644
--- a/series
+++ b/series
@@ -7,227 +7,9 @@ gregkh/detect-atomic-counter-underflows.patch
 gregkh/gcc43-workaround.diff
 
 # driver patches queued for 2.6.24
-driver/chinese-add-the-known_regression-uri-to-the-howto.patch
-driver/chinese-rephrase-english-introduction-in-howto.patch
-driver/chinese-change-man-pages-maintainer-address-in-howoto.patch
-driver/chinese-add-translation-of-submittingpatches.patch
-driver/chinese-add-translation-of-submittingdrivers.patch
-driver/chinese-add-translation-of-oops-tracing.txt.patch
-driver/chinese-add-translation-of-stable_kernel_rules.txt.patch
-driver/chinese-add-translation-of-volatile-considered-harmful.txt.patch
-driver/chinese-add-translation-of-sparse.txt.patch
-driver/chinese-add-translation-of-codingstyle.patch
-driver/sysfs-fix-a-copy-n-paste-typo-in-comment.patch
-
 
 # driver patches for after 2.6.24 is out
-driver/nozomi.patch
-driver/documentation-replace-obsolete-driverfs-with-sysfs.patch
-driver/kobject-remove-incorrect-comment-in-kobject_rename.patch
-driver/pm-acquire-device-locks-on-suspend.patch
-driver/kref-add-kref_set.patch
-
-driver/aoechr-convert-from-class_device-to-device.patch
-driver/atm-convert-struct-class_device-to-struct-device.patch
-driver/coda-convert-struct-class_device-to-struct-device.patch
-driver/dma-convert-from-class_device-to-device-for-dma-engine.patch
-driver/ide-convert-from-class_device-to-device-for-ide-tape.patch
-driver/isdn-convert-from-class_device-to-device-for-isdn-capi.patch
-driver/adb-convert-from-class_device-to-device.patch
-driver/mcp_ucb1200-convert-from-class_device-to-device.patch
-driver/mtd-convert-from-class_device-to-device-for-mtd-mtdchar.patch
-driver/paride-convert-from-class_device-to-device-for-block-paride.patch
-driver/pktcdvd-convert-from-class_device-to-device-for-block-pktcdvd.patch
-driver/tifm-convert-from-class_device-to-device-for-ti-flash-media.patch
-driver/cosa-convert-from-class_device-to-device-for-cosa-sync-driver.patch
-
-driver/ecryptfs-sysfs-fixes.patch
-driver/driver-core-make-the-dev_-family-of-macros-in-device.h-complete.patch
-driver/sysfs-create-optimal-relative-symlink-targets.patch
-driver/sysfs-remove-spin_lock_unlocked.patch
-
-# clean up some kobjects that should be krefs
-driver/kobject-convert-ibmasm-to-use-kref-not-kobject.patch
-driver/kobject-convert-hvc_console-to-use-kref-not-kobject.patch
-driver/kobject-convert-hvcs-to-use-kref-not-kobject.patch
-driver/kobject-convert-icom-to-use-kref-not-kobject.patch
-
-driver/kobject-fix-up-kobject_set_name-to-use-kvasprintf.patch
-driver/kobject-make-kobject_cleanup-be-static.patch
-
-# kobject init and add rework
-driver/kobject-add-kobject_init_ng-function.patch
-driver/kobject-add-kobject_add_ng-function.patch
-driver/kobject-add-kobject_init_and_add-function.patch
-
-# Make ksets be dynamic
-driver/remove-struct-kobj_type-from-struct-kset.patch
-driver/remove-kobj_set_kset_s.patch
-driver/kset-add-kset_create_and_add-function.patch
-driver/kobject-add-kobject_create_and_add-function.patch
-driver/kobject-get-rid-of-kobject_add_dir.patch
-driver/kobject-get-rid-of-kobject_kset_add_dir.patch
-driver/kobject-convert-fuse-to-use-kobject_create.patch
-driver/kobject-convert-securityfs-to-use-kobject_create.patch
-driver/kobject-convert-debugfs-to-use-kobject_create.patch
-driver/kobject-convert-configfs-to-use-kobject_create.patch
-driver/kset-convert-ecryptfs-to-use-kset_create.patch
-driver/kobject-convert-main-fs-kobject-to-use-kobject_create.patch
-driver/kset-convert-gfs2-to-use-kset_create.patch
-driver/kset-convert-gfs2-dlm-to-use-kset_create.patch
-driver/kset-convert-dlm-to-use-kset_create.patch
-driver/kset-convert-pci-hotplug-to-use-kset_create_and_add.patch
-driver/kset-remove-decl_subsys_name.patch
-driver/kset-convert-kernel_subsys-to-use-kset_create.patch
-driver/kset-convert-drivers-base-bus.c-to-use-kset_create.patch
-driver/kset-convert-drivers-base-class.c-to-use-kset_create.patch
-driver/kset-convert-drivers-base-firmware.c-to-use-kset_create.patch
-driver/kset-convert-sys-devices-to-use-kset_create.patch
-driver/kobject-convert-sys-hypervisor-to-use-kobject_create.patch
-driver/kobject-convert-s390-hypervisor-to-use-kobject_create.patch
-driver/kset-convert-sys-devices-system-to-use-kset_create.patch
-driver/kset-convert-slub-to-use-kset_create.patch
-driver/kset-move-sys-slab-to-sys-kernel-slab.patch
-driver/kset-convert-sys-module-to-use-kset_create.patch
-driver/kset-convert-sys-power-to-use-kset_create.patch
-driver/kset-convert-struct-bus_device-devices-to-use-kset_create.patch
-driver/kset-convert-struct-bus_device-drivers-to-use-kset_create.patch
-driver/kobject-kobj_attribute-handling.patch
-driver/kset-convert-to-kobj_sysfs_ops.patch
-driver/struct-user_info-sysfs.patch
-driver/ecryptfs-remove-version_str-file-from-sysfs.patch
-driver/efivars-make-new_var-and-del_var-binary-sysfs-files.patch
-driver/kobject-convert-efivars-to-kobj_attr-interface.patch
-driver/firmware-export-firmware_kset.patch
-driver/kset-convert-efivars-to-use-kset_create-for-the-efi-subsystem.patch
-driver/kset-convert-efivars-to-use-kset_create-for-the-vars-sub-subsystem.patch
-driver/kobject-convert-arm-mach-omap1-pm.c-to-kobj_attr-interface.patch
-driver/kobject-convert-pseries-power.c-to-kobj_attr-interface.patch
-driver/kobject-convert-s390-ipl.c-to-kobj_attr-interface.patch
-driver/kset-convert-s390-ipl.c-to-use-kset_create.patch
-driver/kobject-convert-parisc-pdc_stable-to-kobj_attr-interface.patch
-driver/kset-convert-parisc-pdc_stable.c-to-use-kset_create.patch
-driver/kset-kill-subsys-attr.patch
-driver/kset-convert-edd-to-use-kset_create.patch
-driver/kobject-convert-sys-firmware-acpi-to-use-kobject_create.patch
-driver/firmware-remove-firmware_register.patch
-driver/firmware-change-firmware_kset-to-firmware_kobj.patch
-driver/kset-convert-ocfs2-to-use-kset_create.patch
-driver/kset-convert-block_subsys-to-use-kset_create.patch
-driver/kset-remove-decl_subsys-macro.patch
-driver/kobject-convert-kernel_kset-to-be-a-kobject.patch
-driver/kobject-remove-subsystem_register-functions.patch
-driver/kobject-clean-up-rpadlpar-horrid-sysfs-abuse.patch
-driver/kobject-convert-ecryptfs-to-use-kobject_create.patch
-driver/kobject-convert-efivars-to-use-kobject_create.patch
-driver/kobject-convert-parisc-pdc_stable-to-use-kobject_create.patch
-driver/driver-core-clean-up-shutdown.c.patch
-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/kobject-change-net-bridge-to-use-kobject_create_and_add.patch
-driver/kobject-change-gfs2-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-infiniband-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-firmware-edd.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-firmware-efivars.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-cpufreq-cpufreq.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-edac-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-cpuidle-sysfs.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-pci-hotplug-pci_hotplug_core.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-base-sys.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-arch-x86-kernel-cpu-intel_cacheinfo.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-acpi-system.c-to-use-kobject_create_and_add.patch
-driver/kobject-change-drivers-block-pktcdvd.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-arch-sh-kernel-cpu-sh4-sq.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-net-ibmveth.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-parisc-pdc_stable.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-arch-ia64-kernel-topology.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-drivers-md-md.c-to-use-kobject_init_and_add.patch
-driver/kobject-change-arch-x86-kernel-cpu-mcheck-mce_amd_64.c-to-use-kobject_create_and_add.patch
-driver/kobject-change-arch-x86-kernel-cpu-mcheck-mce_amd_64.c-to-use-kobject_init_and_add.patch
-driver/kobject-the-cris-iop_fw_load.c-code-is-broken.patch
-driver/kobject-convert-drivers-base-class.c-to-use-kobject_init-add_ng.patch
-driver/kobject-convert-drivers-base-core.c-to-use-kobject_init-add_ng.patch
-driver/kobject-convert-drivers-net-iseries_veth.c-to-use-kobject_init-add_ng.patch
-driver/kobject-convert-fs-char_dev.c-to-use-kobject_init-add_ng.patch
-driver/kobject-convert-kernel-params.c-to-use-kobject_init-add_ng.patch
-driver/kobject-convert-kernel-user.c-to-use-kobject_init-add_ng.patch
-driver/kobject-convert-mm-slub.c-to-use-kobject_init-add_ng.patch
-driver/kobject-convert-net-bridge-br_if.c-to-use-kobject_init-add_ng.patch
-
-driver/driver-core-remove-owner-field-from-struct-bus_type.patch
-driver/driver-core-add-way-to-get-to-bus-kset.patch
-driver/driver-core-add-way-to-get-to-bus-device-klist.patch
-driver/driver-core-remove-fields-from-struct-bus_type.patch
-driver/usb-use-proper-call-to-driver_create_file.patch
-driver/pcmcia-use-proper-call-to-driver_create_file.patch
-driver/pci-use-proper-call-to-driver_create_file.patch
-driver/pci-remove-foolish-code-from-pci-driver.c.patch
-driver/driver-core-introduce-default-attribute-groups.patch
-driver/netiucv-use-device_driver-default-attribute-groups.patch
-driver/zfcp-use-device_driver-default-attribute-groups.patch
-driver/infiniband-make-ipath-driver-use-default-driver-groups.patch
-driver/driver-add-driver_add_kobj-for-looney-iseries_veth-driver.patch
-driver/driver-core-move-the-driver-specific-module-code-into-the-driver-core.patch
-driver/driver-core-move-the-static-kobject-out-of-struct-driver.patch
-driver/driver-core-clean-up-debugging-messages.patch
-driver/kobject-change-drivers-base-bus-to-use-kobject_init_and_add.patch
-
-# more driver core fun...
-driver/driver-core-fix-race-in-__device_release_driver.patch
-driver/driver-core-fix-class-glue-dir-cleanup-logic.patch
-driver/sysfs-fix-sys-module-holders-after-sysfs-logic-change.patch
-
-# please work this time...
-driver/kobject-drop-child-parent-ref-at-unregistration.patch
-driver/block-device.patch
-driver/kobject-convert-block-elevator.c-to-use-kobject_init-add_ng.patch
-driver/kobject-convert-block-ll_rw_blk.c-to-use-kobject_init-add_ng.patch
-driver/kobject-convert-drivers-md-md.c-to-use-kobject_init-add_ng.patch
-driver/kobject-convert-kernel-module.c-to-use-kobject_init-add_ng.patch
-
-# remove the no-more needed functions and rename them!
-driver/kobject-remove-kobject_add-as-no-one-uses-it-anymore.patch
-driver/kobject-rename-kobject_add_ng-to-kobject_add.patch
-driver/kobject-remove-kobject_init-as-no-one-uses-it-anymore.patch
-driver/kobject-rename-kobject_init_ng-to-kobject_init.patch
-driver/kobject-remove-kobject_register.patch
-driver/kset-remove-kset_add-function.patch
-
-# autocleanup of kobjects!
-driver/kobject-auto-cleanup-on-final-unref.patch
-driver/modules-remove-unneeded-release-function.patch
-driver/kobject-convert-arch-from-kobject_unregister-to-kobject_put.patch
-driver/kobject-convert-drivers-from-kobject_unregister-to-kobject_put.patch
-driver/kobject-convert-fs-from-kobject_unregister-to-kobject_put.patch
-driver/kobject-convert-remaining-kobject_unregister-to-kobject_put.patch
-driver/kobject-remove-kobject_unregister-as-no-one-uses-it-anymore.patch
-driver/driver-core-change-sysdev-classes-to-use-dynamic-kobject-names.patch
-
-# wtf?  documentation?
-driver/kobject-remove-old-outdated-documentation.patch
-driver/kobject-update-the-kobject-kset-documentation.patch
-driver/kobject-add-sample-code-for-how-to-use-kobjects-in-a-simple-manner.patch
-driver/kobject-add-sample-code-for-how-to-use-ksets-ktypes-kobjects.patch
-
-# other driver core stuff...
-driver/driver-core-use-list_head-instead-of-call-to-init_list_head-in-__init.patch
-driver/sysfs-make-sysfs_deprecated-depend-on-sysfs.patch
-driver/driver-core-fix-build-with-sysfs-n.patch
-driver/driver-core-constify-the-name-passed-to-platform_device_register_simple.patch
-driver/uio-constify-function-pointer-tables.patch
-driver/driver-core-cleanup-get_device_parent-in-device_add-and-device_move.patch
-
-# class stuff
-driver/driver-core-add-class-iteration-api.patch
-driver/ieee1394-use-class-iteration-api.patch
-driver/power-supply-use-class-iteration-api.patch
-driver/rtc-use-class-iteration-api.patch
-driver/scsi-use-class-iteration-api.patch
-driver/spi-use-class-iteration-api.patch
-
+#driver/atm-convert-struct-class_device-to-struct-device.patch
 
 # helper tools, not for mainline.
 driver/put_device-might_sleep.patch
diff --git a/version b/version
index 848abb761b644a..9ef96d854e4bd5 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.24
+2.6.24-git1