Skip to content
Browse files

work updates

  • Loading branch information...
1 parent 539c475 commit 2910cf84c61f809de7bb55283207e774efe00bef @gregkh committed Jun 9, 2011
Showing with 320 additions and 761 deletions.
  1. +5 −6 work/.gitignore
  2. +142 −136 work/driver-2.6.git-patches
  3. +59 −99 work/staging-2.6.git-patches
  4. +17 −487 work/tty-2.6.git-patches
  5. +97 −33 work/usb-2.6.git-patches
View
11 work/.gitignore
@@ -1,9 +1,8 @@
s
s1
s2
-usb-2.6
-tty-2.6
-driver-core-2.6
-staging-2.6
-torvalds-2.6.git
-linux-2.6-allstable
+usb
+tty
+driver-core
+staging
+torvalds
View
278 work/driver-2.6.git-patches
@@ -1,13 +1,12 @@
From: Greg KH <gregkh@suse.de>
To: Linus Torvalds <torvalds@linux-foundation.org>, Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
-Subject: [GIT PATCH] driver core patches for .39
+Subject: [GIT PATCH] driver core merge for .40
-Here's the "big" driver core merge for the .39 tree.
+Here's the "big" driver core merge for the .40 tree.
Not much for the driver core itself, but there is some firmware driver
-work, and a new UIO driver as well. Also some Documentation updates and
-a new translation added.
+work, documentation updates and a new translation added. Nothing major.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/ driver-core-next
@@ -24,148 +23,155 @@ greg k-h
------------
- Documentation/ABI/stable/sysfs-firmware-efi-vars | 75 +++
- Documentation/ABI/testing/sysfs-firmware-dmi | 110 ++++
- Documentation/ABI/testing/sysfs-platform-kim | 48 ++
- Documentation/dynamic-debug-howto.txt | 12 +-
- Documentation/filesystems/sysfs.txt | 16 +-
- Documentation/kref.txt | 2 +-
- Documentation/memory-hotplug.txt | 47 +-
- Documentation/zh_CN/SecurityBugs | 50 ++
- Documentation/zh_CN/SubmitChecklist | 109 ++++
- Documentation/zh_CN/SubmittingPatches | 4 +-
- Documentation/zh_CN/magic-number.txt | 167 ++++++
- arch/powerpc/platforms/pseries/hotplug-memory.c | 66 ++-
- arch/x86/mm/init_64.c | 14 +
- drivers/base/core.c | 34 +-
- drivers/base/firmware_class.c | 7 +-
- drivers/base/memory.c | 197 +++++--
- drivers/base/node.c | 12 +-
- drivers/base/sys.c | 65 ++-
- drivers/firmware/Kconfig | 11 +
- drivers/firmware/Makefile | 1 +
- drivers/firmware/dmi-sysfs.c | 696 ++++++++++++++++++++++
- drivers/firmware/efivars.c | 343 +++++++-----
- drivers/misc/Kconfig | 7 +-
- drivers/misc/pch_phub.c | 69 ++-
- drivers/misc/ti-st/st_core.c | 419 +++++---------
- drivers/misc/ti-st/st_kim.c | 491 ++++++++--------
- drivers/misc/ti-st/st_ll.c | 10 +-
- drivers/uio/Kconfig | 17 +
- drivers/uio/Makefile | 1 +
- drivers/uio/uio_pruss.c | 247 ++++++++
- fs/debugfs/inode.c | 26 +-
- include/linux/dmi.h | 47 ++
- include/linux/dynamic_debug.h | 8 +-
- include/linux/efi.h | 37 ++
- include/linux/firmware.h | 4 +-
- include/linux/kobject.h | 10 +-
- include/linux/memory.h | 3 +-
- include/linux/node.h | 6 +-
- include/linux/platform_data/uio_pruss.h | 25 +
- include/linux/platform_device.h | 11 +-
- include/linux/ti_wilink_st.h | 76 ++-
- init/Kconfig | 4 +-
- kernel/printk.c | 138 ++++-
- lib/dynamic_debug.c | 61 ++-
- 44 files changed, 2890 insertions(+), 913 deletions(-)
- create mode 100644 Documentation/ABI/stable/sysfs-firmware-efi-vars
- create mode 100644 Documentation/ABI/testing/sysfs-firmware-dmi
- create mode 100644 Documentation/ABI/testing/sysfs-platform-kim
- create mode 100644 Documentation/zh_CN/SecurityBugs
- create mode 100644 Documentation/zh_CN/SubmitChecklist
- create mode 100644 Documentation/zh_CN/magic-number.txt
- create mode 100644 drivers/firmware/dmi-sysfs.c
- create mode 100644 drivers/uio/uio_pruss.c
- create mode 100644 include/linux/platform_data/uio_pruss.h
+ Documentation/ABI/testing/sysfs-firmware-dmi | 18 +-
+ Documentation/ABI/testing/sysfs-firmware-gsmi | 58 ++
+ Documentation/ABI/testing/sysfs-firmware-log | 7 +
+ Documentation/ABI/testing/sysfs-kernel-fscaps | 8 +
+ Documentation/DocBook/device-drivers.tmpl | 6 +-
+ Documentation/driver-model/bus.txt | 19 +-
+ Documentation/driver-model/class.txt | 17 +-
+ Documentation/driver-model/device.txt | 91 +---
+ Documentation/driver-model/driver.txt | 18 +-
+ Documentation/ja_JP/HOWTO | 129 ++---
+ Documentation/zh_CN/email-clients.txt | 210 ++++++
+ arch/arm/kernel/traps.c | 1 -
+ arch/powerpc/kernel/traps.c | 1 -
+ arch/sh/kernel/traps_32.c | 1 -
+ arch/unicore32/kernel/traps.c | 1 -
+ arch/x86/include/asm/bios_ebda.h | 28 +-
+ arch/x86/kernel/dumpstack.c | 1 -
+ drivers/base/core.c | 7 +-
+ drivers/base/dd.c | 12 +-
+ drivers/base/memory.c | 29 +-
+ drivers/base/platform.c | 38 +-
+ drivers/char/Kconfig | 2 +-
+ drivers/char/mem.c | 42 +-
+ drivers/char/raw.c | 34 +-
+ drivers/firmware/Kconfig | 2 +
+ drivers/firmware/Makefile | 2 +
+ drivers/firmware/efivars.c | 21 +-
+ drivers/firmware/google/Kconfig | 31 +
+ drivers/firmware/google/Makefile | 3 +
+ drivers/firmware/google/gsmi.c | 940 +++++++++++++++++++++++++
+ drivers/firmware/google/memconsole.c | 166 +++++
+ drivers/misc/ti-st/Kconfig | 2 +-
+ drivers/misc/ti-st/st_core.c | 23 +-
+ drivers/misc/ti-st/st_kim.c | 1 +
+ drivers/uio/uio.c | 16 +-
+ drivers/uio/uio_netx.c | 19 +
+ drivers/uio/uio_pdrv_genirq.c | 4 +
+ fs/debugfs/file.c | 19 +-
+ fs/sysfs/file.c | 12 -
+ fs/sysfs/group.c | 6 +-
+ include/linux/device.h | 164 +++++-
+ include/linux/string.h | 1 +
+ include/linux/sysfs.h | 5 -
+ include/linux/ti_wilink_st.h | 3 +-
+ kernel/ksysfs.c | 10 +
+ kernel/params.c | 14 +-
+ kernel/sys.c | 2 +
+ lib/string.c | 29 +
+ 48 files changed, 1885 insertions(+), 388 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-firmware-gsmi
+ create mode 100644 Documentation/ABI/testing/sysfs-firmware-log
+ create mode 100644 Documentation/ABI/testing/sysfs-kernel-fscaps
+ create mode 100644 Documentation/zh_CN/email-clients.txt
+ create mode 100644 drivers/firmware/google/Kconfig
+ create mode 100644 drivers/firmware/google/Makefile
+ create mode 100644 drivers/firmware/google/gsmi.c
+ create mode 100644 drivers/firmware/google/memconsole.c
---------------
-Amerigo Wang (1):
- debugfs: remove module_exit()
+Andrew Morton (2):
+ kmsg: properly support writev to avoid interleaved printk lines fix
+ drivers/base/memory.c: fix warning due to "memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION"
-Bart Van Assche (4):
- docs/sysfs: Update directory/kobject documentation.
- docs/sysfs: show() methods should use scnprintf().
- kobject: Add missing format attribute specifications
- Dynamic debug: Add more flags
+Anton Blanchard (1):
+ memory hotplug: Speed up add/remove when blocks are larger than PAGES_PER_SECTION
-Bob Liu (1):
- firmware_classs: change val uevent's type to bool
+Dan Carpenter (2):
+ efivars: memory leak on error in create_efivars_bin_attributes()
+ efivars: handle errors from register_efivars()
-Borislav Petkov (2):
- sysdev: Fixup warning message
- sysdev: Do not register with sysdev when erroring on add
+Daniel Trautmann (1):
+ uio_netx: Add support for netPLC cards
-Ferenc Wagner (2):
- driver core: Replace the dangerous to_root_device macro with an inline function
- sysfs: Capitalize description of SYSFS_DEPRECATED{_V2} options
+Felipe Balbi (1):
+ device: add dev_WARN_ONCE
Greg Kroah-Hartman (1):
- dynamic_debug: add #include <linux/sched.h>
+ sysfs: remove "last sysfs file:" line from the oops messages
-Harry Wei (4):
- Translate Documentation/SecurityBugs into Chinese
- Fix a mistake Chinese character in Documentation/zh_CN/SubmittingPatches
- Translat Documentation/SubmittingChecklist into Chinese
- Translate linux-2.6/Documentation/magic-number.txt into Chinese
+Harry Wei (1):
+ Translated Documentation/email-clients.txt
+
+Hillf Danton (2):
+ uio: fix finding mm index for vma
+ uio: fix allocating minor id for uio device
Jan Kara (1):
- debugfs: Fix filesystem reference counting on debugfs_remove() failure
-
-Javi Merino (1):
- kref: Fix typo in kref documentation
-
-Kay Sievers (1):
- printk: do not mangle valid userspace syslog prefixes
-
-Marc Kleine-Budde (1):
- Driver core: convert platform_{get,set}_drvdata to static inline functions
-
-Mike Waychison (13):
- firmware: Add DMI entry types to the headers
- firmware: Basic dmi-sysfs support
- firmware: Break out system_event_log in dmi-sysfs
- firmware: Expose DMI type 15 System Event Log
- firmware: Add documentation for /sys/firmware/dmi
- firmware: Fix unaligned memory accesses in dmi-sysfs
- efivars: move efivars globals into struct efivars
- efivars: Make efivars bin_attributes dynamic
- efivars: parameterize efivars
- efivars: Split out variable registration
- efivars: Parameterize operations.
- efivars: Expose efivars functionality to external drivers.
- efivars: Add Documentation
-
-Nathan Fontenot (5):
- memory hotplug: Allow memory blocks to span multiple memory sections
- memory hotplug: Update phys_index to [start|end]_section_nr
- memory hotplug: Define memory_block_size_bytes for powerpc/pseries
- memory hotplug: Define memory_block_size_bytes for x86_64 with CONFIG_X86_UV
- memory hotplug: sysfs probe routine should add all memory sections
-
-Pavan Savoy (8):
- drivers:misc: ti-st: register with channel IDs
- drivers:misc: ti-st: move from rfkill to sysfs
- drivers:misc: ti-st: fix error codes
- drivers:misc: ti-st: set right debug levels for logs
- drivers:misc: ti-st: firmware download optimization
- drivers:misc: ti-st: fix hci-ll on wake_ind collision
- drivers:misc: ti-st: remove multiple gpio handling
- drivers:misc: ti-st: fix debugging code
-
-Pratheesh Gangadhar (1):
- UIO: add PRUSS UIO driver support
-
-Randy Dunlap (1):
- kobject.h: fix build when CONFIG_HOTPLUG is disabled
-
-Timur Tabi (1):
- driver-core: document restrictions on device_rename()
-
-Tomoya MORINAGA (1):
- pch_phub: add new device ML7213
-
-Xiaochen Wang (1):
- Fix spelling mistakes in Documentation/zh_CN/SubmittingPatches
+ Allow setting of number of raw devices as a module parameter
+
+Jie Zhou (1):
+ uio: clean uioinfo when uninstall uio driver
+
+Jonathan Cameron (3):
+ Add a strtobool function matching semantics of existing in kernel equivalents
+ debugfs: move to new strtobool
+ params.c: Use new strtobool function to process boolean inputs
+
+Karthigan Srinivasan (1):
+ drivers/base/core.c: Fixed brace coding style issue.
+
+Kay Sievers (2):
+ printk: /dev/kmsg - properly support writev() to avoid interleaved printk() lines
+ reboot: disable usermodehelper to prevent fs access
+
+Ludwig Nussel (1):
+ kernel/ksysfs.c: expose file_caps_enabled in sysfs
+
+Mike Waychison (6):
+ firmware: Fix grammar in sysfs-firmware-dmi doc
+ x86: get_bios_ebda_length()
+ x86: Better comments for get_bios_ebda()
+ driver: Google EFI SMI
+ driver: Google Memory Console
+ Introduce CONFIG_GOOGLE_FIRMWARE
+
+Pavan Savoy (2):
+ drivers:misc:ti-st: handle delayed tty receive
+ drivers:misc:ti-st: remove rfkill dependency
+
+Randy Dunlap (2):
+ misc: fix ti-st build issues
+ efivars: prevent oops on unload when efi is not enabled
+
+Robert P. J. Day (2):
+ RAW driver: Remove call to kobject_put().
+ SYSFS: Fix erroneous comments for sysfs_update_group().
+
+Sebastian Ott (1):
+ driver-core: fix race between device_register and driver_register
+
+Stephen Boyd (1):
+ debugfs: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning
+
+Stephen Hemminger (1):
+ drivers: make device_type const
+
+Tsugikazu Shibata (1):
+ HOWTO: sync up Documentaion/ja_JP/HOWTO
+
+Uwe Kleine-König (5):
+ driver core/platform_device_add_data: set platform_data to NULL if !data
+ driver core/platform_device_add_data: free platform data before overwriting
+ driver core/platform_device_add_resources: set resource to NULL if !res
+ driver core/platform_device_add_resources: free resource before overwriting
+ driver core: let dev_set_drvdata return int instead of void as it can fail
+
+Wanlong Gao (3):
+ drivers:base:fix the coding format of memory.c
+ driver core: Add the device driver-model structures to kerneldoc
+ driver core: remove the driver-model structures from the documentation
View
158 work/staging-2.6.git-patches
@@ -1,20 +1,25 @@
From: Greg KH <greg@kroah.com>
To: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org, devel@linuxdriverproject.org
-Subject: [GIT PATCH] STAGING for .39
+Subject: [GIT PATCH] STAGING fixes for 3.0
-Here is a round of bugfixes and a driver removal for your .39-rc tree.
+Here are a number of minor staging driver fixes for your 3.0 tree.
-A number of build fixes (one that has been reported numerous times), and
-other reported bugfixes are in here, as well as we remove a driver that
-was requested to be removed by the author as it will not be needed due
-to the cancelation of the hardware project.
+Nothing major, lots of little things. The non-drivers/staging fix is to
+resolve a problem of a driver outside of the staging tree including a
+staging include file that had accidentally got added to
+include/staging/. That has been fixed, and the driver will be updated
+in 3.1 to do things "correctly" allowing the staging driver to move out
+into the proper media directory.
+
+I've also removed the STAGING_EXCLUDE_BUILD Kconfig option to make it
+easier for people to build the staging tree, as we discussed at LinuxCon
+a few weeks ago. This has already turned up some "interesting" build
+results in the linux-next tree that were previously unknown :)
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging-2.6.git/ staging-linus
-All of these patches have been in the mm and -next trees for a while.
-
These patches will be sent to the linux driver project list for all to
see.
@@ -24,111 +29,66 @@ greg k-h
--------------
- drivers/staging/Kconfig | 2 -
- drivers/staging/Makefile | 1 -
- drivers/staging/brcm80211/brcmsmac/wlc_main.c | 9 +-
- drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 78 +-
- drivers/staging/hv/channel.c | 8 +-
- drivers/staging/hv/connection.c | 4 +-
- drivers/staging/hv/hv_mouse.c | 5 +-
- drivers/staging/hv/netvsc_drv.c | 24 +
- drivers/staging/hv/tools/hv_kvp_daemon.c | 90 ++-
- drivers/staging/hv/vmbus_drv.c | 2 +-
- drivers/staging/hv/vmbus_private.h | 1 +
- drivers/staging/iio/imu/adis16400.h | 3 +-
- drivers/staging/iio/imu/adis16400_core.c | 20 +-
- drivers/staging/iio/imu/adis16400_ring.c | 12 +-
- drivers/staging/memrar/Kconfig | 15 -
- drivers/staging/memrar/Makefile | 2 -
- drivers/staging/memrar/TODO | 43 -
- drivers/staging/memrar/memrar-abi | 89 --
- drivers/staging/memrar/memrar.h | 174 ----
- drivers/staging/memrar/memrar_allocator.c | 432 ---------
- drivers/staging/memrar/memrar_allocator.h | 149 ---
- drivers/staging/memrar/memrar_handler.c | 1007 --------------------
- drivers/staging/olpc_dcon/Kconfig | 2 +-
- drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 1 +
- drivers/staging/rtl8187se/Kconfig | 1 +
- drivers/staging/rtl8192e/Kconfig | 1 +
- drivers/staging/rtl8192u/Kconfig | 1 +
- drivers/staging/rts_pstor/rtsx.c | 14 +-
- drivers/staging/rts_pstor/rtsx_chip.c | 11 +-
- drivers/staging/sep/sep_driver.c | 15 +-
- drivers/staging/sm7xx/smtcfb.c | 6 +-
- drivers/staging/usbip/stub_dev.c | 6 +-
- drivers/staging/usbip/stub_rx.c | 40 +-
- drivers/staging/usbip/stub_tx.c | 74 ++-
- drivers/staging/usbip/usbip_common.c | 64 ++-
- drivers/staging/usbip/usbip_common.h | 2 +
- drivers/staging/usbip/vhci_rx.c | 3 +
- drivers/staging/vt6655/Kconfig | 2 +-
- drivers/staging/vt6656/Kconfig | 2 +-
- .../staging/westbridge/astoria/gadget/cyasgadget.c | 1 +
- 40 files changed, 324 insertions(+), 2092 deletions(-)
- delete mode 100644 drivers/staging/memrar/Kconfig
- delete mode 100644 drivers/staging/memrar/Makefile
- delete mode 100644 drivers/staging/memrar/TODO
- delete mode 100644 drivers/staging/memrar/memrar-abi
- delete mode 100644 drivers/staging/memrar/memrar.h
- delete mode 100644 drivers/staging/memrar/memrar_allocator.c
- delete mode 100644 drivers/staging/memrar/memrar_allocator.h
- delete mode 100644 drivers/staging/memrar/memrar_handler.c
+ drivers/media/video/cx23885/cx23885-cards.c | 2 +-
+ drivers/staging/Kconfig | 18 -----------------
+ drivers/staging/altera-stapl/altera-jtag.c | 2 +-
+ drivers/staging/altera-stapl/altera.c | 2 +-
+ .../staging/altera-stapl}/altera.h | 0
+ drivers/staging/ath6kl/Kconfig | 1 +
+ drivers/staging/ath6kl/os/linux/cfg80211.c | 3 +-
+ drivers/staging/brcm80211/brcmfmac/wl_iw.c | 2 -
+ drivers/staging/gma500/psb_drv.c | 15 +++++++++++++-
+ drivers/staging/gma500/psb_fb.c | 10 +++++++++
+ drivers/staging/gma500/psb_intel_bios.c | 13 ++++++++---
+ drivers/staging/iio/dac/max517.c | 2 +-
+ drivers/staging/iio/imu/adis16400_ring.c | 10 ++++++--
+ drivers/staging/iio/industrialio-trigger.c | 1 +
+ drivers/staging/mei/init.c | 4 +-
+ drivers/staging/olpc_dcon/Kconfig | 1 +
+ drivers/staging/rts_pstor/sd.c | 2 +-
+ drivers/staging/usbip/stub_dev.c | 21 ++++++++++++++++++++
+ drivers/staging/usbip/stub_rx.c | 20 ++++++++++--------
+ 19 files changed, 84 insertions(+), 45 deletions(-)
+ rename {include/staging => drivers/staging/altera-stapl}/altera.h (100%)
---------------
-Alan Cox (1):
- staging: sep: remove last memrar remnants
+Andre Bartke (1):
+ staging: iio: error case memory leak fix
-Arjan Mels (4):
- staging: usbip: fix shutdown problems.
- staging: usbip: bugfixes related to kthread conversion
- staging: usbip: bugfix add number of packets for isochronous frames
- staging: usbip: bugfix for isochronous packets and optimization
+Arjan Mels (1):
+ staging: usbip: bugfix prevent driver unbind
Dan Carpenter (1):
- Staging: westbridge/astoria: unlock on error path
+ Staging: mei: fix debug code
-Dave Jones (1):
- staging: hv: fix reversed memset arguments in hv_mouse
+Greg Kroah-Hartman (3):
+ Staging: altera: move .h file to proper place
+ Staging: remove STAGING_EXCLUDE_BUILD option
+ Staging: cx23885: fix include of altera.h
-Greg Kroah-Hartman (2):
- Staging: vt665?: prevent modules from being built into the kernel.
- staging: memrar: remove driver from tree
+Michael Chang (1):
+ staging: gma500: get control from firmware framebuffer if conflicts
-Haiyang Zhang (1):
- staging: hv: Fix GARP not sent after Quick Migration
+Michael Hennerich (1):
+ staging: iio: industrialio-trigger: set iio_poll_func private_data
-Javier M. Mellid (1):
- staging: sm7xx: fixed defines
+Nicolas Kaiser (1):
+ staging: rts_pstor: use bitwise operator instead of logical one
-Michael Hennerich (6):
- staging: IIO: IMU: ADIS16400: Fix up SPI messages cs_change behavior
- staging: IIO: IMU: ADIS16400: Add delay after self test
- staging: IIO: IMU: ADIS16400: Fix addresses of GYRO and ACCEL calibration offset
- staging: IIO: IMU: ADIS16400: Make sure only enabled scan_elements are pushed into the ring
- staging: IIO: IMU: ADIS16400: Fix product ID check, skip embedded revision number
- staging: IIO: IMU: ADIS16400: Avoid using printk facility directly
-
-Olaf Hering (2):
- staging: hv: use sync_bitops when interacting with the hypervisor
- staging: hv: update dist release parsing in hv_kvp_daemon
+Patrik Jakobsson (1):
+ staging: gma500: Skip bogus LVDS VBT mode and check for LVDS before adding backlight
Randy Dunlap (2):
- staging: fix hv_mouse build, needs delay.h
- staging/rtl81*: build as loadable modules only
-
-Roland Vossen (3):
- staging: brcm80211: fix for 'AC_BE txop..' logs spammed problem
- staging: brcm80211: fix for 'Short CCK' log spam
- staging: brcm80211: removed 'is_amsdu causing toss' log spam
+ staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE
+ staging: fix ath6kl build when CFG80211 is not enabled
-Sascha Silbe (1):
- staging: fix olpc_dcon build errors
+Roland Stigge (1):
+ staging: iio: max517: Fix iio_info changes
-pixo (1):
- staging: ft1000-pcmcia: Fix ft1000_dnld() to work also on 64bit architectures.
+Roland Vossen (1):
+ staging: brcm80211: fix for 'multiple definition of wl_msg_level' build err
-wwang (2):
- staging: rts_pstor: modify initial card clock
- staging: rts_pstor: set lun_mode in a different place
+Vasanthakumar Thiagarajan (1):
+ staging: ath6kl: Fix a kernel panic during suspend/resume
View
504 work/tty-2.6.git-patches
@@ -1,25 +1,18 @@
From: Greg KH <gregkh@suse.de>
To: Linus Torvalds <torvalds@linux-foundation.org>, Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org
-Subject: [GIT PATCH] TTY/serial driver patches for .39
+Subject: [GIT PATCH] TTY/serial driver fixes for .39
-Here's the big tty/serial merge for .39
+Here are some small tty/serial fixes for the .39 tree.
-Lots of file movements, as we are depreciating a number of broken and
-obsolete serial drivers that haven't been used in years by moving them
-to the staging directory. If no one speaks up in the next 6 months they
-will be removed then.
-
-Other than that, nothing major, some new drivers and some tty api
-changes to try to make the api a bit more sane (removing the file handle
-from the ioctl calls). A new tty core ioctl was added to make console
-controller lives easier as well.
+It also includes a parport patch, as it seems relevant to the serial
+drivers (resource conflict) and there's not a parport maintainer tree
+anywhere that I know of.
Please pull from:
- master.kernel.org:/pub/scm/linux/kernel/git/gregkh/tty-2.6.git/ tty-next
+ master.kernel.org:/pub/scm/linux/kernel/git/gregkh/tty-2.6.git/ tty-linus
-All of these patches have been in the -mm and -next trees for a number
-of weeks.
+All of these patches have been in the -mm and -next trees for a while.
Patches will be sent to the linux-serial mailing list, if anyone wants
to see them.
@@ -30,482 +23,19 @@ greg k-h
------------
- Documentation/serial/n_gsm.txt | 89 +
- MAINTAINERS | 16 +-
- arch/alpha/include/asm/ioctls.h | 1 +
- arch/ia64/hp/sim/simserial.c | 3 +-
- arch/m68k/Kconfig | 8 -
- arch/mips/include/asm/ioctls.h | 1 +
- arch/parisc/include/asm/ioctls.h | 1 +
- arch/powerpc/include/asm/ioctls.h | 1 +
- arch/sh/include/asm/ioctls.h | 1 +
- arch/sparc/include/asm/ioctls.h | 1 +
- arch/xtensa/include/asm/ioctls.h | 1 +
- drivers/bluetooth/hci_ath.c | 26 +-
- drivers/char/Kconfig | 540 +------
- drivers/char/Makefile | 24 -
- drivers/char/pcmcia/Makefile | 2 -
- drivers/char/pcmcia/synclink_cs.c | 13 +-
- drivers/char/ttyprintk.c | 2 +-
- drivers/isdn/capi/capi.c | 10 +-
- drivers/isdn/gigaset/interface.c | 12 +-
- drivers/isdn/gigaset/ser-gigaset.c | 2 +-
- drivers/isdn/i4l/isdn_tty.c | 7 +-
- drivers/misc/Kconfig | 7 +-
- drivers/misc/pch_phub.c | 85 +-
- drivers/mmc/card/sdio_uart.c | 4 +-
- drivers/net/irda/irtty-sir.c | 2 +-
- drivers/net/usb/hso.c | 10 +-
- drivers/net/wan/pc300_tty.c | 9 +-
- drivers/s390/char/keyboard.c | 4 +-
- drivers/s390/char/keyboard.h | 2 +-
- drivers/s390/char/tty3270.c | 14 +-
- drivers/staging/Kconfig | 4 +
- drivers/staging/Makefile | 2 +
- drivers/staging/generic_serial/Kconfig | 45 +
- drivers/staging/generic_serial/Makefile | 6 +
- drivers/staging/generic_serial/TODO | 6 +
- .../generic_serial}/generic_serial.c | 4 +-
- .../{char => staging/generic_serial}/rio/Makefile | 0
- .../{char => staging/generic_serial}/rio/board.h | 0
- .../{char => staging/generic_serial}/rio/cirrus.h | 0
- .../{char => staging/generic_serial}/rio/cmdblk.h | 0
- .../{char => staging/generic_serial}/rio/cmdpkt.h | 0
- .../{char => staging/generic_serial}/rio/daemon.h | 0
- .../{char => staging/generic_serial}/rio/errors.h | 0
- .../{char => staging/generic_serial}/rio/func.h | 0
- .../{char => staging/generic_serial}/rio/host.h | 0
- .../{char => staging/generic_serial}/rio/link.h | 0
- .../generic_serial}/rio/linux_compat.h | 0
- drivers/{char => staging/generic_serial}/rio/map.h | 0
- .../{char => staging/generic_serial}/rio/param.h | 0
- .../{char => staging/generic_serial}/rio/parmmap.h | 0
- drivers/{char => staging/generic_serial}/rio/pci.h | 0
- drivers/{char => staging/generic_serial}/rio/phb.h | 0
- drivers/{char => staging/generic_serial}/rio/pkt.h | 0
- .../{char => staging/generic_serial}/rio/port.h | 0
- .../{char => staging/generic_serial}/rio/protsts.h | 0
- drivers/{char => staging/generic_serial}/rio/rio.h | 0
- .../generic_serial}/rio/rio_linux.c | 0
- .../generic_serial}/rio/rio_linux.h | 0
- .../generic_serial}/rio/rioboard.h | 0
- .../{char => staging/generic_serial}/rio/rioboot.c | 0
- .../{char => staging/generic_serial}/rio/riocmd.c | 0
- .../{char => staging/generic_serial}/rio/rioctrl.c | 0
- .../{char => staging/generic_serial}/rio/riodrvr.h | 0
- .../{char => staging/generic_serial}/rio/rioinfo.h | 0
- .../{char => staging/generic_serial}/rio/rioinit.c | 0
- .../{char => staging/generic_serial}/rio/riointr.c | 0
- .../generic_serial}/rio/rioioctl.h | 0
- .../generic_serial}/rio/rioparam.c | 0
- .../generic_serial}/rio/rioroute.c | 0
- .../generic_serial}/rio/riospace.h | 0
- .../generic_serial}/rio/riotable.c | 0
- .../{char => staging/generic_serial}/rio/riotty.c | 0
- .../{char => staging/generic_serial}/rio/route.h | 0
- drivers/{char => staging/generic_serial}/rio/rup.h | 0
- .../{char => staging/generic_serial}/rio/unixrup.h | 0
- .../{char => staging/generic_serial}/ser_a2232.c | 6 +-
- .../{char => staging/generic_serial}/ser_a2232.h | 0
- .../generic_serial}/ser_a2232fw.ax | 0
- .../{char => staging/generic_serial}/ser_a2232fw.h | 0
- drivers/{char => staging/generic_serial}/sx.c | 8 +-
- drivers/{char => staging/generic_serial}/sx.h | 0
- .../{char => staging/generic_serial}/sxboards.h | 0
- .../{char => staging/generic_serial}/sxwindow.h | 0
- drivers/{char => staging/generic_serial}/vme_scc.c | 4 +-
- drivers/staging/quatech_usb2/quatech_usb2.c | 6 +-
- drivers/staging/serqt_usb2/serqt_usb2.c | 13 +-
- drivers/staging/tty/Kconfig | 87 +
- drivers/staging/tty/Makefile | 7 +
- drivers/staging/tty/TODO | 6 +
- drivers/{char => staging/tty}/cd1865.h | 0
- drivers/{char => staging/tty}/digi1.h | 0
- drivers/{char => staging/tty}/digiFep1.h | 0
- drivers/{char => staging/tty}/digiPCI.h | 0
- drivers/{char => staging/tty}/epca.c | 16 +-
- drivers/{char => staging/tty}/epca.h | 0
- drivers/{char => staging/tty}/epcaconfig.h | 0
- drivers/{char => staging/tty}/ip2/Makefile | 0
- drivers/{char => staging/tty}/ip2/i2cmd.c | 0
- drivers/{char => staging/tty}/ip2/i2cmd.h | 0
- drivers/{char => staging/tty}/ip2/i2ellis.c | 0
- drivers/{char => staging/tty}/ip2/i2ellis.h | 0
- drivers/{char => staging/tty}/ip2/i2hw.h | 0
- drivers/{char => staging/tty}/ip2/i2lib.c | 0
- drivers/{char => staging/tty}/ip2/i2lib.h | 0
- drivers/{char => staging/tty}/ip2/i2pack.h | 0
- drivers/{char => staging/tty}/ip2/ip2.h | 0
- drivers/{char => staging/tty}/ip2/ip2ioctl.h | 0
- drivers/{char => staging/tty}/ip2/ip2main.c | 12 +-
- drivers/{char => staging/tty}/ip2/ip2trace.h | 0
- drivers/{char => staging/tty}/ip2/ip2types.h | 0
- drivers/{char => staging/tty}/istallion.c | 8 +-
- drivers/{char => staging/tty}/riscom8.c | 8 +-
- drivers/{char => staging/tty}/riscom8.h | 0
- drivers/{char => staging/tty}/riscom8_reg.h | 0
- drivers/{char => staging/tty}/serial167.c | 7 +-
- drivers/{char => staging/tty}/specialix.c | 6 +-
- drivers/{char => staging/tty}/specialix_io8.h | 0
- drivers/{char => staging/tty}/stallion.c | 9 +-
- drivers/tty/Kconfig | 321 ++++
- drivers/tty/Makefile | 15 +
- drivers/{char => tty}/amiserial.c | 8 +-
- drivers/{char => tty}/bfin_jtag_comm.c | 0
- drivers/{char => tty}/cyclades.c | 6 +-
- drivers/tty/hvc/Kconfig | 105 ++
- drivers/tty/hvc/Makefile | 1 +
- drivers/tty/hvc/hvc_bfin_jtag.c | 105 ++
- drivers/tty/hvc/hvc_dcc.c | 43 +-
- drivers/tty/hvc/hvsi.c | 6 +-
- drivers/{char/pcmcia => tty}/ipwireless/Makefile | 0
- drivers/{char/pcmcia => tty}/ipwireless/hardware.c | 0
- drivers/{char/pcmcia => tty}/ipwireless/hardware.h | 0
- drivers/{char/pcmcia => tty}/ipwireless/main.c | 0
- drivers/{char/pcmcia => tty}/ipwireless/main.h | 0
- drivers/{char/pcmcia => tty}/ipwireless/network.c | 0
- drivers/{char/pcmcia => tty}/ipwireless/network.h | 0
- .../pcmcia => tty}/ipwireless/setup_protocol.h | 0
- drivers/{char/pcmcia => tty}/ipwireless/tty.c | 8 +-
- drivers/{char/pcmcia => tty}/ipwireless/tty.h | 0
- drivers/{char => tty}/isicom.c | 8 +-
- drivers/{char => tty}/moxa.c | 10 +-
- drivers/{char => tty}/moxa.h | 0
- drivers/{char => tty}/mxser.c | 6 +-
- drivers/{char => tty}/mxser.h | 0
- drivers/tty/n_gsm.c | 9 +-
- drivers/{char => tty}/nozomi.c | 10 +-
- drivers/tty/pty.c | 4 +-
- drivers/{char => tty}/rocket.c | 8 +-
- drivers/{char => tty}/rocket.h | 0
- drivers/{char => tty}/rocket_int.h | 0
- drivers/tty/serial/68328serial.c | 25 +-
- drivers/tty/serial/68328serial.h | 1 -
- drivers/tty/serial/68360serial.c | 6 +-
- drivers/tty/serial/8250.c | 33 +-
- drivers/tty/serial/Kconfig | 31 +-
- drivers/tty/serial/Makefile | 2 +
- drivers/tty/serial/altera_jtaguart.c | 85 +-
- drivers/tty/serial/altera_uart.c | 22 +-
- drivers/tty/serial/atmel_serial.c | 16 +
- drivers/tty/serial/bfin_sport_uart.c | 2 +-
- drivers/tty/serial/crisv10.c | 7 +-
- drivers/tty/serial/ifx6x60.c | 68 +-
- drivers/tty/serial/ifx6x60.h | 6 +-
- drivers/tty/serial/mfd.c | 73 +-
- drivers/tty/serial/mrst_max3110.c | 2 +-
- drivers/tty/serial/msm_serial_hs.c | 1880 ++++++++++++++++++++
- drivers/tty/serial/msm_smd_tty.c | 236 +++
- drivers/tty/serial/of_serial.c | 18 +-
- drivers/tty/serial/omap-serial.c | 11 +-
- drivers/tty/serial/pch_uart.c | 329 +++-
- drivers/tty/serial/serial_core.c | 22 +-
- drivers/{char => tty}/synclink.c | 13 +-
- drivers/{char => tty}/synclink_gt.c | 19 +-
- drivers/{char => tty}/synclinkmp.c | 17 +-
- drivers/tty/tty_audit.c | 4 +-
- drivers/tty/tty_io.c | 22 +-
- drivers/tty/tty_ioctl.c | 14 +-
- drivers/tty/tty_ldisc.c | 17 +-
- drivers/tty/vt/keyboard.c | 5 +-
- drivers/tty/vt/vc_screen.c | 110 +-
- drivers/tty/vt/vt.c | 27 +-
- drivers/tty/vt/vt_ioctl.c | 12 +-
- drivers/usb/class/cdc-acm.c | 6 +-
- drivers/usb/serial/ark3116.c | 6 +-
- drivers/usb/serial/belkin_sa.c | 8 +-
- drivers/usb/serial/ch341.c | 7 +-
- drivers/usb/serial/cp210x.c | 19 +-
- drivers/usb/serial/cypress_m8.c | 12 +-
- drivers/usb/serial/digi_acceleport.c | 14 +-
- drivers/usb/serial/ftdi_sio.c | 12 +-
- drivers/usb/serial/io_edgeport.c | 12 +-
- drivers/usb/serial/io_ti.c | 6 +-
- drivers/usb/serial/iuu_phoenix.c | 4 +-
- drivers/usb/serial/keyspan.c | 4 +-
- drivers/usb/serial/keyspan.h | 5 +-
- drivers/usb/serial/keyspan_pda.c | 4 +-
- drivers/usb/serial/kl5kusb105.c | 8 +-
- drivers/usb/serial/kobil_sct.c | 12 +-
- drivers/usb/serial/mct_u232.c | 8 +-
- drivers/usb/serial/mos7720.c | 8 +-
- drivers/usb/serial/mos7840.c | 6 +-
- drivers/usb/serial/opticon.c | 4 +-
- drivers/usb/serial/oti6858.c | 12 +-
- drivers/usb/serial/pl2303.c | 6 +-
- drivers/usb/serial/sierra.c | 4 +-
- drivers/usb/serial/spcp8x5.c | 6 +-
- drivers/usb/serial/ssu100.c | 6 +-
- drivers/usb/serial/ti_usb_3410_5052.c | 14 +-
- drivers/usb/serial/usb-serial.c | 12 +-
- drivers/usb/serial/usb-wwan.h | 6 +-
- drivers/usb/serial/usb_wwan.c | 6 +-
- drivers/usb/serial/whiteheat.c | 12 +-
- include/asm-generic/ioctls.h | 1 +
- include/linux/kbd_kern.h | 3 +-
- include/linux/kd.h | 1 +
- include/linux/platform_data/msm_serial_hs.h | 49 +
- include/linux/spi/ifx_modem.h | 19 +-
- include/linux/tty.h | 5 +-
- include/linux/tty_driver.h | 13 +-
- include/linux/usb/serial.h | 6 +-
- include/linux/vt_kern.h | 8 -
- include/net/irda/ircomm_tty.h | 6 +-
- net/bluetooth/rfcomm/tty.c | 6 +-
- net/irda/ircomm/ircomm_tty_ioctl.c | 12 +-
- 223 files changed, 3974 insertions(+), 1380 deletions(-)
- create mode 100644 Documentation/serial/n_gsm.txt
- create mode 100644 drivers/staging/generic_serial/Kconfig
- create mode 100644 drivers/staging/generic_serial/Makefile
- create mode 100644 drivers/staging/generic_serial/TODO
- rename drivers/{char => staging/generic_serial}/generic_serial.c (99%)
- rename drivers/{char => staging/generic_serial}/rio/Makefile (100%)
- rename drivers/{char => staging/generic_serial}/rio/board.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/cirrus.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/cmdblk.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/cmdpkt.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/daemon.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/errors.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/func.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/host.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/link.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/linux_compat.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/map.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/param.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/parmmap.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/pci.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/phb.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/pkt.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/port.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/protsts.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/rio.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/rio_linux.c (100%)
- rename drivers/{char => staging/generic_serial}/rio/rio_linux.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/rioboard.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/rioboot.c (100%)
- rename drivers/{char => staging/generic_serial}/rio/riocmd.c (100%)
- rename drivers/{char => staging/generic_serial}/rio/rioctrl.c (100%)
- rename drivers/{char => staging/generic_serial}/rio/riodrvr.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/rioinfo.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/rioinit.c (100%)
- rename drivers/{char => staging/generic_serial}/rio/riointr.c (100%)
- rename drivers/{char => staging/generic_serial}/rio/rioioctl.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/rioparam.c (100%)
- rename drivers/{char => staging/generic_serial}/rio/rioroute.c (100%)
- rename drivers/{char => staging/generic_serial}/rio/riospace.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/riotable.c (100%)
- rename drivers/{char => staging/generic_serial}/rio/riotty.c (100%)
- rename drivers/{char => staging/generic_serial}/rio/route.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/rup.h (100%)
- rename drivers/{char => staging/generic_serial}/rio/unixrup.h (100%)
- rename drivers/{char => staging/generic_serial}/ser_a2232.c (99%)
- rename drivers/{char => staging/generic_serial}/ser_a2232.h (100%)
- rename drivers/{char => staging/generic_serial}/ser_a2232fw.ax (100%)
- rename drivers/{char => staging/generic_serial}/ser_a2232fw.h (100%)
- rename drivers/{char => staging/generic_serial}/sx.c (99%)
- rename drivers/{char => staging/generic_serial}/sx.h (100%)
- rename drivers/{char => staging/generic_serial}/sxboards.h (100%)
- rename drivers/{char => staging/generic_serial}/sxwindow.h (100%)
- rename drivers/{char => staging/generic_serial}/vme_scc.c (99%)
- create mode 100644 drivers/staging/tty/Kconfig
- create mode 100644 drivers/staging/tty/Makefile
- create mode 100644 drivers/staging/tty/TODO
- rename drivers/{char => staging/tty}/cd1865.h (100%)
- rename drivers/{char => staging/tty}/digi1.h (100%)
- rename drivers/{char => staging/tty}/digiFep1.h (100%)
- rename drivers/{char => staging/tty}/digiPCI.h (100%)
- rename drivers/{char => staging/tty}/epca.c (99%)
- rename drivers/{char => staging/tty}/epca.h (100%)
- rename drivers/{char => staging/tty}/epcaconfig.h (100%)
- rename drivers/{char => staging/tty}/ip2/Makefile (100%)
- rename drivers/{char => staging/tty}/ip2/i2cmd.c (100%)
- rename drivers/{char => staging/tty}/ip2/i2cmd.h (100%)
- rename drivers/{char => staging/tty}/ip2/i2ellis.c (100%)
- rename drivers/{char => staging/tty}/ip2/i2ellis.h (100%)
- rename drivers/{char => staging/tty}/ip2/i2hw.h (100%)
- rename drivers/{char => staging/tty}/ip2/i2lib.c (100%)
- rename drivers/{char => staging/tty}/ip2/i2lib.h (100%)
- rename drivers/{char => staging/tty}/ip2/i2pack.h (100%)
- rename drivers/{char => staging/tty}/ip2/ip2.h (100%)
- rename drivers/{char => staging/tty}/ip2/ip2ioctl.h (100%)
- rename drivers/{char => staging/tty}/ip2/ip2main.c (99%)
- rename drivers/{char => staging/tty}/ip2/ip2trace.h (100%)
- rename drivers/{char => staging/tty}/ip2/ip2types.h (100%)
- rename drivers/{char => staging/tty}/istallion.c (99%)
- rename drivers/{char => staging/tty}/riscom8.c (99%)
- rename drivers/{char => staging/tty}/riscom8.h (100%)
- rename drivers/{char => staging/tty}/riscom8_reg.h (100%)
- rename drivers/{char => staging/tty}/serial167.c (99%)
- rename drivers/{char => staging/tty}/specialix.c (99%)
- rename drivers/{char => staging/tty}/specialix_io8.h (100%)
- rename drivers/{char => staging/tty}/stallion.c (99%)
- create mode 100644 drivers/tty/Kconfig
- rename drivers/{char => tty}/amiserial.c (99%)
- rename drivers/{char => tty}/bfin_jtag_comm.c (100%)
- rename drivers/{char => tty}/cyclades.c (99%)
- create mode 100644 drivers/tty/hvc/Kconfig
- create mode 100644 drivers/tty/hvc/hvc_bfin_jtag.c
- rename drivers/{char/pcmcia => tty}/ipwireless/Makefile (100%)
- rename drivers/{char/pcmcia => tty}/ipwireless/hardware.c (100%)
- rename drivers/{char/pcmcia => tty}/ipwireless/hardware.h (100%)
- rename drivers/{char/pcmcia => tty}/ipwireless/main.c (100%)
- rename drivers/{char/pcmcia => tty}/ipwireless/main.h (100%)
- rename drivers/{char/pcmcia => tty}/ipwireless/network.c (100%)
- rename drivers/{char/pcmcia => tty}/ipwireless/network.h (100%)
- rename drivers/{char/pcmcia => tty}/ipwireless/setup_protocol.h (100%)
- rename drivers/{char/pcmcia => tty}/ipwireless/tty.c (98%)
- rename drivers/{char/pcmcia => tty}/ipwireless/tty.h (100%)
- rename drivers/{char => tty}/isicom.c (99%)
- rename drivers/{char => tty}/moxa.c (99%)
- rename drivers/{char => tty}/moxa.h (100%)
- rename drivers/{char => tty}/mxser.c (99%)
- rename drivers/{char => tty}/mxser.h (100%)
- rename drivers/{char => tty}/nozomi.c (99%)
- rename drivers/{char => tty}/rocket.c (99%)
- rename drivers/{char => tty}/rocket.h (100%)
- rename drivers/{char => tty}/rocket_int.h (100%)
- create mode 100644 drivers/tty/serial/msm_serial_hs.c
- create mode 100644 drivers/tty/serial/msm_smd_tty.c
- rename drivers/{char => tty}/synclink.c (99%)
- rename drivers/{char => tty}/synclink_gt.c (99%)
- rename drivers/{char => tty}/synclinkmp.c (99%)
- create mode 100644 include/linux/platform_data/msm_serial_hs.h
+ drivers/parport/parport_pc.c | 8 +++-----
+ drivers/tty/n_gsm.c | 8 ++++++--
+ drivers/tty/serial/imx.c | 3 ++-
+ 3 files changed, 11 insertions(+), 8 deletions(-)
---------------
-Alan Cox (6):
- tiocmget: kill off the passing of the struct file
- tiocmset: kill the file pointer argument
- tty: remove filp from the USB tty ioctls
- tty: now phase out the ioctl file pointer for good
- tty: add a helper for setting termios data from kernel side
- hci_ath: Fix the mess in this driver
-
-Arnd Bergmann (1):
- tty: move cd1865.h to drivers/staging/tty/
-
-Arthur Taylor (1):
- vt: Add virtual console keyboard mode OFF
-
-Axel Lin (1):
- pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
-
-Dan Carpenter (2):
- serial: mrst_max3110: make buffer larger
- Staging: generic_serial: fix double locking bug
-
-Denis Turischev (1):
- pch_uart: reference clock on CM-iTC
-
-Eric Bénard (2):
- n_gsm: add a documentation
- n_gsm: fix UIH control byte : P bit should be 0
-
-Feng Tang (3):
- serial: mfd: remove the timeout workaround for A0
- serial: mfd: remove the TX full-empty interrupts workaround
- serial: mfd: add a module parameter for setting each port's working mode
-
-Grant Likely (1):
- tty/serial: Relax the device_type restriction from of_serial
-
-Greg Kroah-Hartman (8):
- tty: fix build error in vt_ioctl.c if CONFIG_COMPAT is enabled
- tty: move Kconfig entries into drivers/tty from drivers/char
- tty: move a number of tty drivers from drivers/char/ to drivers/tty/
- tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/
- tty: move obsolete and broken tty drivers to drivers/staging/tty/
- tty: move obsolete and broken generic_serial drivers to drivers/staging/generic_serial/
- tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
- Staging: tty: fix build with epca.c driver
-
-Heiko Carstens (1):
- tty: phase out of ioctl file pointer for tty3270 as well
-
-Jarkko Nikula (1):
- serial: omap-serial: Enable the UART wake-up bits always
-
-Jiri Olsa (3):
- tty,vcs: lseek/VC-release race fix
- tty,vcs removing con_buf/conf_buf_mtx
- tty,vt: fix VT_SETACTIVATE console switch
-
-Joe Perches (1):
- MAINTAINERS: Update HVC file patterns
-
-Kay Sievers (1):
- tty: add TIOCVHANGUP to allow clean tty shutdown of all ttys
-
-Mandeep Singh Baines (1):
- TTY: use appropriate printk priority level
-
-Mayank Rana (1):
- serial: msm_serial_hs: Add MSM high speed UART driver
-
-Mike Frysinger (1):
- hvc: add Blackfin JTAG console support
-
-Niranjana Vishwanathapura (1):
- tty: Add msm_smd_tty driver
-
-Russ Gorby (7):
- serial: ifx6x60: expanded info available from platform data
- serial: ifx6x60: fixed call to tty_port_init
- serial: ifx6x60: dma_alloc_coherent must use parent dev
- serial: ifx6x60: changed internal bpw from boolean to int
- serial: ifx6x60: set SPI max_speed_hz based on platform type
- serial: ifx6x60: probe routine needs to call spi_setup
- serial: ifx6x60: minor cleanup
-
-Stephen Boyd (3):
- hvc_dcc: Fix bad code generation by marking assembly volatile
- hvc_dcc: Simplify put_chars()/get_chars() loops
- hvc_dcc: Simplify assembly for v6 and v7 ARM
-
-Tejun Heo (3):
- tty_ldisc: don't use flush_scheduled_work()
- 68328serial: remove unsed m68k_serial->tqueue_hangup
- nozomi: don't use flush_scheduled_work()
-
-Thomas Weber (1):
- OMAP: Enable Magic SysRq on serial console ttyOx
-
-Tobias Klauser (7):
- tty: serial: altera_uart: Handle pdev->id == -1 in altera_uart_remove
- tty: serial: altera_uart: Use port->regshift to store bus shift
- MAINTAINERS: Add myself as a maintainer for altera_uart/altera_jtaguart
- tty: serial: altera_jtaguart: Don't use plain integer as NULL pointer
- tty: serial: altera_jtaguart: Remove unused function early_altera_jtaguart_setup
- tty: serial: altera_jtaguart: Support getting mapbase and IRQ from resources
- tty: serial: altera_jtaguart: Fixup type usage of port flags
-
-Tomoya MORINAGA (11):
- serial: pch_uart: support new device ML7213
- serial: pch_uart: revert Kconfig for non-DMA mode
- pch_uart: add multi-scatter processing
- pch_uart: add spin_lock_init
- pch_uart : Reduce memcpy
- pch_uart : Use dev_xxx not pr_xxx
- pch_uart: fix uart clock setting issue
- pch_uart: fix auto flow control miss-setting issue
- pch_uart: fix exclusive access issue
- pch_uart: Fix DMA channel miss-setting issue.
- pch_phub: add new device ML7213
-
-Tony Luck (1):
- tty: simserial: now phase out the ioctl file pointer for good
-
-Vasiliy Kulikov (1):
- tty: serial: bfin_sport_uart: fix signedness error
-
-Viktar Palstsiuk (1):
- atmel_serial: enable PPS support
+Mikhail Kshevetskiy (1):
+ tty/n_gsm: fix bug in CRC calculation for gsm1 mode
-Xiaotian Feng (1):
- tty_audit: fix tty_audit_add_data live lock on audit disabled
+Niels de Vos (1):
+ parport_pc.c: correctly release the requested region for the IT887x
-Yin Kangkai (3):
- serial-core: reset the console speed on resume
- serial: also set the uartclk value in resume after goes to highspeed
- serial: change the divisor latch only when prescalar actually changed
+Uwe Kleine-König (1):
+ serial/imx: read cts state only after acking cts change irq
View
130 work/usb-2.6.git-patches
@@ -1,14 +1,18 @@
From: Greg KH <gregkh@suse.de>
To: Linus Torvalds <torvalds@linux-foundation.org>, Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org
-Subject: [GIT PATCH] USB fixes for .39
+Subject: [GIT PATCH] USB fixes for 3.0
-Here's some small fixes for the USB tree for things that people have
-reported during the .39-rc1 merge window.
+Here's some small fixes for your 3.0 tree.
+
+Nothing major, just some small fixes for things that have been reported,
+and lots of new device ids added to drivers.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/ usb-linus
+All of these have been in the linux-next tree for a while.
+
The full patches will be sent to the linux-usb mailing list, if anyone
wants to see them.
@@ -18,45 +22,105 @@ greg k-h
------------
- drivers/usb/class/cdc-acm.c | 7 ++++++-
- drivers/usb/class/cdc-wdm.c | 2 +-
- drivers/usb/core/devio.c | 2 +-
- drivers/usb/host/ehci-q.c | 12 ------------
- drivers/usb/misc/uss720.c | 7 +++----
- drivers/usb/musb/blackfin.c | 6 +++---
- drivers/usb/musb/musb_gadget.c | 8 ++++----
- drivers/usb/serial/usb_wwan.c | 3 +--
- 8 files changed, 19 insertions(+), 28 deletions(-)
+ Documentation/kernel-parameters.txt | 2 +
+ MAINTAINERS | 4 ++-
+ drivers/usb/class/cdc-acm.c | 2 +
+ drivers/usb/core/hub.c | 6 +++-
+ drivers/usb/gadget/Kconfig | 5 +---
+ drivers/usb/gadget/amd5536udc.c | 1 +
+ drivers/usb/gadget/at91_udc.c | 1 +
+ drivers/usb/gadget/dummy_hcd.c | 1 +
+ drivers/usb/gadget/inode.c | 4 ++-
+ drivers/usb/gadget/mv_udc_core.c | 8 +++---
+ drivers/usb/gadget/net2280.c | 1 +
+ drivers/usb/gadget/pxa25x_udc.c | 5 +--
+ drivers/usb/gadget/s3c-hsotg.c | 22 +++++++++++---------
+ drivers/usb/gadget/s3c-hsudc.c | 7 ++++-
+ drivers/usb/gadget/s3c2410_udc.c | 1 +
+ drivers/usb/host/ohci-pxa27x.c | 7 ++++-
+ drivers/usb/host/xhci-dbg.c | 8 +++---
+ drivers/usb/host/xhci-mem.c | 14 +++++++++++-
+ drivers/usb/host/xhci-pci.c | 14 +++++++++++-
+ drivers/usb/host/xhci-ring.c | 2 +-
+ drivers/usb/host/xhci.c | 18 +++++++++++++++-
+ drivers/usb/host/xhci.h | 6 +++++
+ drivers/usb/musb/musb_core.c | 1 +
+ drivers/usb/renesas_usbhs/mod_gadget.c | 1 +
+ drivers/usb/serial/ftdi_sio.c | 1 +
+ drivers/usb/serial/ftdi_sio_ids.h | 1 +
+ drivers/usb/serial/option.c | 34 ++++++++++++++++++++++++-------
+ drivers/usb/storage/transport.c | 29 +++++++++++++++++++++++++++
+ drivers/usb/storage/unusual_devs.h | 19 +++++++++++++++++
+ drivers/usb/storage/usb.c | 13 +++++++++++-
+ drivers/usb/storage/usb.h | 2 +
+ include/linux/usb_usual.h | 4 ++-
+ 32 files changed, 194 insertions(+), 50 deletions(-)
---------------
-Alan Stern (1):
- ehci-hcd: Bug fix: don't set a QH's Halt bit
+Alan Stern (3):
+ usb-storage: redo incorrect reads
+ USB: dummy-hcd needs the has_tt flag
+ USB: CONFIG_USB_GADGET_DUALSPEED is not user-configurable
+
+Alexey Khoroshilov (1):
+ usb-gadget: unlock data->lock mutex on error path in ep_write()
+
+Bryan Wu (1):
+ usb: gadget: include <linux/prefetch.h> to fix compiling error
+
+Dan Williams (3):
+ option: add Zoom 4597 modem USB IDs
+ option: add Alcatel X200 to sendsetup blacklist
+ option: add Prolink PH300 modem IDs
+
+Dmitry Torokhov (1):
+ USB: xhci - fix interval calculation for FS isoc endpoints
+
+Felipe Balbi (1):
+ MAINTAINERS: add a maintainer to Gadget Framework
+
+Greg Kroah-Hartman (1):
+ Revert "USB: option: add ID for ZTE MF 330"
+
+Julia Lawall (1):
+ drivers/usb/host/ohci-pxa27x.c: add missing clk_put
+
+Libor Pechacek (1):
+ USB: core: Tolerate protocol stall during hub and port status read
+
+Maarten Lankhorst (2):
+ xhci: Add defines for hardcoded slot states
+ xhci: Do not issue device reset when device is not setup
+
+Mark Brown (1):
+ USB: s3c-hsotg: Tone down debugging
-Bob Liu (1):
- usb: musb: blackfin: fix typo in new dev_pm_ops struct
+Matt Evans (2):
+ xhci: Bigendian fix for skip_isoc_td()
+ xhci: Bigendian fix for xhci_check_bandwidth()
-Hema HK (1):
- usb: musb: Fix for merge issue
+Mike Frysinger (1):
+ musb: fix prefetch build failure
-Johan Hovold (3):
- USB: cdc-acm: fix memory corruption / panic
- USB: cdc-acm: fix potential null-pointer dereference
- USB: cdc-acm: fix potential null-pointer dereference on disconnect
+Sage Weil (1):
+ usb: remove bad dput after dentry_unhash
-Michal Sojka (1):
- USB: Do not pass negative length to snoop_urb()
+Sarah Sharp (1):
+ xhci: Disable MSI for some Fresco Logic hosts.
-Mike Frysinger (2):
- usb: musb: blackfin: fix typo in platform driver name
- usb: musb: blackfin: fix typo in new bfin_musb_vbus_status func
+Sebastian Andrzej Siewior (4):
+ usb/mv_udc_core: fix compile
+ usb/pxa25x_udc: cleanup the LUBBOCK err path
+ usb/s3c-hsudc: fix error path
+ usb/renesas_usbhs: free uep on removal
-Oliver Neukum (1):
- usb: wwan: fix compilation without CONFIG_PM_RUNTIME
+Steffen Sledz (1):
+ USB: serial: add another 4N-GALAXY.DE PID to ftdi_sio driver
-Peter Holik (1):
- USB: uss720 fixup refcount position
+Toby Gray (1):
+ USB: cdc-acm: Adding second ACM channel support for Nokia E7 and C7
-Robert Lukassen (1):
- USB: Fix 'bad dma' problem on WDM device disconnect
+Torsten Hilbrich (1):
+ USB: option Add blacklist for ZTE K3765-Z (19d2:2002)

0 comments on commit 2910cf8

Please sign in to comment.
Something went wrong with that request. Please try again.