Commit 5d4e2d08e7fdf7339f84a1c670d296a77e02f881
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
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 ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
Showing 80 changed files Side-by-side Diff
- Documentation/ABI/testing/dev-kmsg
- Documentation/ABI/testing/sysfs-class-extcon
- Documentation/HOWTO
- Documentation/devices.txt
- Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt
- Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt
- Documentation/dynamic-debug-howto.txt
- Documentation/extcon/porting-android-switch-class
- Documentation/feature-removal-schedule.txt
- Documentation/kernel-parameters.txt
- Documentation/memory-devices/ti-emif.txt
- Documentation/zh_CN/magic-number.txt
- arch/powerpc/mm/hugetlbpage.c
- drivers/Kconfig
- drivers/Makefile
- drivers/acpi/pci_link.c
- drivers/acpi/sleep.c
- drivers/base/bus.c
- drivers/base/core.c
- drivers/base/devres.c
- drivers/base/devtmpfs.c
- drivers/base/dma-buf.c
- drivers/base/driver.c
- drivers/char/mem.c
- drivers/extcon/Kconfig
- drivers/extcon/Makefile
- drivers/extcon/extcon-max8997.c
- drivers/extcon/extcon_class.c
- drivers/extcon/extcon_gpio.c
- drivers/gpio/devres.c
- drivers/hv/channel_mgmt.c
- drivers/hv/hv.c
- drivers/hv/hv_kvp.c
- drivers/hv/hv_util.c
- drivers/hv/hyperv_vmbus.h
- drivers/memory/Kconfig
- drivers/memory/Makefile
- drivers/memory/emif.c
- drivers/memory/emif.h
- drivers/memory/tegra20-mc.c
- drivers/memory/tegra30-mc.c
- drivers/misc/Kconfig
- drivers/misc/Makefile
- drivers/misc/max8997-muic.c
- drivers/parport/parport_pc.c
- drivers/staging/android/Kconfig
- drivers/staging/android/Makefile
- drivers/staging/android/switch/Kconfig
- drivers/staging/android/switch/Makefile
- drivers/staging/android/switch/switch.h
- drivers/staging/android/switch/switch_class.c
- drivers/staging/android/switch/switch_gpio.c
- drivers/uio/uio_pdrv_genirq.c
- drivers/usb/core/sysfs.c
- drivers/w1/slaves/w1_ds2408.c
- drivers/w1/w1.c
- drivers/w1/w1_io.c
- fs/sysfs/dir.c
- include/linux/device.h
- include/linux/dynamic_debug.h
- include/linux/extcon.h
- include/linux/extcon/extcon_gpio.h
- include/linux/hyperv.h
- include/linux/mfd/max8997.h
- include/linux/moduleparam.h
- include/linux/platform_data/emif_plat.h
- include/linux/printk.h
- include/linux/sysfs.h
- include/memory/jedec_ddr.h
- init/main.c
- kernel/module.c
- kernel/params.c
- kernel/printk.c
- lib/Kconfig
- lib/Kconfig.debug
- lib/Makefile
- lib/dynamic_debug.c
- lib/jedec_ddr_data.c
- lib/kobject.c
- mm/page_alloc.c