Permalink
Browse files

work updates

  • Loading branch information...
gregkh committed Jun 9, 2011
1 parent 539c475 commit 2910cf84c61f809de7bb55283207e774efe00bef
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
@@ -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
@@ -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
Oops, something went wrong.

0 comments on commit 2910cf8

Please sign in to comment.