diff options
9 files changed, 10 insertions, 334 deletions
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 b252b98f99a856..f6a489fb802dbb 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 -@@ -783,12 +783,21 @@ static void run_init_process(char *init_ +@@ -780,12 +780,21 @@ static void run_init_process(char *init_ kernel_execve(init_filename, argv_init, envp_init); } @@ -62,7 +62,7 @@ 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 int noinline init_post(void) + static noinline int init_post(void) { free_initmem(); + initmem_now_dynamic = 1; diff --git a/gregkh.pre/detect-atomic-counter-underflows.patch b/gregkh.pre/detect-atomic-counter-underflows.patch index da08e65a5b7bd6..91773b9444fe7f 100644 --- a/gregkh.pre/detect-atomic-counter-underflows.patch +++ b/gregkh.pre/detect-atomic-counter-underflows.patch @@ -19,7 +19,7 @@ Signed-off-by: Andrew Morton <akpm@osdl.org> --- a/arch/x86/include/asm/atomic_32.h +++ b/arch/x86/include/asm/atomic_32.h -@@ -121,6 +121,11 @@ static inline int atomic_dec_and_test(at +@@ -113,6 +113,11 @@ static inline int atomic_dec_and_test(at { unsigned char c; @@ -34,71 +34,9 @@ usb.current/usb-storage-unusual_devs.h-additions-for-macpower-masterbox.patch #driver-core/driver-core-use-dev_get_drvdata-accessors.patch #driver-core/acpi-fixup-typo-in-acpi_device_remove.patch -driver-core/pm-simplify-the-new-suspend-hibernation-framework-for-devices.patch -driver-core/fix-misspellings-in-pm.h-macros.patch -driver-core/driver-core-rearrange-struct-device-for-better-packing.patch -driver-core/driver-core-remove-completion-from-struct-klist_node.patch -driver-core/driver-core-struct-device-replace-bus_id-with-dev_name-dev_set_name.patch -driver-core/sysfs-clarify-sysfs_deprecated-help-text.patch -driver-core/uevent-don-t-pass-envp_ext-as-format-string-in-kobject_uevent_env.patch -driver-core/kobject-return-the-result-of-uevent-sending-by-netlink.patch -driver-core/kernel-ksysfs.c-fix-dependence-on-config_net.patch -driver-core/pci-rework-default-handling-of-suspend-and-resume.patch -driver-core/kobject-make-documentation-kobject.txt-a-little-more-coherent.patch -driver-core/dynamic_printk-reduce-one-level-of-indentation.patch -driver-core/driver-core-create-a-private-portion-of-struct-device.patch -driver-core/driver-core-move-klist_children-into-private-structure.patch -driver-core/driver-core-move-knode_driver-into-private-structure.patch -driver-core/driver-core-move-knode_bus-into-private-structure.patch -driver-core/make-debug-take-precedence-over-dynamic_printk_debug.patch -driver-core/driver-core-move-the-bus-notifier-call-points.patch -driver-core/driver-core-fix-duplicate-removing-driver-link-in-__device_release_driver.patch - -driver-core/driver-core-add-root_device_register.patch -driver-core/virtio-do-not-statically-allocate-root-device.patch -driver-core/lguest-do-not-statically-allocate-root-device.patch -driver-core/s390-remove-s390_root_dev_.patch - -driver-core/bus_id-xen.patch -driver-core/bus_id-w1.patch -driver-core/bus_id-video.patch -driver-core/bus_id-tifm.patch -driver-core/bus_id-thermal.patch -driver-core/bus_id-swiotlb.patch -driver-core/bus_id-spi.patch -driver-core/bus_id-sgi.patch -driver-core/bus_id-serial.patch driver-core/bus_id-scsi.patch -driver-core/bus_id-power.patch -driver-core/bus_id-pnp.patch -driver-core/bus_id-mwave.patch -driver-core/bus_id-mtd.patch -driver-core/bus_id-mips.patch -driver-core/bus_id-memstick.patch -driver-core/bus_id-macintosh.patch -driver-core/bus_id-kernel-power.patch -driver-core/bus_id-isdn.patch -driver-core/bus_id-infiniband.patch -driver-core/bus_id-idle.patch -driver-core/bus_id-ia64.patch -driver-core/bus_id-i2o.patch -driver-core/bus_id-hwmon.patch -driver-core/bus_id-gpu.patch -driver-core/bus_id-gpio.patch -driver-core/bus_id-gadget.patch -driver-core/bus_id-firmware.patch -driver-core/bus_id-chris.patch -driver-core/bus_id-block.patch -driver-core/bus_id-avr.patch -driver-core/bus_id-ata.patch -driver-core/bus_id-arm.patch -driver-core/uio-use-pci_ioremap_bar-in-drivers-uio.patch -driver-core/uio-uio_pdrv_genirq-allow-custom-irq_flags.patch -driver-core/uio-pass-information-about-ioports-to-userspace.patch -driver-core/uio-documentation-for-uio-ioport-info-handling.patch -driver-core/uio-make-uio_info-s-name-and-version-const.patch # helper tools, not for mainline. driver-core/warn-when-statically-allocated-kobjects-are-used.patch @@ -237,269 +175,7 @@ gregkh.post/usb-gotemp.patch ################################# # Staging stuff ################################# -#staging/staging-move-staging-drivers-back-to-staging-specific-menu.patch - -staging/staging-go7007-fixes-due-to-video_usercopy-api-change.patch -staging/staging-go7007-fixes-due-v4l2_file_operations-api-change.patch -staging/staging-kconfig-for-arch-arm-8300-cris.patch -staging/staging-correct-dubious-use-of-x-y.patch - -staging/staging-w35und-make-wb35_probe-and-wb35_disconnect-funtions-static.patch -staging/staging-w35und-remove-unused-wb35_open-and-wb35_close-functions.patch -staging/staging-w35und-use-msleep-and-udelay.patch -staging/staging-w35und-remove-the-no-op-pa_stall_execution-macro.patch -staging/staging-w35und-purb-typedef-removal.patch -staging/staging-w35und-reg-queue-struct-typedef-removal.patch -staging/staging-w35und-wb35reg-struct-typedef-removal.patch -staging/staging-w35und-padapter-struct-typedef-removal.patch -staging/staging-w35und-merge-wblinux-struct-to-adapter.patch -staging/staging-w35und-wb35_probe-cleanup.patch -staging/staging-w35und-remove-usb_submit_urb-wrapper-function.patch -staging/staging-w35und-remove-usb_alloc_urb-wrapper-function.patch -staging/staging-w35und-remove-dead-code-from-wbusb_f.h.patch -staging/staging-w35und-remove-true-false-boolean-macros.patch -staging/staging-w35und-os_memory_alloc-wrapper-removal.patch -staging/staging-w35und-usb_put_dev-is-missing-from-wb35_disconnect.patch -staging/staging-w35und-remove-macro-magic-from-mlme_getnextpacket.patch -staging/staging-w35und-plug-memory-leak-in-wbsoft_tx.patch -staging/staging-w35und-move-supported-band-initialization-out-of-wb35_probe.patch -staging/staging-w35und-remove-timer-wrappers.patch -staging/staging-w35und-remove-atomic-op-wrappers.patch -staging/staging-w35und-remove-memcpy-memcmp-wrappers.patch -staging/staging-w35und-remove-abs-and-bit-macros.patch -staging/staging-w35und-remove-unused-macros-from-common.h.patch -staging/staging-w35und-remove-unused-link-status-code.patch -staging/staging-w35und-include-cleanup.patch -staging/staging-w35und-remove-some-dead-code.patch -staging/staging-w35und-move-source-files-to-one-directory.patch -staging/staging-w35und-move-struct-wbsoft_priv-to-core.h-and-use-it.patch -staging/staging-w35und-remove-adapter-from-struct-_hw_data_t.patch -staging/staging-w35und-clean-up-adapter.h-a-bit.patch -staging/staging-w35und-merge-struct-wb35_adapter-to-struct-wbsoft_priv.patch -staging/staging-w35und-remove-global-struct-ieee80211_hw.patch -staging/staging-w35und-inline-driver_author-and-driver_desc-macros.patch -staging/staging-w35und-clean-up-wblinux.c-a-bit.patch -staging/staging-w35und-remove-unused-shutdowned-member-from-struct-local_para.patch -staging/staging-w35und-move-global-wbsoft_enabled-to-struct-wbsoft_priv.patch -staging/staging-w35und-move-packet_came-to-wb35rx.c.patch -staging/staging-w35und-remove-skb_array-from-struct-wbsoft_priv.patch -staging/staging-w35und-remove-shutdown-from-struct-wbsoft_priv.patch -staging/staging-w35und-make-functions-local-to-mds.c-static.patch -staging/staging-w35und-make-functions-local-to-mlmetxrx.c-static.patch -staging/staging-w35und-remove-dead-code-from-mto.c.patch -staging/staging-w35und-make-functions-local-to-wb35rx.c-static.patch -staging/staging-w35und-make-functions-local-to-wb35tx.c-static.patch -staging/staging-w35und-remove-dead-code-from-wbhal.c.patch -staging/staging-w35und-remove-rxisr.c-as-dead-code.patch -staging/staging-w35und-fix-kconfig.patch -staging/staging-w35und-fix-config-build-warnings.patch - -staging/staging-wlan-ng-remove-pci-plx-pcmcia-files.patch -staging/staging-wlan-ng-update-help-text-to-mention-prism3-devices.patch -staging/staging-wlan-ng-delete-pci-plx-pcmcia-specific-code.patch -staging/staging-wlan-ng-make-wlan-ng-use-wext-mode-by-default.patch -staging/staging-wlan-ng-eliminate-more-2.6-kernel-support.patch -staging/staging-wlan-ng-eliminate-all-backwards-compatibility-for-2.6.13-kernels.patch -staging/staging-wlan-ng-eliminate-a-boatload-of-tertiaryap-only-code.patch -staging/staging-wlan-ng-remove-ap-only-code-from-mlme-functions.patch -staging/staging-wlan-ng-get-rid-of-the-mtu-tests-in-the-rx-conversion-path.patch -staging/staging-wlan-ng-eliminate-one-more-rx-mtu-test.patch -staging/staging-wlan-ng-eliminate-local-version.h.patch -staging/staging-wlan-ng-eliminate-usage-of-procfs.patch -staging/staging-wlan-ng-use-standard-kernel-integer-types.patch -staging/staging-wlan-ng-eliminate-all-backwards-compatible-kernel-code.patch -staging/staging-wlan-ng-wireless-extension-support-is-mandatory.patch -staging/staging-wlan-ng-use-wireless_ext-not-config_wireless_ext.patch -staging/staging-wlan-ng-delete-a-large-pile-of-now-unused-code.patch -staging/staging-wlan-ng-delete-a-pile-of-unused-mibs.-and-fix-wext-set_txpower.patch -staging/staging-wlan-ng-consolidate-wlan-ng-into-a-single-module.patch -staging/staging-wlan-ng-purge-all-mibs-not-used-internally.patch -staging/staging-wlan-ng-p80211netdev.c-fix-netdev-alloc-to-prevent-oops-on-device-start.patch -staging/staging-wlan-ng-prism2_usb.c-always-enable-the-card-in-probe_usb.patch -staging/staging-wlan-ng-hfa384x_usb.c-use-newest-version-of-384x_drvr_start.patch -staging/staging-wlan-ng-p80211wext.c-add-latest-changes-remove-extra-nulls-from-wext_handlers.patch -staging/staging-wlan-ng-p80211wext-don-t-set-default-key-id-twice.patch -staging/staging-wlan-ng-hfa384x_usbin_callback-check-for-hardware-removed.patch -staging/staging-wlan-ng-p80211conv.c-copy-code-from-wlan-ng-devel-branch-to-not-drop-packets.patch -staging/staging-wlan-ng-remove-unused-include-version.h.patch -staging/staging-wlan-ng-p80211wext.c-use-array_size.patch -staging/staging-wlan-ng-fix-compiler-warnings.patch -staging/staging-wlan-ng-skb_p80211_to_ether-payload_length-is-unsigned-check-before-subtraction.patch - -staging/staging-at76_usb-update-drivers-staging-at76_usb-w-mac80211-port.patch -staging/staging-at76_usb-fix-build-breakage.patch -staging/staging-at76_usb-remove-compiler-warnings.patch -staging/staging-at76_usb-fix-up-all-remaining-checkpatch.pl-warnings.patch -staging/staging-at76_usb-cleanup-dma-on-stack-issues.patch - - -staging/staging-poch-block-size-bug-fix.patch -staging/staging-poch-update-todo-list.patch -staging/staging-poch-correct-pages-from-bytes.patch -staging/staging-poch-minor-fixes.patch -staging/staging-poch-fix-build-warnings.patch -staging/staging-poch-rx-control-register-init.patch -staging/staging-poch-fix-user-space-protocol-syncing.patch -staging/staging-poch-fine-grained-locking.patch - -staging/staging-sxg-remove-typedefs.patch -staging/staging-sxg-break-the-build-in-a-cleaner-way-when-x86.patch -staging/staging-sxg-update-readme.patch -staging/staging-struct-device-replace-bus_id-with-dev_name-dev_set_name.patch -staging/staging-echo-remove-typedefs.patch -staging/staging-echo-lindent-drivers-staging-echo.patch - -staging/staging-go7007-saa7134-updates.patch -staging/staging-go7007-add-sensoray-2250-2251-support.patch -staging/staging-go7007-convert-driver-to-use-video_ioctl2.patch -staging/staging-go7007-annotate-code-pointers.patch -staging/staging-go7007-fix-minor-build-warnings.patch -staging/staging-go7007-small-cleanup.patch -staging/staging-go7007-add-some-more-v4l2-ioctls.patch - -staging/staging-et131x-cleanup-et131x_debug.h-defines.patch -staging/staging-et131x-fix-build-failure.patch -staging/staging-et131x-remove-unused-variable-in-et1310_tx.c.patch -staging/staging-usbip-cleanup-kerneldoc.patch -staging/staging-slicoss-use-kzalloc.patch -staging/staging-slicoss-use-correct-type-for-memory-allcations.patch -staging/staging-slicoss-use-request_firmware.patch - -staging/staging-add-agnx-wireless-driver.patch -staging/staging-agnx-fix-build-errors-due-to-ssid-removal.patch -staging/staging-agnx-fix-build-errors-due-to-rate-control-api-changes.patch -staging/staging-agnx-fix-build-warnings.patch - -staging/staging-add-otus-atheros-wireless-network-driver.patch -staging/staging-otus-fix-netdev-priv-usage.patch -staging/staging-otus-fix-name-clash.patch -staging/staging-otus-fix-urb-callback-function-type.patch -staging/staging-otus-remove-dependence-on-kernel-version.patch - -staging/staging-add-rt2860-wireless-driver.patch -staging/staging-rt2860-disable-root-hack-for-reading-files.patch -staging/staging-rt2860-fix-up-netdev-priv-usage.patch -staging/staging-rt2860-use-standard-bit-reverse-function.patch -staging/staging-rtl2860-fix-minor-compiler-warnings.patch -staging/staging-rt2860-enable-wpa_supplicant-support.patch - -staging/staging-add-serverengines-benet-10gb-ethernet-driver.patch -staging/staging-benet-fix-netif-api-breakage.patch -staging/staging-benet-fix-up-netdev-priv-change.patch -staging/staging-benet-build-is-broken-unless-config_netpoll-is-enabled.patch -staging/staging-benet-patch-to-remove-subdirectories.patch -staging/staging-benet-fix-build-errors-when-config_netpoll-is-off.patch -staging/staging-benet-fix-build-error.patch -staging/staging-benet-patch-to-use-offsetof-instead-of-amap_byte_offset.patch -staging/staging-benet-fix-problems-reported-by-checkpatch.patch -staging/staging-benet-cleanup-a-check-while-posting-rx-buffers.patch - -staging/staging-add-comedi-core.patch -staging/staging-comedi-fix-up-a-lot-of-checkpatch.pl-warnings.patch -staging/staging-comedi-fix-checkpatch.pl-errors-in-comedi_fops.c.patch -staging/staging-comedi-fix-build-error-in-comedilib.h.patch -staging/staging-comedi-add-kcomedilib-to-the-tree.patch -staging/staging-comedi-set-up-infrastructure-for-individual-drivers.patch -staging/staging-comedi-add-local-copy-of-interrupt.h.patch -staging/staging-comedi-add-pci-and-usb-wrapper-header-files.patch -staging/staging-comedi-comedi-driver-common-function-module.patch -staging/staging-comedi-add-mite-comedi-pci-driver.patch -staging/staging-comedi-add-usb-usbdux-driver.patch -staging/staging-comedi-add-usb-usbduxfast-driver.patch -staging/staging-comedi-add-usb-dt9812-driver.patch -staging/staging-comedi-add-comedi_bond-driver.patch -staging/staging-comedi-add-comedi_test-driver.patch -staging/staging-comedi-add-comedi_parport-driver.patch -staging/staging-comedi-dt9812-fix-up-a-lot-of-coding-style-issues.patch -staging/staging-comedi-dt9812-remove-dt9812.h.patch -staging/staging-comedi-dt9812-remove-typedefs.patch -staging/staging-comedi-dt9812-fix-sparse-warnings.patch -staging/staging-comedi-usbdux-remove-kernel-version-checks.patch -staging/staging-comedi-usbdux-code-style-cleanups.patch -staging/staging-comedi-usbdux-remove-comments.patch -staging/staging-comedi-usbdux-fix-up-printk-calls.patch -staging/staging-comedi-usbdux-remove-checkpatch.pl-warnings.patch -staging/staging-comedi-usbdux-remove-typedef.patch -staging/staging-comedi-usbdux-remove-comedi-usb-wrappers.patch -staging/staging-comedi-usbduxfast-remove-comedi-usb-wrappers.patch -staging/staging-comedi-dt9812-remove-ifdef-that-is-not-needed.patch -staging/staging-comedi-remove-usb-wrappers.patch -staging/staging-comedi-remove-pci-wrappers.patch -staging/staging-comedi-add-icp_multi-driver.patch -staging/staging-comedi-add-me4000-driver.patch -staging/staging-comedi-fix-checkpatch.pl-issues-in-comedi_bond.c.patch -staging/staging-comedi-fix-checkpatch.pl-issues-in-comedi_fc.c.patch -staging/staging-comedi-remove-typedefs-from-comedi_bond.c.patch -staging/staging-comedi-fix-sparse-issues-in-comedi_bond.c.patch -staging/staging-comedi-fix-checkpatch.pl-issues-in-comedi_test.c.patch -staging/staging-comedi-fix-sparse-issues-in-comedi_test.c.patch -staging/staging-comedi-remove-typedefs-from-comedi_test.c.patch -staging/staging-comedi-fix-comedi_parport.c-checkpatch.pl-issues.patch -staging/staging-comedi-fix-comedi_fc.h-checkpatch.pl-issues.patch -staging/staging-comedi-fix-comedi_pci.h-checkpatch.pl-issues.patch -staging/staging-comedi-comedi_pci.h-remove-unneeded-wrapper.patch -staging/staging-comedi-comedi_pci.h-remove-comedi_pci_enable_no_regions.patch -staging/staging-comedi-comedi_pci.h-remove-comedi_pci_disable_no_regions.patch -staging/staging-comedi-add-s626-driver.patch -staging/staging-comedi-add-rtd520-driver.patch -staging/staging-comedi-add-me_daq-driver.patch -staging/staging-comedi-me_daq-fix-checkpatch.pl-issues.patch -staging/staging-comedi-me_daq-remove-typedefs.patch -staging/staging-comedi-me_daq-fix-sparse-issues.patch -staging/staging-comedi-fix-checkpatch.pl-warning-in-interrupt.h.patch -staging/staging-comedi-fix-build-if-config_proc_fs-is-not-set.patch - -staging/staging-add-asus_oled-driver.patch -staging/staging-asus_oled-fix-build-dependancy.patch - -staging/staging-add-the-meilhaus-me-ids-driver-package.patch -staging/staging-meilhaus-fix-__symbol_get-problems.patch - -staging/staging-add-lcd-panel-driver.patch -staging/staging-panel-major-checkpatch-cleanup.patch -staging/staging-panel-remove-ifdefs-and-code-for-pre-2.6-kernels.patch -staging/staging-panel-remove-support-for-smartcards.patch - -staging/staging-add-driver-for-altera-pci-express-chaining-dma-reference-design.patch - -staging/staging-add-rtl8187se-driver.patch -staging/staging-rtl8187se-remove-unneeded-files.patch -staging/staging-rtl8187se-make-the-built-module-be-the-proper-name.patch -staging/staging-rtl8187se-remove-duplicate-pci-ids.patch - -staging/staging-me4000-switch-to-list_for_each.patch -staging/staging-usbip-switch-to-list_for_each_entry.patch - -staging/usb-add-princeton-instruments-usb-camera-driver.patch -staging/staging-add-mimio-xi-driver.patch - -staging/staging-add-rt2870-wireless-driver.patch -staging/staging-rt2870-disable-root-hack-for-reading-files.patch -staging/staging-rt2870-fix-up-netdev-priv-usage.patch - -staging/staging-add-frontier-tranzport-and-alphatrack-drivers.patch -staging/staging-frontier-remove-unused-alphatrack_sysfs.c-file.patch -staging/staging-frontier-fix-compiler-warnings.patch - -staging/staging-add-epl-stack.patch -staging/staging-epl-run-lindent-on-all-kernel-.h-files.patch -staging/staging-epl-run-lindent-on-all-user-.h-files.patch -staging/staging-epl-run-lindent-on-.h-files.patch -staging/staging-epl-run-lindent-on-.c-files.patch -staging/staging-epl-hr-timers-all-run-in-hard-irq-context-now.patch -staging/staging-epl-fix-netdev-priv-b0rkage.patch -staging/staging-add-android-framework.patch -staging/staging-android-add-binder-driver.patch -staging/staging-android-binder-fix-gcc-warnings-about-improper-format-specifiers-for-size_t-in-printk.patch -staging/staging-android-binder-fix-use-of-euid.patch -staging/staging-android-add-logging-driver.patch -staging/staging-android-add-ram_console-driver.patch -staging/staging-android-add-timed_gpio-driver.patch -staging/staging-android-timed_gpio-rename-android_timed_gpio-to-timed_gpio.patch -staging/staging-android-remove-dummy-android.c-driver.patch -staging/staging-android-add-lowmemorykiller-driver.patch -staging/staging-android-binder-fix-build-errors.patch #usb-remove-err-macro-from-usb.h.patch diff --git a/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch b/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch index 790e000112b6fd..06509661696073 100644 --- a/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch +++ b/usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2985,6 +2985,7 @@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CON +@@ -2982,6 +2982,7 @@ MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CON P: Felipe Balbi M: felipe.balbi@nokia.com L: linux-usb@vger.kernel.org diff --git a/usb/usb-storage-make-the-quirks-module-parameter-writable.patch b/usb/usb-storage-make-the-quirks-module-parameter-writable.patch index 4a8ac66bad2b3e..37fda342c1889c 100644 --- a/usb/usb-storage-make-the-quirks-module-parameter-writable.patch +++ b/usb/usb-storage-make-the-quirks-module-parameter-writable.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -2385,14 +2385,21 @@ and is between 256 and 4096 characters. +@@ -2396,14 +2396,21 @@ and is between 256 and 4096 characters. and Product ID values (4-digit hex numbers) and Flags is a set of characters, each corresponding to a common usb-storage quirk flag as follows: diff --git a/usb/usb-usb-storage-add-quirks-module-parameter.patch b/usb/usb-usb-storage-add-quirks-module-parameter.patch index ad03824016e4cc..149d7c12d212b2 100644 --- a/usb/usb-usb-storage-add-quirks-module-parameter.patch +++ b/usb/usb-usb-storage-add-quirks-module-parameter.patch @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> USB USB support is enabled. USBHID USB Human Interface Device support is enabled. V4L Video For Linux support is enabled. -@@ -2372,6 +2373,34 @@ and is between 256 and 4096 characters. +@@ -2383,6 +2384,34 @@ and is between 256 and 4096 characters. usbhid.mousepoll= [USBHID] The interval which mice are to be polled at. diff --git a/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch b/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch index d99a50de4e4532..743433defb10f7 100644 --- a/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch +++ b/usb/wimax-export-linux-wimax.h-and-linux-wimax-i2400m.h-with-headers_install.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/include/linux/Kbuild +++ b/include/linux/Kbuild -@@ -372,3 +372,5 @@ unifdef-y += xattr.h +@@ -371,3 +371,5 @@ unifdef-y += xattr.h unifdef-y += xfrm.h objhdr-y += version.h diff --git a/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch b/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch index 81f0300f1b48d2..b81b584e7be1bf 100644 --- a/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch +++ b/usb/wimax-i2400m-add-credits-and-maintainers-entries.patch @@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> D: Some smbfs fixes --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2308,6 +2308,14 @@ W: http://lists.sourceforge.net/mailman/ +@@ -2305,6 +2305,14 @@ W: http://lists.sourceforge.net/mailman/ W: http://ipw2200.sourceforge.net S: Supported @@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> INTEL WIRELESS WIFI LINK (iwlwifi) P: Zhu Yi M: yi.zhu@intel.com -@@ -4736,6 +4744,14 @@ M: zaga@fly.cc.fer.hr +@@ -4733,6 +4741,14 @@ M: zaga@fly.cc.fer.hr L: linux-scsi@vger.kernel.org S: Maintained @@ -1 +1 @@ -2.6.28-git8 +2.6.28-git9 |