diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-19 21:25:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-19 21:25:34 -0700 |
| commit | db62d271b33b421201e877331fb91c941c48f070 (patch) | |
| tree | 1301107084e69d1d091d598d3ca1a02087e4bb37 | |
| parent | c10c01a8e7b610599a72a0bbcabbd841ebc5e802 (diff) | |
| download | patches-db62d271b33b421201e877331fb91c941c48f070.tar.gz | |
version update (2.6.23-git13)
| -rw-r--r-- | driver/block-device.patch | 10 | ||||
| -rw-r--r-- | driver/nozomi.patch | 12 | ||||
| -rw-r--r-- | driver/warn-when-statically-allocated-kobjects-are-used.patch | 2 | ||||
| -rw-r--r-- | gregkh/sysfs-test.patch | 2 | ||||
| -rw-r--r-- | series | 32 | ||||
| -rw-r--r-- | version | 2 |
6 files changed, 17 insertions, 43 deletions
diff --git a/driver/block-device.patch b/driver/block-device.patch index 0d29505d62ebdb..eaa255578cead6 100644 --- a/driver/block-device.patch +++ b/driver/block-device.patch @@ -1278,9 +1278,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct hd_struct *p; + int err; - p = kmalloc(sizeof(*p), GFP_KERNEL); + p = kzalloc(sizeof(*p), GFP_KERNEL); if (!p) -@@ -382,92 +337,52 @@ void add_partition(struct gendisk *disk, +@@ -381,92 +336,52 @@ void add_partition(struct gendisk *disk, p->partno = part; p->policy = disk->policy; @@ -1402,7 +1402,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Not exported, helper to add_disk(). */ void register_disk(struct gendisk *disk) -@@ -478,18 +393,27 @@ void register_disk(struct gendisk *disk) +@@ -477,18 +392,27 @@ void register_disk(struct gendisk *disk) struct hd_struct *p; int err; @@ -1435,7 +1435,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> disk_sysfs_add_subdirs(disk); /* No minors to use for partitions */ -@@ -504,25 +428,23 @@ void register_disk(struct gendisk *disk) +@@ -503,25 +427,23 @@ void register_disk(struct gendisk *disk) if (!bdev) goto exit; @@ -1465,7 +1465,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -601,19 +523,15 @@ void del_gendisk(struct gendisk *disk) +@@ -600,19 +522,15 @@ void del_gendisk(struct gendisk *disk) disk_stat_set_all(disk, 0); disk->stamp = 0; diff --git a/driver/nozomi.patch b/driver/nozomi.patch index 820ad11483e309..857f10007cc115 100644 --- a/driver/nozomi.patch +++ b/driver/nozomi.patch @@ -22,9 +22,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig -@@ -372,6 +372,16 @@ config ISTALLION - To compile this driver as a module, choose M here: the - module will be called istallion. +@@ -388,6 +388,16 @@ config A2232 + will also be built as a module. This has to be loaded before + "ser_a2232". If you want to do this, answer M here. +config NOZOMI + tristate "HSDPA Broadband Wireless Data Card - Globe Trotter" @@ -36,9 +36,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + To compile this driver as a module, choose M here, the module + will be called nozomi. + - config SERIAL_DEC - bool "DECstation serial support" - depends on MACH_DECSTATION + config SGI_SNSC + bool "SGI Altix system controller communication support" + depends on (IA64_SGI_SN2 || IA64_GENERIC) --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -26,6 +26,7 @@ obj-$(CONFIG_SERIAL167) += serial167.o diff --git a/driver/warn-when-statically-allocated-kobjects-are-used.patch b/driver/warn-when-statically-allocated-kobjects-are-used.patch index c273e10c38cdbb..17b74d6c779940 100644 --- a/driver/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver/warn-when-statically-allocated-kobjects-are-used.patch @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/i386/kernel/vmlinux.lds.S +++ b/arch/i386/kernel/vmlinux.lds.S -@@ -69,6 +69,8 @@ SECTIONS +@@ -71,6 +71,8 @@ SECTIONS __tracedata_end = .; } diff --git a/gregkh/sysfs-test.patch b/gregkh/sysfs-test.patch index 7ebc058637f40a..672ec1ec72bddc 100644 --- a/gregkh/sysfs-test.patch +++ b/gregkh/sysfs-test.patch @@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/Makefile +++ b/drivers/Makefile -@@ -82,3 +82,5 @@ obj-$(CONFIG_GENERIC_TIME) += clocksourc +@@ -86,3 +86,5 @@ obj-$(CONFIG_GENERIC_TIME) += clocksourc obj-$(CONFIG_DMA_ENGINE) += dma/ obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_PPC_PS3) += ps3/ @@ -9,37 +9,14 @@ gregkh/detect-atomic-counter-underflows.patch gregkh/hpet_patches_45.patch # driver patches queued for 2.6.23 -driver/debugfs-remove-rmdir-non-empty-complaint.patch -driver/driver-core-accept-all-valid-action-strings-in-uevent-trigger.patch -driver/pm-remove-deprecated-sysfs-files.patch -driver/pm-remove-deprecated-dpm_runtime_-routines.patch -driver/sysfs-avoid-kmem_cache_free.patch -driver/documentation-fix-devres.txt-lib-iomap.c-lib-devres.c.patch -driver/sysfs-fix-sysfs-root-inode-nlink-accounting.patch -driver/sysfs-make-sysfs_init_inode-static.patch -driver/dev_vdbg-available-with-dverbose_debug.patch -driver/dev_vdbg-documentation.patch -driver/howto-add-the-knwon_regression-uri-to-the-documentation.patch -driver/driver-core-check-return-code-of-sysfs_create_link.patch -driver/sysfs-kill-an-extra-put-in-sysfs_create_link-failure-path.patch -driver/sysfs-cosmetic-clean-up-on-node-creation-failure-paths.patch +driver/howto-adjust-translation-header-of-japanese-stable_api_nonsense.txt.patch -driver/block-device.patch # driver patches for after 2.6.23 is out +driver/block-device.patch -# documentation updates and additions. -driver/howto-translated-into-japanese.patch -driver/add-Japanese-translated-stable_api_nonsense.txt.patch -driver/howto-add-chinese-translation-of-documentation-howto.patch -driver/chinese-translation-of-documentation-stable_api_nonsense.txt.patch -driver/zh_cn-howto-update-urls-of-git-trees.patch - -# uio code -driver/uio.patch -driver/uio-documentation.patch -driver/uio-hilscher-cif-card-driver.patch +driver/nozomi.patch # helper tools, not for mainline. @@ -124,16 +101,13 @@ usb/usb-gotemp.patch usb/always-announce-new-usb-devices.patch # work in progress goes here... -driver/nozomi.patch pci/pci-piggy-bus.patch -driver/howto-adjust-translation-header-of-japanese-stable_api_nonsense.txt.patch #accessibility-documentation.patch #accessibility-core.patch #patch-add-urb-setup-helpers - @@ -1 +1 @@ -2.6.22-git10 +2.6.22-git13 |