Linus Torvalds
5d4e2d08e7
Driver core pull for 3.5-rc1 ...
Here's the driver core, and other driver subsystems, pull request for
the 3.5-rc1 merge window.
Outside of a few minor driver core changes, we ended up with the
following different subsystem and core changes as well, due to
interdependancies on the driver core:
- hyperv driver updates
- drivers/memory being created and some drivers moved into it
- extcon driver subsystem created out of the old Android staging switch
driver code
- dynamic debug updates
- printk rework, and /dev/kmsg changes
All of this has been tested in the linux-next releases for a few weeks
with no reported problems.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
iEYEABECAAYFAk+7q28ACgkQMUfUDdst+ykXmwCfcPASzC+/bDkuqdWsqzxlWZ7+
VOQAnAriySv397St36J6Hz5bMQZwB1Yq
=SQc+
-----END PGP SIGNATURE-----
Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg Kroah-Hartman:
"Here's the driver core, and other driver subsystems, pull request for
the 3.5-rc1 merge window.
Outside of a few minor driver core changes, we ended up with the
following different subsystem and core changes as well, due to
interdependancies on the driver core:
- hyperv driver updates
- drivers/memory being created and some drivers moved into it
- extcon driver subsystem created out of the old Android staging
switch driver code
- dynamic debug updates
- printk rework, and /dev/kmsg changes
All of this has been tested in the linux-next releases for a few weeks
with no reported problems.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fix up conflicts in drivers/extcon/extcon-max8997.c where git noticed
that a patch to the deleted drivers/misc/max8997-muic.c driver needs to
be applied to this one.
* tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (90 commits)
uio_pdrv_genirq: get irq through platform resource if not set otherwise
memory: tegra{20,30}-mc: Remove empty *_remove()
printk() - isolate KERN_CONT users from ordinary complete lines
sysfs: get rid of some lockdep false positives
Drivers: hv: util: Properly handle version negotiations.
Drivers: hv: Get rid of an unnecessary check in vmbus_prep_negotiate_resp()
memory: tegra{20,30}-mc: Use dev_err_ratelimited()
driver core: Add dev_*_ratelimited() family
Driver Core: don't oops with unregistered driver in driver_find_device()
printk() - restore prefix/timestamp printing for multi-newline strings
printk: add stub for prepend_timestamp()
ARM: tegra30: Make MC optional in Kconfig
ARM: tegra20: Make MC optional in Kconfig
ARM: tegra30: MC: Remove unnecessary BUG*()
ARM: tegra20: MC: Remove unnecessary BUG*()
printk: correctly align __log_buf
ARM: tegra30: Add Tegra Memory Controller(MC) driver
ARM: tegra20: Add Tegra Memory Controller(MC) driver
printk() - restore timestamp printing at console output
printk() - do not merge continuation lines of different threads
...
2012-05-22 16:02:13 -07:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
Update documentation for parameter *notrigger* in einj.txt
2012-03-30 03:30:19 -04:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
arm-soc: device tree conversions, part 1
2012-05-22 09:30:52 -07:00
backlight: new backlight driver for LP855x devices
2012-03-23 16:58:33 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
memcg: fix up documentation on global LRU
2012-04-12 13:12:11 -07:00
cpuidle: add a sysfs entry to disable specific C state for debug purpose.
2012-03-30 01:52:58 -04:00
dm: add verity target
2012-03-28 18:43:38 +01:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-23 23:15:17 -04:00
Pin control subsystem changes for kernel 3.5:
2012-05-21 16:58:23 -07:00
[media] lmedm04 RS2000 Firmware details
2012-03-19 14:55:55 -03:00
drm: allow loading an EDID as firmware to override broken monitor
2012-03-20 10:09:28 +00:00
Documentation/extcon: porting guide for Android kernel switch driver.
2012-04-20 09:24:27 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
2012-05-21 19:21:20 -07:00
hwmon: (k10temp) Add support for AMD Trinity CPUs
2012-04-01 10:25:56 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: input.txt: clarify mousedev 'cat' command syntax
2012-03-30 16:03:15 -07:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: mention scripts/diffconfig tool
2012-03-30 16:03:15 -07:00
driver-core: documentation: fix up Greg's email address
2012-02-15 14:48:01 -08:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
drivers/leds/leds-lp5521.c: support led pattern data
2012-03-23 16:58:34 -07:00
memory: emif: add basic infrastructure for EMIF driver
2012-05-02 00:10:49 -07:00
mmc: core: Fixup delayed work clock gating patch
2012-01-11 23:58:43 -05:00
drivers/net: delete all code/drivers depending on CONFIG_MCA
2012-05-17 16:37:41 -04:00
NFC: Add HCI documentation
2012-04-12 15:10:36 -04:00
Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/regmap' and 'regulator/topic/register' into regulator-next
2012-05-12 11:09:47 +01:00
Documentation/powerpc/mpc52xx.txt: Checkpatch cleanup
2012-03-18 23:59:34 +01:00
Documentation: prctl/seccomp_filter
2012-04-14 11:13:22 +10:00
rcu: Introduce rcutorture testing for rcu_barrier()
2012-04-30 10:48:18 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
sched: Remove sched_switch
2012-01-27 13:28:53 +01:00
[SCSI] megaraid_sas: Version and Changelog update
2012-04-23 19:26:41 +01:00
Smack: allow for significantly longer Smack labels v4
2012-05-14 22:48:38 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
ALSA: hda/realtek - Add a few ALC882 model strings back
2012-04-11 14:10:57 +02:00
spi: create a message queueing infrastructure
2012-03-07 19:19:48 -07:00
net: doc: merge /proc/sys/net/core/* documents into one place
2012-04-27 00:09:26 -04:00
Documentation: Fix typo in tcm_mod_builder.py
2012-02-10 09:52:18 +01:00
thermal: Rename generate_netlink_event
2012-01-23 03:15:25 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
FunctionFS: enable multiple functions
2012-05-14 09:25:44 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
virtio: update documentation to v0.9.5 of spec
2012-05-22 12:16:09 +09:30
mm: move hugepage test examples to tools/testing/selftests/vm
2012-03-28 17:14:37 -07:00
watchdog: Add support for WDIOC_GETTIMELEFT IOCTL in watchdog core
2012-03-27 20:15:37 +02:00
Fix a mistake sentence in the file 'Documentation/zh_CN/magic-number.txt'
2012-05-07 17:20:27 -07:00
crc32: move long comment about crc32 fundamentals to Documentation/
2012-03-23 16:58:37 -07:00
Documentation: common clk API
2012-03-16 20:35:01 +00:00
coccinelle.txt: update documentation to include M= option
2012-01-14 22:25:56 +01:00
Documentation: CodingStyle: add inline assembly guidelines
2012-03-30 16:03:15 -07:00
documentation: remove references to cpu_*_map.
2012-03-29 15:38:31 +10:30
crc32: move long comment about crc32 fundamentals to Documentation/
2012-03-23 16:58:37 -07:00
kmsg - add Documentation/ABI/testing/dev-kmsg
2012-05-08 10:44:25 -07:00
common: DMA-mapping: add NON-CONSISTENT attribute
2012-03-28 16:36:44 +02:00
dma-buf: document fd flags and O_CLOEXEC requirement
2012-03-26 11:33:22 +05:30
Documentation: Fix multiple typo in Documentation
2012-03-07 16:08:24 +01:00
Documentation: remove 'mach' from dontdiff file
2012-03-30 16:03:15 -07:00
dynamic_debug: update Documentation/*, Kconfig.debug
2012-04-30 16:26:30 -04:00
EDAC: Correct scrub rate API
2012-03-19 12:03:58 +01:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
Documentation/gpio.txt: Explain expected pinctrl interaction
2012-03-12 11:27:07 -06:00
docs: update HOWTO for 2.6.x -> 3.x versioning
2012-04-19 19:13:08 -07:00
irq_domain: add documentation and MAINTAINERS entry.
2012-02-14 14:06:47 -07:00
Driver core pull for 3.5-rc1
2012-05-22 16:02:13 -07:00
driver-core: documentation: fix up Greg's email address
2012-02-15 14:48:01 -08:00
watchdog: Update documentation
2012-02-11 15:11:28 +01:00
drivers/net: fix up stale paths from driver reorg
2012-01-30 12:54:40 -05:00
mm: move hugepage test examples to tools/testing/selftests/vm
2012-03-28 17:14:37 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Doc: Update numastat.txt
2012-02-28 16:05:06 +01:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
pinctrl: implement devm_pinctrl_get()/put()
2012-04-18 13:53:13 +02:00
remoteproc: remove the single rpmsg vdev limitation
2012-03-06 19:14:12 +02:00
rpmsg: add virtio-based remote processor messaging bus
2012-02-08 22:53:58 +02:00
stable: update documentation to ask for kernel version
2012-01-24 10:50:22 -08:00
static keys: Add docs better explaining the whole 'struct static_key' mechanism
2012-02-24 09:12:19 +01:00
Documentation: sysrq: Crutcher Dunnavant is unavailable
2012-03-30 16:03:15 -07:00
5d4e2d08e7
