aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-01-07 21:51:42 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-07 21:51:42 -0800
commitf0a41c49d25e081cead0dd79d2d01c7d0c4c5806 (patch)
tree245d22f6df0e5602de8de791da6ad18068b5eab4
parent8bcb462400279f284689ebb62203b9995c964887 (diff)
downloadpatches-f0a41c49d25e081cead0dd79d2d01c7d0c4c5806.tar.gz
2.6.28-git10
-rw-r--r--driver-core/bus_id-scsi.patch8
-rw-r--r--driver-core/warn-when-statically-allocated-kobjects-are-used.patch7
-rw-r--r--series128
-rw-r--r--usb.current/usb-another-unusual_devs-entry-for-another-bad-argosy-storage-device.patch2
-rw-r--r--usb.current/usb-unusual_devs.h-additions-for-pentax-k10d.patch4
-rw-r--r--version2
6 files changed, 12 insertions, 139 deletions
diff --git a/driver-core/bus_id-scsi.patch b/driver-core/bus_id-scsi.patch
index 829c194949e27b..247c12d7c2c841 100644
--- a/driver-core/bus_id-scsi.patch
+++ b/driver-core/bus_id-scsi.patch
@@ -192,7 +192,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
-@@ -411,8 +411,7 @@ static struct scsi_target *scsi_alloc_ta
+@@ -414,8 +414,7 @@ static struct scsi_target *scsi_alloc_ta
device_initialize(dev);
starget->reap_ref = 1;
dev->parent = get_device(parent);
@@ -202,7 +202,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#ifndef CONFIG_SYSFS_DEPRECATED
dev->bus = &scsi_bus_type;
#endif
-@@ -1021,7 +1020,7 @@ static int scsi_probe_and_add_lun(struct
+@@ -1024,7 +1023,7 @@ static int scsi_probe_and_add_lun(struct
if (rescan || !scsi_device_created(sdev)) {
SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO
"scsi scan: device exists on %s\n",
@@ -211,7 +211,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (sdevp)
*sdevp = sdev;
else
-@@ -1160,7 +1159,7 @@ static void scsi_sequential_lun_scan(str
+@@ -1163,7 +1162,7 @@ static void scsi_sequential_lun_scan(str
struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: Sequential scan of"
@@ -495,7 +495,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
-@@ -1876,7 +1876,7 @@ static int sd_probe(struct device *dev)
+@@ -1830,7 +1830,7 @@ static void sd_probe_async(void *data, a
device_initialize(&sdkp->dev);
sdkp->dev.parent = &sdp->sdev_gendev;
sdkp->dev.class = &sd_disk_class;
diff --git a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch
index f6a489fb802dbb..cc9a96a317350c 100644
--- a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch
+++ b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch
@@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
void setup_arch(char **);
--- a/init/main.c
+++ b/init/main.c
-@@ -780,12 +780,21 @@ static void run_init_process(char *init_
+@@ -782,6 +782,14 @@ static void run_init_process(char *init_
kernel_execve(init_filename, argv_init, envp_init);
}
@@ -62,8 +62,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* This is a non __init function. Force it to be noinline otherwise gcc
* makes it inline to init() and it becomes part of init.text section
*/
- static noinline int init_post(void)
- {
+@@ -790,6 +798,7 @@ static noinline int init_post(void)
+ /* need to finish all async __init code before freeing the memory */
+ async_synchronize_full();
free_initmem();
+ initmem_now_dynamic = 1;
unlock_kernel();
diff --git a/series b/series
index 408d9927867de4..b21a2a1c8d52bc 100644
--- a/series
+++ b/series
@@ -15,11 +15,6 @@ gregkh.pre/detect-atomic-counter-underflows.patch
#################################
# USB patches for 2.6.28
#################################
-usb.current/usb-unusual_devs.h-additions-for-pentax-k10d.patch
-usb.current/usb-another-unusual_devs-entry-for-another-bad-argosy-storage-device.patch
-usb.current/usb-storage-extend-unusual-range-for-067b-3507.patch
-usb.current/usb-storage-recognizing-and-enabling-nokia-5200-cell-phoes.patch
-usb.current/usb-storage-unusual_devs.h-additions-for-macpower-masterbox.patch
#####################################################################
@@ -45,129 +40,6 @@ driver-core/warn-when-statically-allocated-kobjects-are-used.patch
# USB stuff (after 2.6.27 is out)
#################################
-usb/usb-clean-up-redundant-tests-on-unsigned.patch
-usb/usb-use-pci_ioremap_bar-in-drivers-usb.patch
-usb/usb-avoid-20ms-delay-in-ehci-resume.patch
-usb/usb-host-oxford-oxu210hp-hcd-driver.patch
-usb/usb-protect-hcd.h-from-multiple-inclusions.patch
-usb/usb-avoid-needless-address-taking-of-function-parameters.patch
-usb/usb-straighten-out-inline-code-in-sysfs.c.patch
-usb/usb-ehci-pci-quirks.c-don-t-wait-so-long-for-bios-handoff.patch
-usb/usb-wusb-annotate-association-types-withe-proper-endianness.patch
-usb/usb-remove-restrictions-on-signal-numbers-in-devio.c.patch
-usb/usb-power-availability-check-for-berry_charge.patch
-usb/usb-usbtmc-indent-braces-disagree-something-else-is-desired.patch
-usb/usb-change-interface-to-usb_lock_device_for_reset.patch
-usb/usb-fsl_qe_udc-check-for-muram-allocation-errors.patch
-usb/usb-powerpc-workaround-for-the-ppc440epx-usbh_23-errata.patch
-usb/usb-struct-device-replace-bus_id-with-dev_name-dev_set_name.patch
-usb/usb-oxu210hp-hcd.c-struct-device-replace-bus_id-with-dev_name-dev_set_name.patch
-usb/usb-usb-storage-add-quirks-module-parameter.patch
-usb/usb-add-asynchronous-autosuspend-autoresume-support.patch
-usb/usb-introduce-usb_queue_reset-to-do-resets-from-atomic-contexts-v7.patch
-usb/usb-convert-ohci-pnx4008-to-a-new-style-i2c-driver.patch
-usb/usb-m66592-and-r8a66597-resource-changes.patch
-usb/usb-gadget-pxa27x_udc.c-cleanup-kernel-doc.patch
-usb/usb-serial-ipw.c-mark-__init-__exit-for-usb_ipw_-init-exit.patch
-usb/usb-allow-usbmon-as-a-module-even-if-usbcore-is-builtin.patch
-usb/usb-announce-new-devices-earlier.patch
-usb/usb-storage-clean-up-unusual_devs.h.patch
-usb/usb-usb-storage-remove-us-sensebuf.patch
-usb/usb-storage-devices-and-sat.patch
-usb/usb-storage-flag-devices-known-to-support-sane_sense.patch
-usb/usb-g_file_storage-add-cd-rom-emulation.patch
-usb/usb-usb-storage-merge-cb-and-cbi-transport-routines.patch
-usb/usb-usb-storage-merge-atapi-and-qic-157-protocol-routines.patch
-usb/usb-storage-set-bounce-limit-for-non-dma-capable-host-controllers.patch
-usb/usb-don-t-use-__module_param_call.patch
-usb/usb-gadget-change-simple_strtol-to-simple_strtoul.patch
-usb/usb-gadget-mips-ci13xxx_udc.patch
-usb/usb-musb-sysfs-mode-updates.patch
-usb/usb-musb-build-fixes-for-davinci.patch
-usb/usb-musb-minor-locking-fix.patch
-usb/usb-musb-host-side-diagnostics-tweaks.patch
-usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch
-usb/usb-musb-check-if-set_irq_wake-succeded-and-remember-it.patch
-usb/usb-gadget-pxa25x_udc-vbus-sense-initialization.patch
-usb/usb-gadget-s3c2410_udc-uses-standard-gpio-calls.patch
-usb/usb-move-isp1301_omap-to-drivers-usb-otg.patch
-usb/usb-otg-gpio_vbus-transceiver-stub.patch
-usb/usb-otg-add-otg_put_transceiver.patch
-usb/usb-otg-sharable-otg-transceiver-ops.patch
-usb/usb-utilize-round_jiffies_up_relative.patch
-usb/usb-enhance-usage-of-pm_message_t.patch
-usb/usb-serial-usb_debug-make-static.patch
-usb/usb-gadget-don-t-wait-for-completion-twice.patch
-usb/usb-isp1760-use-a-specific-plx-bridge-instead-of-any-bdridge.patch
-usb/usb-isp1760-fix-probe-in-pci-glue-code.patch
-usb/usb-serial-fix-up-urb-status-usage.patch
-usb/usb-option-increase-outgoing-buffer-size-and-number.patch
-usb/usb-usb-storage-merge-dpcm-support-into-sddr09.patch
-usb/usb-musb-use-new-platform-data-interface-of-musb-to-replace-old-one.patch
-usb/usb-musb-add-blackfin-driver-to-musb-framework.patch
-usb/usb-musb-make-sure-we-program-the-correct-values-in-only-when-necessary.patch
-usb/usb-musb-add-blackfin-version-low-level-register-accessing-helper-functions.patch
-usb/usb-musb-enable-low-level-dma-operation-for-blackfin.patch
-usb/usb-musb-add-blackfin-specific-configuration-to-musb.patch
-usb/usb-musb-add-blackfin-kconfig-options-and-makefile.patch
-usb/usb-musb-blackfin-provides-read-write-i-o-accessor-in-header-files.patch
-usb/usb-musb-kill-some-compiling-warning-in-musb-blackfin-part.patch
-usb/usb-make-printk-messages-more-searchable.patch
-usb/usb-utilize-the-bus-notifiers.patch
-usb/usb-mark-reject-field-of-struct-urb-as-atomic_t.patch
-usb/usb-unusual-dev-for-option-n.v.-zerocd-modems.patch
-usb/usb-isp1760-don-t-auto-disable-port1-on-isp1761.patch
-usb/usb-extension-of-anchor-api-to-unpoison-an-anchor.patch
-usb/usb-add-imx-udc-gadget-driver.patch
-usb/usb-otg-twl4030-transceiver-driver.patch
-usb/usb-storage-add-last-sector-hacks.patch
-usb/usb-storage-make-the-quirks-module-parameter-writable.patch
-usb/usb-storage-set-capacity_heuristics-flag-for-bad-vendors.patch
-usb/usb-fix-up-suspend-and-resume-for-pci-host-controllers.patch
-usb/usb-automatically-enable-wakeup-for-pci-host-controllers.patch
-usb/usb-cancel-pending-set-config-requests-if-userspace-gets-there-first.patch
-usb/usb-re-enable-interface-after-driver-unbinds.patch
-usb/usb-fix-minor-nit-in-usbfs-checking.patch
-usb/usb-fix-goku_udc-usb-speed-handling.patch
-usb/usb-emi26-fix-oops-on-load.patch
-
-usb/usb-add-new-opticon-serial-driver.patch
-usb/usb-add-siemens_mpi-usb-serial-stub-driver.patch
-
-# finally!
-usb/usb-remove-warn-macro-from-usb.h.patch
-usb/usb-remove-info-macro-from-usb.h.patch
-
-# wimax stack
-usb/debugfs-add-helpers-for-exporting-a-size_t-simple-value.patch
-usb/wimax-documentation-for-the-stack.patch
-usb/wimax-headers-for-kernel-api-and-user-space-interaction.patch
-usb/wimax-internal-api-for-the-kernel-space-wimax-stack.patch
-usb/wimax-debug-macros-and-debug-settings-for-the-wimax-stack.patch
-usb/wimax-generic-device-management.patch
-usb/genetlink-export-genl_unregister_mc_group.patch
-usb/wimax-basic-api-kernel-user-messaging-rfkill-and-reset.patch
-usb/wimax-debugfs-controls.patch
-usb/wimax-makefile-kconfig-and-docbook-linkage-for-the-stack.patch
-usb/i2400m-documentation-and-instructions-for-usage.patch
-usb/i2400m-host-device-procotol-and-core-driver-definitions.patch
-usb/i2400m-generic-probe-disconnect-reset-and-message-passing.patch
-usb/i2400m-linkage-to-the-networking-stack.patch
-usb/i2400m-firmware-loading-and-bootrom-initialization.patch
-usb/i2400m-rx-and-tx-data-control-paths.patch
-usb/i2400m-various-functions-for-device-management.patch
-usb/i2400m-debugfs-controls.patch
-usb/i2400m-usb-header-for-the-usb-bus-driver.patch
-usb/i2400m-usb-probe-disconnect-dev-init-shutdown-and-reset-backends.patch
-usb/i2400m-usb-firmware-upload-backend.patch
-usb/i2400m-usb-tx-and-rx-path-backends.patch
-usb/i2400m-sdio-header-for-the-sdio-subdriver.patch
-usb/i2400m-sdio-probe-disconnect-dev-init-shutdown-and-reset-backends.patch
-usb/i2400m-sdio-firmware-upload-backend.patch
-usb/i2400m-sdio-tx-and-rx-path-backends.patch
-usb/i2400m-makefile-and-kconfig.patch
-usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch
-usb/wimax-i2400m-add-credits-and-maintainers-entries.patch
# stuff I want in my tree, but not to go into -next
gregkh.post/usb-gotemp.patch
diff --git a/usb.current/usb-another-unusual_devs-entry-for-another-bad-argosy-storage-device.patch b/usb.current/usb-another-unusual_devs-entry-for-another-bad-argosy-storage-device.patch
index 1f84a89657bf6a..4dd909a250e95d 100644
--- a/usb.current/usb-another-unusual_devs-entry-for-another-bad-argosy-storage-device.patch
+++ b/usb.current/usb-another-unusual_devs-entry-for-another-bad-argosy-storage-device.patch
@@ -135,7 +135,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
-@@ -1320,6 +1320,13 @@ UNUSUAL_DEV( 0x0840, 0x0082, 0x0001, 0x0
+@@ -1251,6 +1251,13 @@ UNUSUAL_DEV( 0x0840, 0x0084, 0x0001, 0x0
US_SC_DEVICE, US_PR_DEVICE, NULL,
US_FL_FIX_CAPACITY),
diff --git a/usb.current/usb-unusual_devs.h-additions-for-pentax-k10d.patch b/usb.current/usb-unusual_devs.h-additions-for-pentax-k10d.patch
index 700d0f483d418e..2a4109f28a3477 100644
--- a/usb.current/usb-unusual_devs.h-additions-for-pentax-k10d.patch
+++ b/usb.current/usb-unusual_devs.h-additions-for-pentax-k10d.patch
@@ -36,9 +36,9 @@ Signed-off-by: Phil Dibowitz <phil@ipom.com>
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
-@@ -1425,6 +1425,13 @@ UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xff
+@@ -1352,6 +1352,13 @@ UNUSUAL_DEV( 0x0a17, 0x006e, 0x0100, 0x0
US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_INQUIRY ),
+ US_FL_FIX_CAPACITY ),
+/* Reported by Jaak Ristioja <Ristioja@gmail.com> */
+UNUSUAL_DEV( 0x0a17, 0x006e, 0x0100, 0x0100,
diff --git a/version b/version
index cf304fd2e93be3..16bd541647fd77 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.28-git9
+2.6.28-git10