diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-20 18:11:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-20 18:11:07 -0700 |
| commit | 964c4ea005fcc3d186ab1b5cd7d71a2ad9b63f98 (patch) | |
| tree | 806df51d9af79274760e901185c298ae0d8eb6e6 /series | |
| parent | 4e1f5b7db49594c1aed86cc330c9b7cf13317c92 (diff) | |
| parent | 61b2ad33ac6ff951d0c137a72440f3902d88f021 (diff) | |
| download | patches-964c4ea005fcc3d186ab1b5cd7d71a2ad9b63f98.tar.gz | |
Merge branch 'master' of gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/patches
Conflicts:
series
Diffstat (limited to 'series')
| -rw-r--r-- | series | 254 |
1 files changed, 63 insertions, 191 deletions
@@ -5,232 +5,107 @@ gregkh/detect-atomic-counter-underflows.patch ##################################################################### -# Stuff to be merged for 2.6.27 +# Stuff to be merged for 2.6.28 ##################################################################### ################################# -# Driver core patches for 2.6.27 +# Driver core patches for 2.6.28 ################################# -driver-core.current/modules-fix-module-notes-kobject-leak.patch - +driver-core.current/document-kernel-taint-flags-properly.patch +driver-core.current/driver-core-drivers-base-sys.c-update-comments.patch +driver-core.current/sysfs-fix-return-values-for-sysdev_store_-ulong-int.patch +driver-core.current/driver-core-fix-wrong-sysfs-file-attribute-for-memory.patch ################################# -# USB patches for 2.6.27 +# USB patches for 2.6.28 ################################# -usb.current/usb-option-add-ericsson-f3507g-and-dell-5530.patch -usb.current/usb-option.c-remove-duplicate-device-ids-now-supported-in-hso.c.patch -usb.current/usb-add-oceanic-product-id-to-ftdi_sio.patch - - -usb.current/usb-added-driver-for-a-delcom-usb-7-segment-led-display.patch -usb.current/usb-add-usb-test-and-measurement-class-driver.patch +usb.current/usb-ohci-add-support-for-tmio-ohci-cell.patch +usb.current/usb-fix-build-warning-in-ehci-hcd-when-config_usb_debug-is-not-enabled.patch +usb.current/usb-fix-debugfs_create_file-s-error-checking-method-for-usb-gadget-s3c2410_udc.patch +usb.current/usb-storage-avoid-i-o-errors-when-issuing-scsi-ioctls-to-jmicron-usb-ata-bridge.patch +usb.current/usb-add-zte-mf626-usb-gsm-modem-entry.patch +usb.current/usb-support-huawei-data-card-product-ids.patch +usb.current/usb-usbtest.c-length-sglen-and-vary-are-unsigned-so-cannot-be-negative.patch +usb.current/usb-speedtouch-add-pre_reset-and-post_reset-routines.patch +usb.current/usb-gadget-fix-kernel-doc-warning.patch +usb.current/usb-fix-unneeded-endpoint-check-in-pxa27x_udc.patch +usb.current/usb-cdc-wdm-make-module-autoload-work.patch +usb.current/usb-unusual-dev-for-mio-moov-330-gps.patch ##################################################################### -# Stuff to be merged after 2.6.27 is out +# Stuff to be merged after 2.6.28 is out ##################################################################### ################################# -# Driver core patches for after 2.6.27 is out +# Driver core patches for after 2.6.28 is out ################################# -driver-core/sysfs-crash-debugging.patch - -driver-core/device-create-block-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-char-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-infiniband-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-misc-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-net-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-s390-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-scsi-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-sound-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-usb-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-video-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-ide-convert-device_create_drvdata-to-device_create.patch -driver-core/device-create-remove-device_create_drvdata.patch - -# usb patches are needed to get dynamic debug patch to build properly. -driver-core/usb-gadget-link-fixes-for-serial-gadget.patch -driver-core/usb-gadget-link-fixes-for-gadget-zero.patch -driver-core/usb-gadget-link-fixes-for-midi-gadget.patch -driver-core/usb-gadget-link-fixes-for-printer-gadget.patch -driver-core/usb-gadget-link-fixes-for-storage-gadget.patch -driver-core/usb-gadget-link-fixes-for-cdc-composite-gadget.patch -driver-core/usb-gadget-link-fixes-for-network-gadget.patch -driver-core/driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch - -driver-core/driver-core-make-struct-platform_pm_ops-static.patch -driver-core/sysfs-support-sysfs_notify-from-atomic-context-with-new-sysfs_notify_dirent.patch -driver-core/drivers-firmware-iscsi_ibft.c-make-3-functions-static.patch -driver-core/driver-core-clarify-device-cleanup.patch -driver-core/driver-core-fix-cleanup-in-device_create_vargs.patch -driver-core/device-model-do-a-quickcheck-for-driver-binding-before-doing-an-expensive-check.patch -driver-core/sysfs-fix-deadlock.patch -driver-core/debug-introduce-a-dev_warn-function.patch -driver-core/debug-use-dev_warn-rather-than-warn_on-in-device_pm_add.patch -driver-core/usb-turn-dev_warn-warn_on-combos-into-dev_warn.patch -driver-core/driver-core-make-bus_find_device_by_name-more-robust.patch -driver-core/pnp-create-device-attributes-via-default-device-attributes.patch -driver-core/sysfs-use-ilookup5-instead-of-ilookup5_nowait.patch -driver-core/platform-add-new-device-registration-helper.patch -driver-core/sysfs-make-dir-and-name-args-to-sysfs_notify-const.patch -driver-core/kobject-fix-kobject_rename-and-config_sysfs.patch -driver-core/kobject-cleanup-kobject_rename-and-config_sysfs.patch - -driver-core/uio-add-alignment-warnings-for-uio-mem.patch -driver-core/uio-change-driver-name-of-uio_pdrv.patch -driver-core/uio-add-automata-sercos3-pci-card-support.patch -driver-core/uio-fix-mapping-of-logical-and-virtual-memory.patch # multi driver-to-device series -driver-core/driver-core-use-dev_get_drvdata-accessors.patch -driver-core/acpi-fixup-typo-in-acpi_device_remove.patch -driver-core/driver-core-remove-suspend-resume-callbacks-for-device-type.patch - -# next two patches are also in the block tree, but we include them here as well -# as we want to build off of them. Be careful when merging with Linus. -driver-core/klist-don-t-iterate-over-deleted-entries.patch -driver-core/driver-core-use-klist-for-class-device-list-and-implement-iterator.patch - -driver-core/driver-core-add-bus_sort_breadthfirst-function.patch - - -driver-core/net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch +#driver-core/driver-core-use-dev_get_drvdata-accessors.patch +#driver-core/acpi-fixup-typo-in-acpi_device_remove.patch +# for .28 +#driver-core/pm-simplify-the-new-suspend-hibernation-framework-for-devices.patch # helper tools, not for mainline. -driver-core/warn-when-statically-allocated-kobjects-are-used.patch +#driver-core/warn-when-statically-allocated-kobjects-are-used.patch ################################# # USB stuff (after 2.6.27 is out) ################################# -usb/drivers-usb-class-usblp.c-adjust-error-handling-code.patch -usb/usb-kill-urbs-permanently.patch -usb/usb-extend-poisoning-to-anchors.patch -usb/ub-remove-sg_stat.patch -usb/usb-let-some-usb-host-controllers-get-irq-flags-from-resource.patch -usb/usb-gadget-kconfig-cleanup.patch -usb/usb-gadget-dummy_hcd-implement-set_wedge.patch -usb/usb-gadget-net2280-implement-set_wedge.patch -usb/usb-gadget-function-activation-deactivation.patch -usb/usb-gadget-cdc-obex-glue.patch -usb/usb-gadget-defer-obex-enumeration.patch -usb/usb-remove-unused-include-version.h.patch -usb/usb-drivers-usb-misc-use-an-is_err-test-rather-than-a-null-test.patch -usb/usb-add-freescale-qe-cpm-usb-peripheral-controller-driver.patch -usb/usb-storage-report-underflow-with-no-sense-data.patch -usb/ohci-allow-broken-controllers-to-auto-stop.patch -usb/usb-documentation-usb-anchors.txt-2.patch -usb/usb-core-fix-usb_otg_blacklist_hub-typo.patch -usb/usb-ftdi_sio-fix-product-parameter-description.patch -usb/usb-reset_resume-needs-to-block-autosuspend-when-remote-wakeup-is-needed.patch -usb/usb-serial-sierra-debug-message-fix.patch -usb/usb-fix-doc-for-usb_autopm_enable.patch -usb/usb-fix-spelling-in-usb-serial.h.patch -usb/usb-g_printer-fix-handling-zero-length-packet.patch -usb/usb-gadget-workaround-storage-command-size-issues.patch -usb/usb-ehci-dbg-increase-debug-buffer-size-for-periodic-file.patch -usb/usb-ehci-dbg-fix-reading-less-content-of-periodic-file.patch -usb/usb-change-hub-initialization-sleeps-to-delayed_work.patch -usb/usbmon-fix-tiny-race-exposed-by-the-fastboot-patches.patch -usb/usb-remove-code-associated-with-config_ppc_merge.patch -usb/musb-add-sanity-check-for-maximum-number-of-endpoints.patch -usb/usb-gadget-usb_gadget_vbus_draw-kconfig-option.patch -usb/usb-fix-s3c2410_udc-usb-speed-handling.patch -usb/musb-io-only-define-read-write-stubs-if-they-re-not-defined-yet.patch -usb/omap-musb-fixes-the-tt-programming.patch -usb/omap-musb-corrects-urb-unlink-function-path.patch -usb/usb-musb-do-not-mess-up-count-number-and-csr0-register-value.patch -usb/usb-musb_hdrc-build-fixes.patch -usb/usb-musb-general-cleanup-to-musbhsdma.c.patch -usb/usb-musb-remove-dead-code-from-procfs.patch -usb/usb-ohci-omap-handle-other-omap15xx-chips.patch -usb/usb-omap_udc-sync-with-omap-tree.patch -usb/usb-gadget-cdc-ethernet-notification-bugfix.patch -usb/usb-vstusb.c-new-driver-for-spectrometers-used-by-vernier-software-technology-inc.patch -usb/usb-ti_usb_3410_5052-removed-duplicated-include.patch -usb/usb-uhci-improve-scheduling-of-interrupt-urbs.patch -usb/usb-improve-ehci_watchdog-s-side-effect-in-cpu-power-management.patch -usb/usb-isp1760-use-an-is_err-test-rather-than-a-null-test.patch -usb/usb-ftdi-elan-always-pass-usb_bulk_msg-a-timeout-in-milliseconds.patch -usb/usb-anchor-api-changes-needed-for-btusb.patch -usb/usb-ehci-ohci-uhci-remove-version-numbers.patch -usb/usb-ehci-log-a-warning-if-ehci-hcd-is-not-loaded-first.patch -usb/usb-option-anydata-new-modem-same-id.patch -usb/usb-snoop-processes-opening-usbfs-device-files.patch -usb/usb-ehci-fix-remote-wakeup-support-for-arc-tdi-core.patch -usb/usb-export-if-an-interface-driver-supports-autosuspend.patch -usb/usb-ohci-add-support-for-tmio-ohci-cell.patch -usb/fsl_usb2_udc-make-dr_ep_setup-function-static.patch -usb/fsl_usb2_udc-remove-check-for-udc-null-in-dr_controller_setup.patch -usb/fsl_usb2_udc-fix-some-sparse-warnings-and-remove-redundant-code.patch -usb/fsl_usb2_udc-clean-up-whitespace-in-errors-and-warnings.patch -usb/fsl_usb2_udc-clean-up-whitespace-in-proc-debugging-output.patch -usb/fsl_usb2_udc-initialize-spinlock-earlier.patch -usb/fsl_usb2_udc-rename-the-arguments-of-the-fsl_writel-macro.patch -usb/fsl_usb2_udc-uninline-udc_reset_ep_queue.patch -usb/fsl_usb2_udc-make-fsl_queue_td-return-type-void.patch -usb/fsl_usb2_udc-add-a-wmb-before-priming-endpoint.patch -usb/fsl_usb2_udc-fix-oops-on-probe-failure.patch -usb/usb-fsl_qe_udc-fix-response-to-get-status-request.patch -usb/usb-fsl_qe_udc-clear-data-toggle-on-clear-halt-request.patch + # HSO - goes through jeff usb/hso-fix-hso_serial_close-refcounting.patch usb/hso-put-linefeeds-on-printk-s-in-hso.c.patch -# usb debugging, need to also fix up other parts of the kernel that depend on -# CONFIG_USB_DEBUG usb/usb-remove-warn-macro-from-usb.h.patch -usb/usb-remove-info-macro-from-usb-serial-drivers.patch -usb/usb-remove-info-macro-from-usb-misc-drivers.patch -usb/usb-remove-info-macro-from-remaining-usb-drivers.patch -usb/usb-remove-info-macro-from-usb-network-drivers.patch -usb/usb-remove-info-macro-from-usb-hid-drivers.patch -usb/usb-remove-info-macro-from-usb-input-drivers.patch -usb/usb-remove-info-macro-from-usb-media-drivers.patch -usb/usb-remove-info-macro-from-usb-mtd-drivers.patch usb/usb-remove-info-macro-from-usb.h.patch -usb/usb-remove-use-of-err-in-drivers-usb-serial.patch - -#usb/usb-add-config_usb_debug_messages-and-usb_dbg.patch -#usb/usb-convert-the-usb-core-code-to-use-usb_dbg.patch -#usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch -#usb/usb-remove-config_usb_debug.patch # my ols tutorial driver, never in mainline -usb/usb-gotemp.patch +#usb/usb-gotemp.patch ################################# # Staging stuff ################################# -staging/staging-add-taint_crap-for-all-drivers-staging-code.patch -staging/staging-add-taint_crap-flag-to-drivers-staging-modules.patch -staging/staging-add-kconfig-entries-and-makefile-infrastructure.patch -staging/staging-add-maintainers-entry.patch -staging/net-add-et131x-driver.patch -staging/net-add-alacritech-slicoss-driver.patch -staging/net-add-sxg-network-driver.patch -staging/me4000-firmware-file.patch -staging/me4000-add-pci-data-collection-driver.patch -staging/video-add-the-go7007-driver.patch -staging/usb-usb-ip-add-common-functions-needed.patch -staging/usb-usb-ip-add-client-driver.patch -staging/usb-usb-ip-add-host-driver.patch -staging/staging-add-w35und-wifi-driver.patch -staging/staging-add-wlan-ng-prism2-usb-driver.patch -staging/staging-add-echo-cancelation-module.patch - -staging/staging-fix-gcc-warnings-in-sxg.patch -staging/staging-go7007-v4l-fixes.patch -staging/staging-slicoss-lots-of-checkpatch-fixes.patch -staging/staging-slicoss-fix-warnings-due-to-static-usage.patch -staging/staging-slicoss-fix-remaining-type-names.patch -staging/staging-lindent-sxg.c.patch +staging/staging-add-pcc-acpi-driver.patch +staging/staging-w35und-should-depend-on-usb.patch +staging/staging-sxg-depends-on-x86.patch +staging/staging-document-4k-stack-problem-for-winbond-driver.patch +staging/staging-fix-leak-in-drivers-staging-at76_usb.c.patch +staging/staging-fix-potential-build-error-in-slicoss-driver.patch +staging/staging-balance-parenthesis-in-wlan-ng-headers.patch +staging/staging-fixes-for-me4000-pci-data-collection-driver.patch +staging/staging-slicoss-remove-duplicated-include-s.patch +staging/staging-et131x-remove-duplicated-include-s.patch +staging/staging-wlan-ng-prism2-remove-duplicated-include.patch +staging/staging-wlan-ng-prism2-remove-more-duplicated-include.patch +staging/staging-go7007-remove-unused-include-version.h.patch +staging/staging-slicoss-remove-unused-include-version.h.patch +staging/staging-w35und-remove-some-typedefs.patch +staging/staging-sxg-replace-__function__-with-__func__.patch +staging/staging-echo-a-separate-oslec.h-for-external-interface.patch +staging/staging-echo-export-interface-functions.-add-module-headers.patch +staging/staging-echo-replace-echo_can_state_t-with-struct-echo_can_state.patch +staging/staging-echo-changed-preffix-from-echo_can_-to-oslec_.patch +staging/staging-echo-replace-__blackfin__asm__-with-__bfin__.patch +staging/staging-echo-fix-kmalloc-kfree-uses.patch +staging/staging-echo-remove-dead-code.patch +staging/staging-echo-remove-__cplusplus-macro-magic.patch +staging/staging-echo-remove-annoying-end-of-function-markers.patch +staging/staging-wlan-ng-fix-build-error-if-wireless-networking-is-not-enabled.patch +staging/staging-add-poch-driver.patch +staging/staging-remove-remaining-uses-of-__function__.patch +staging/staging-clean-up-sxg-driver.patch +staging/staging-pcc-acpi-fix-all-checkpatch-errors.patch +staging/staging-slicoss-free-multicast-list-at-driver-exit.patch +staging/staging-lindent-the-echo-driver.patch +staging/staging-sxg-clean-up-c99-comments.patch # can not even compile :( #staging/usb-add-princeton-instruments-usb-camera-driver.patch @@ -251,11 +126,8 @@ staging/staging-lindent-sxg.c.patch #ns/module-usb-serial.patch #ns/modpost - - -#u1.patch - #f.patch - +# need to clean up more usb drivers before this goes in +#usb-remove-err-macro-from-usb.h.patch |