18 Dec, 2012

1 commit

  • Use the newly introduce cs-gpios dt support on atmel.
    We do not use the hardware cs as it's wired and has bugs and limitations.
    As the controller believes that only active-low devices/systems exists.

    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD
    Acked-by: Nicolas Ferre
    Signed-off-by: Grant Likely

    Jean-Christophe PLAGNIOL-VILLARD
     

15 Dec, 2012

12 commits

  • To get modprobe to automatically load the proper modules, we need to
    prefix things with "spi:". Partially based on Grant Likely's suggestions.

    Signed-off-by: David Daney
    [grant.likely: reworked because drivers/of/of_spi.c has been removed]
    Signed-off-by: Grant Likely

    David Daney
     
  • Setting SW_RST does TX/RX FIFO flush.
    After FIFO flush, SW_RST should be cleared.
    The above setting and clearing SW_RST operation should be done after spi channel off.

    Signed-off-by: Kyoungil Kim
    Signed-off-by: Grant Likely

    Kyoungil Kim
     
  • During all transfers in one message, the device will not be chagned.
    So we don't need to deassert chipselect during one message.

    Signed-off-by: Kyoungil Kim
    Signed-off-by: Grant Likely

    Kyoungil Kim
     
  • Pull another devicetree update from Grant Likely:
    "Here's a couple more devicetree changes that I missed in the first
    pull by putting the tag in the wrong place.

    Two minor devicetree fixups for v3.8. Addition of dummy inlines and
    constification of node argument to of_parse_phandle_with_args()."

    * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6:
    of: *node argument to of_parse_phandle_with_args should be const
    of/i2c: add dummy inline functions for when CONFIG_OF_I2C(_MODULE) isn't defined

    Linus Torvalds
     
  • Pull ARM SoC updates for Marvell mvebu/kirkwood from Olof Johansson:
    "This is a branch with updates for Marvell's mvebu/kirkwood platforms.
    They came in late-ish, and were heavily interdependent such that it
    didn't make sense to split them up across the cross-platform topic
    branches. So here they are (for the second release in a row) in a
    branch on their own."

    * tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (88 commits)
    arm: l2x0: add aurora related properties to OF binding
    arm: mvebu: add Aurora L2 Cache Controller to the DT
    arm: mvebu: add L2 cache support
    dma: mv_xor: fix error handling path
    dma: mv_xor: fix error checking of irq_of_parse_and_map()
    dma: mv_xor: use request_irq() instead of devm_request_irq()
    dma: mv_xor: clear the window override control registers
    arm: mvebu: fix address decoding armada_cfg_base() function
    ARM: mvebu: update defconfig with I2C and RTC support
    ARM: mvebu: Add SATA support for OpenBlocks AX3-4
    ARM: mvebu: Add support for the RTC in OpenBlocks AX3-4
    ARM: mvebu: Add support for I2C on OpenBlocks AX3-4
    ARM: mvebu: Add support for I2C controllers in Armada 370/XP
    arm: mvebu: Add hardware I/O Coherency support
    arm: plat-orion: Add coherency attribute when setup mbus target
    arm: dma mapping: Export a dma ops function arm_dma_set_mask
    arm: mvebu: Add SMP support for Armada XP
    arm: mm: Add support for PJ4B cpu and init routines
    arm: mvebu: Add IPI support via doorbells
    arm: mvebu: Add initial support for power managmement service unit
    ...

    Linus Torvalds
     
  • Pull ARM SoC device-tree updates, take 2, from Olof Johansson:
    "This branch contains device-tree updates for the SPEAr platform. They
    had dependencies on earlier branches from this merge window, which is
    why they were broken out in a separate branch."

    * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: SPEAr3xx: Shirq: Move shirq controller out of plat/
    ARM: SPEAr320: DT: Add SPEAr 320 HMI board support
    ARM: SPEAr3xx: DT: add shirq node for interrupt multiplexor
    ARM: SPEAr3xx: shirq: simplify and move the shared irq multiplexor to DT
    ARM: SPEAr1310: Fix AUXDATA for compact flash controller
    ARM: SPEAr13xx: Remove fields not required for ssp controller
    ARM: SPEAr1310: Move 1310 specific misc register into machine specific files
    ARM: SPEAr: DT: Update device nodes
    ARM: SPEAr: DT: add uart state to fix warning
    ARM: SPEAr: DT: Modify DT bindings for STMMAC
    ARM: SPEAr: DT: Fix existing DT support
    ARM: SPEAr: DT: Update partition info for MTD devices
    ARM: SPEAr: DT: Update pinctrl list
    ARM: SPEAr13xx: DT: Add spics gpio controller nodes

    Linus Torvalds
     
  • Pull ARM Soc updates, take 2, from Olof Johansson:
    "This is the second batch of SoC updates for the 3.8 merge window,
    containing parts that had dependencies on earlier branches such that
    we couldn't include them with the first branch.

    These are general updates for Samsung Exynos, Renesas/shmobile and a
    topic branch that adds SMP support to Altera's socfpga platform."

    Fix up conflicts mostly as per Olof.

    * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: EXYNOS: Clock settings for SATA and SATA PHY
    ARM: EXYNOS: Add ARM down clock support
    ARM: EXYNOS: Fix i2c suspend/resume for legacy controller
    ARM: EXYNOS: Add aliases for i2c controller
    ARM: EXYNOS: Setup legacy i2c controller interrupts
    sh: clkfwk: fixup unsed variable warning
    Revert "ARM: shmobile: r8a7779: Replace modify_scu_cpu_psr with scu_power_mode"
    Revert "ARM: shmobile: sh73a0: Replace modify_scu_cpu_psr with scu_power_mode"
    Revert "ARM: shmobile: emev2: Replace modify_scu_cpu_psr with scu_power_mode"
    ARM: highbank: use common debug_ll_io_init
    ARM: shmobile: sh7372: sh7372_fsiXck_clk become non-global
    ARM: shmobile: sh7372: remove fsidivx clock
    ARM: socfpga: mark secondary_trampoline as cpuinit
    socfpga: map uart into virtual address space so that early_printk() works
    ARM: socfpga: fix build break for allyesconfig
    ARM: socfpga: Enable SMP for socfpga
    ARM: EXYNOS: Add dp clock support for EXYNOS5
    ARM: SAMSUNG: call clk_get_rate for debugfs rate files
    ARM: SAMSUNG: add clock_tree debugfs file in clock

    Linus Torvalds
     
  • Pull MIPS updates from Ralf Baechle:
    "The MIPS bits for 3.8. This also includes a bunch fixes that were
    sitting in the linux-mips.org git tree for a long time. This pull
    request contains updates to several OCTEON drivers and the board
    support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,
    updates to the SSB bus support, MIPS kexec code and adds support for
    kdump.

    When pulling this, there are two expected merge conflicts in
    include/linux/bcma/bcma_driver_chipcommon.h which are trivial to
    resolve, just remove the conflict markers and keep both alternatives."

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)
    MIPS: PMC-Sierra Yosemite: Remove support.
    VIDEO: Newport Fix console crashes
    MIPS: wrppmc: Fix build of PCI code.
    MIPS: IP22/IP28: Fix build of EISA code.
    MIPS: RB532: Fix build of prom code.
    MIPS: PowerTV: Fix build.
    MIPS: IP27: Correct fucked grammar in ops-bridge.c
    MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
    MIPS: Fix potencial corruption
    MIPS: Fix for warning from FPU emulation code
    MIPS: Handle COP3 Unusable exception as COP1X for FP emulation
    MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
    MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
    MIPS: Remove unused smvp.h
    MIPS/EDAC: Improve OCTEON EDAC support.
    MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
    MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h
    ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.
    MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
    MIPS: Remove usage of CEVT_R4K_LIB config option.
    ...

    Linus Torvalds
     
  • Merging in the smp-on-socfpga branch into soc2 since the topics are similar
    and it's a short branch in the first place.

    * next/smp:
    ARM: socfpga: mark secondary_trampoline as cpuinit
    socfpga: map uart into virtual address space so that early_printk() works
    ARM: socfpga: fix build break for allyesconfig
    ARM: socfpga: Enable SMP for socfpga

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • Pull x86 EFI update from Peter Anvin:
    "EFI tree, from Matt Fleming. Most of the patches are the new efivarfs
    filesystem by Matt Garrett & co. The balance are support for EFI
    wallclock in the absence of a hardware-specific driver, and various
    fixes and cleanups."

    * 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
    efivarfs: Make efivarfs_fill_super() static
    x86, efi: Check table header length in efi_bgrt_init()
    efivarfs: Use query_variable_info() to limit kmalloc()
    efivarfs: Fix return value of efivarfs_file_write()
    efivarfs: Return a consistent error when efivarfs_get_inode() fails
    efivarfs: Make 'datasize' unsigned long
    efivarfs: Add unique magic number
    efivarfs: Replace magic number with sizeof(attributes)
    efivarfs: Return an error if we fail to read a variable
    efi: Clarify GUID length calculations
    efivarfs: Implement exclusive access for {get,set}_variable
    efivarfs: efivarfs_fill_super() ensure we clean up correctly on error
    efivarfs: efivarfs_fill_super() ensure we free our temporary name
    efivarfs: efivarfs_fill_super() fix inode reference counts
    efivarfs: efivarfs_create() ensure we drop our reference on inode on error
    efivarfs: efivarfs_file_read ensure we free data in error paths
    x86-64/efi: Use EFI to deal with platform wall clock (again)
    x86/kernel: remove tboot 1:1 page table creation code
    x86, efi: 1:1 pagetable mapping for virtual EFI calls
    x86, mm: Include the entire kernel memory map in trampoline_pgd
    ...

    Linus Torvalds
     
  • Pull x86 ACPI update from Peter Anvin:
    "This is a patchset which didn't make the last merge window. It adds a
    debugging capability to feed ACPI tables via the initramfs.

    On a grander scope, it formalizes using the initramfs protocol for
    feeding arbitrary blobs which need to be accessed early to the kernel:
    they are fed first in the initramfs blob (lots of bootloaders can
    concatenate this at boot time, others can use a single file) in an
    uncompressed cpio archive using filenames starting with "kernel/".

    The ACPI maintainers requested that this patchset be fed via the x86
    tree rather than the ACPI tree as the footprint in the general x86
    code is much bigger than in the ACPI code proper."

    * 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    X86 ACPI: Use #ifdef not #if for CONFIG_X86 check
    ACPI: Fix build when disabled
    ACPI: Document ACPI table overriding via initrd
    ACPI: Create acpi_table_taint() function to avoid code duplication
    ACPI: Implement physical address table override
    ACPI: Store valid ACPI tables passed via early initrd in reserved memblock areas
    x86, acpi: Introduce x86 arch specific arch_reserve_mem_area() for e820 handling
    lib: Add early cpio decoder

    Linus Torvalds
     
  • Pull x86 RAS update from Ingo Molnar:
    "Rework all config variables used throughout the MCA code and collect
    them together into a mca_config struct. This keeps them tightly and
    neatly packed together instead of spilled all over the place.

    Then, convert those which are used as booleans into real booleans and
    save some space. These bits are exposed via
    /sys/devices/system/machinecheck/machinecheck*/"

    * 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86, MCA: Finish mca_config conversion
    x86, MCA: Convert the next three variables batch
    x86, MCA: Convert rip_msr, mce_bootlog, monarch_timeout
    x86, MCA: Convert dont_log_ce, banks and tolerant
    drivers/base: Add a DEVICE_BOOL_ATTR macro

    Linus Torvalds
     

14 Dec, 2012

27 commits

  • This reverts commit f269ae0469fc882332bdfb5db15d3c1315fe2a10.

    It turns out it causes a very noticeable interactivity regression with
    CONFIG_SCHED_AUTOGROUP (test-case: "make -j32" of the kernel in a
    terminal window, while scrolling in a browser - the autogrouping means
    that the two end up in separate cgroups, and the browser should be
    smooth as silk despite the high load).

    Says Paul Turner:
    "It seems that the update-throttling on the wake-side is reducing the
    interactive tasks' ability to preempt. While I suspect the right
    longer term answer here is force these updates only in the
    cross-cgroup case; this is less trivial. For this release I believe
    the right answer is either going to be a revert or restore the updates
    on the enqueue-side."

    Reported-by: Linus Torvalds
    Bisected-by: Mike Galbraith
    Acked-by: Paul Turner
    Acked-by: Ingo Molnar
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Pull battery subsystem updates from Anton Vorontsov:
    "Highlights:

    - Two new drivers from Pali Rohár and N900 hackers: rx51_battery and
    bq2415x_charger. The drivers are a part of a solution to replace
    the proprietary Nokia BME stack

    - Power supply core now registers devices with a thermal cooling
    subsystem, so we can now automatically throttle charging. Thanks
    to Ramakrishna Pallala!

    - Device tree support for ab8500 and max8925_power drivers

    - Random fixups and enhancements for a bunch of drivers."

    * tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6: (22 commits)
    max8925_power: Add support for device-tree initialization
    ab8500: Add devicetree support for chargalg
    ab8500: Add devicetree support for charger
    ab8500: Add devicetree support for btemp
    ab8500: Add devicetree support for fuelgauge
    twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_*
    jz4740-battery: Use devm_request_and_ioremap
    jz4740-battery: Use devm_kzalloc
    bq27x00_battery: Fixup nominal available capacity reporting
    bq2415x_charger: Fix style issues
    bq2415x_charger: Add Kconfig/Makefile entries
    power_supply: Add bq2415x charger driver
    power_supply: Add new Nokia RX-51 (N900) power supply battery driver
    max17042_battery: Fix missing verify_model_lock() return value check
    ds2782_battery: Fix signedness bug in ds278x_read_reg16()
    lp8788-charger: Fix ADC channel names
    lp8788-charger: Fix wrong ADC conversion
    lp8788-charger: Use consumer device name on setting IIO channels
    power_supply: Register power supply for thermal cooling device
    power_supply: Add support for CHARGE_CONTROL_* attributes
    ...

    Linus Torvalds
     
  • Pull media updates from Mauro Carvalho Chehab:

    - Missing MAINTAINERS entries were added for several drivers

    - Adds V4L2 support for DMABUF handling, allowing zero-copy buffer
    sharing between V4L2 devices and GPU

    - Got rid of all warnings when compiling with W=1 on x86

    - Add a new driver for Exynos hardware (s3c-camif)

    - Several bug fixes, cleanups and driver improvements

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (243 commits)
    [media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
    [media] omap3isp: Prepare/unprepare clocks before/after enable/disable
    [media] omap3isp: preview: Add support for 8-bit formats at the sink pad
    [media] omap3isp: Replace printk with dev_*
    [media] omap3isp: Find source pad from external entity
    [media] omap3isp: Configure CSI-2 phy based on platform data
    [media] omap3isp: Add PHY routing configuration
    [media] omap3isp: Add CSI configuration registers from control block to ISP resources
    [media] omap3isp: Remove unneeded module memory address definitions
    [media] omap3isp: Use monotonic timestamps for statistics buffers
    [media] uvcvideo: Fix control value clamping for unsigned integer controls
    [media] uvcvideo: Mark first output terminal as default video node
    [media] uvcvideo: Add VIDIOC_[GS]_PRIORITY support
    [media] uvcvideo: Return -ENOTTY for unsupported ioctls
    [media] uvcvideo: Set device_caps in VIDIOC_QUERYCAP
    [media] uvcvideo: Don't fail when an unsupported format is requested
    [media] uvcvideo: Return -EACCES when trying to access a read/write-only control
    [media] uvcvideo: Set error_idx properly for extended controls API failures
    [media] rtl28xxu: add NOXON DAB/DAB+ USB dongle rev 2
    [media] fc2580: write some registers conditionally
    ...

    Linus Torvalds
     
  • Pull first round of SCSI updates from James Bottomley:
    "This patch set includes two large new drivers: mpt3sas (for the next
    gen fusion SAS hardware) and csiostor a FCoE offload driver for the
    Chelsio converged network cards (this includes some net changes which
    I've OK'd with DaveM).

    The rest of the patch is driver updates (qla2xxx, lpfc, hptiop,
    be2iscsi) plus a few assorted updates and bug fixes.

    We also have a Power Management rework in the Upper Layer Drivers
    preparatory to doing ACPI zero power optical devices, but the actual
    enabler is still being worked on.

    Signed-off-by: James Bottomley "

    * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (72 commits)
    [SCSI] mpt3sas: add new driver supporting 12GB SAS
    [SCSI] scsi_transport_sas: add 12GB definitions for mpt3sas
    [SCSI] miscdevice: Adding support for MPT3SAS_MINOR(222)
    [SCSI] csiostor: remove unneeded memset()
    [SCSI] csiostor: Fix sparse warnings.
    [SCSI] qla2xxx: Display that driver is operating in legacy interrupt mode.
    [SCSI] qla2xxx: Dont clear drv active on iospace config failure.
    [SCSI] qla2xxx: Fix typo in qla2xxx driver.
    [SCSI] qla2xxx: Update ql2xextended_error_logging parameter description with new option.
    [SCSI] qla2xxx: Parameterize the link speed of hba rather than fcport.
    [SCSI] qla2xxx: Add 16Gb/s case to get port speed capability.
    [SCSI] qla2xxx: Move marking fcport online ahead of setting iiDMA speed.
    [SCSI] qla2xxx: Add acquiring of risc semaphore before doing ISP reset.
    [SCSI] qla2xxx: Ignore driver ack bit if corresponding presence bit is not set.
    [SCSI] qla2xxx: Fix typo in qla83xx_fw_dump function.
    [SCSI] qla2xxx: Add Gen3 PCIe speed 8GT/s to the log message.
    [SCSI] qla2xxx: Use correct Request-Q-Out register during bidirectional request processing
    [SCSI] qla2xxx: Move noisy Start scsi failed messages to verbose logging level.
    [SCSI] qla2xxx: Fix coccinelle warnings in qla2x00_relogin.
    [SCSI] qla2xxx: No fcport FC-4 type assignment in GA_NXT response.
    ...

    Linus Torvalds
     
  • Pull infiniband upate from Roland Dreier:
    "First batch of InfiniBand/RDMA changes for the 3.8 merge window:
    - A good chunk of Bart Van Assche's SRP fixes
    - UAPI disintegration from David Howells
    - mlx4 support for "64-byte CQE" hardware feature from Or Gerlitz
    - Other miscellaneous fixes"

    Fix up trivial conflict in mellanox/mlx4 driver.

    * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (33 commits)
    RDMA/nes: Fix for crash when registering zero length MR for CQ
    RDMA/nes: Fix for terminate timer crash
    RDMA/nes: Fix for BUG_ON due to adding already-pending timer
    IB/srp: Allow SRP disconnect through sysfs
    srp_transport: Document sysfs attributes
    srp_transport: Simplify attribute initialization code
    srp_transport: Fix attribute registration
    IB/srp: Document sysfs attributes
    IB/srp: send disconnect request without waiting for CM timewait exit
    IB/srp: destroy and recreate QP and CQs when reconnecting
    IB/srp: Eliminate state SRP_TARGET_DEAD
    IB/srp: Introduce the helper function srp_remove_target()
    IB/srp: Suppress superfluous error messages
    IB/srp: Process all error completions
    IB/srp: Introduce srp_handle_qp_err()
    IB/srp: Simplify SCSI error handling
    IB/srp: Keep processing commands during host removal
    IB/srp: Eliminate state SRP_TARGET_CONNECTING
    IB/srp: Increase block layer timeout
    RDMA/cm: Change return value from find_gid_port()
    ...

    Linus Torvalds
     
  • Pull SPI updates from Grant Likely:
    "Primarily SPI device driver bug fixes, one removal of an old driver,
    and some new tegra support. There is some core code change too, but
    all in all pretty small stuff.

    The new features to note are:
    - Common code for describing GPIO CS lines in the device tree
    - Remove the SPI_BUFSIZ limitation on spi_write_the_read()
    - core spi ensures bits_per_word is set correctly
    - SPARC can now use SPI"

    * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6: (36 commits)
    spi/sparc: Allow of_register_spi_devices for sparc
    spi: Remove HOTPLUG section attributes
    spi: Add support for specifying 3-wire mode via device tree
    spi: Fix comparison of different integer types
    spi/orion: Add SPI_CHPA and SPI_CPOL support to kirkwood driver.
    spi/sh: Add SH Mobile series as dependency to MSIOF controller
    spi/sh-msiof: Remove unneeded clock name
    spi: Remove SPI_BUFSIZ restriction on spi_write_then_read()
    spi/stmp: remove obsolete driver
    spi/clps711x: New SPI master driver
    spi: omap2-mcspi: remove duplicate inclusion of linux/err.h
    spi: omap2-mcspi: Fix the redifine warning
    spi/sh-hspi: add CS manual control support
    of_spi: add generic binding support to specify cs gpio
    spi: omap2-mcspi: remove duplicated include from spi-omap2-mcspi.c
    spi/bitbang: (cosmetic) simplify list manipulation
    spi/bitbang: avoid needless loop flow manipulations
    spi/omap: fix D0/D1 direction confusion
    spi: tegra: add spi driver for sflash controller
    spi: Dont call master->setup if not populated
    ...

    Linus Torvalds
     
  • Merge emailed autofs cleanup/fix patches from Ian Kent

    * autofs:
    autofs4 - use simple_empty() for empty directory check
    autofs4 - dont clear DCACHE_NEED_AUTOMOUNT on rootless mount

    Linus Torvalds
     
  • For direct (and offset) mounts, if an automounted mount is manually
    umounted the trigger mount dentry can appear non-empty causing it to
    not trigger mounts. This can also happen if there is a file handle
    leak in a user space automounting application.

    This happens because, when a ioctl control file handle is opened
    on the mount, a cursor dentry is created which causes list_empty()
    to see the dentry as non-empty. Since there is a case where listing
    the directory of these dentrys is needed, the use of dcache_dir_*()
    functions for .open() and .release() is needed.

    Consequently simple_empty() must be used instead of list_empty()
    when checking for an empty directory.

    Signed-off-by: Ian Kent
    Signed-off-by: Linus Torvalds

    Ian Kent
     
  • The DCACHE_NEED_AUTOMOUNT flag is cleared on mount and set on expire
    for autofs rootless multi-mount dentrys to prevent unnecessary calls
    to ->d_automount().

    Since DCACHE_MANAGE_TRANSIT is always set on autofs dentrys ->d_managed()
    is always called so the check can be done in ->d_manage() without the
    need to change the flag. This still avoids unnecessary calls to
    ->d_automount(), adds negligible overhead and eliminates a seriously
    ugly check in the expire code.

    Signed-off-by: Ian Kent
    Signed-off-by: Linus Torvalds

    Ian Kent
     
  • Pull ktest update from Steven Rostedt:
    "fixes and updated for new boot loaders"

    * tag 'ktest-v3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
    ktest: Test if target machine is up before install
    ktest: Fix breakage from change of oldnoconfig to olddefconfig
    ktest: Add native support for syslinux boot loader
    ktest: Sync before reboot
    ktest: Add support for grub2

    Linus Torvalds
     
  • Pull KVM updates from Marcelo Tosatti:
    "Considerable KVM/PPC work, x86 kvmclock vsyscall support,
    IA32_TSC_ADJUST MSR emulation, amongst others."

    Fix up trivial conflict in kernel/sched/core.c due to cross-cpu
    migration notifier added next to rq migration call-back.

    * tag 'kvm-3.8-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (156 commits)
    KVM: emulator: fix real mode segment checks in address linearization
    VMX: remove unneeded enable_unrestricted_guest check
    KVM: VMX: fix DPL during entry to protected mode
    x86/kexec: crash_vmclear_local_vmcss needs __rcu
    kvm: Fix irqfd resampler list walk
    KVM: VMX: provide the vmclear function and a bitmap to support VMCLEAR in kdump
    x86/kexec: VMCLEAR VMCSs loaded on all cpus if necessary
    KVM: MMU: optimize for set_spte
    KVM: PPC: booke: Get/set guest EPCR register using ONE_REG interface
    KVM: PPC: bookehv: Add EPCR support in mtspr/mfspr emulation
    KVM: PPC: bookehv: Add guest computation mode for irq delivery
    KVM: PPC: Make EPCR a valid field for booke64 and bookehv
    KVM: PPC: booke: Extend MAS2 EPN mask for 64-bit
    KVM: PPC: e500: Mask MAS2 EPN high 32-bits in 32/64 tlbwe emulation
    KVM: PPC: Mask ea's high 32-bits in 32/64 instr emulation
    KVM: PPC: e500: Add emulation helper for getting instruction ea
    KVM: PPC: bookehv64: Add support for interrupt handling
    KVM: PPC: bookehv: Remove GET_VCPU macro from exception handler
    KVM: PPC: booke: Fix get_tb() compile error on 64-bit
    KVM: PPC: e500: Silence bogus GCC warning in tlb code
    ...

    Linus Torvalds
     
  • Pull Xen updates from Konrad Rzeszutek Wilk:
    - Add necessary infrastructure to make balloon driver work under ARM.
    - Add /dev/xen/privcmd interfaces to work with ARM and PVH.
    - Improve Xen PCIBack wild-card parsing.
    - Add Xen ACPI PAD (Processor Aggregator) support - so can offline/
    online sockets depending on the power consumption.
    - PVHVM + kexec = use an E820_RESV region for the shared region so we
    don't overwrite said region during kexec reboot.
    - Cleanups, compile fixes.

    Fix up some trivial conflicts due to the balloon driver now working on
    ARM, and there were changes next to the previous work-arounds that are
    now gone.

    * tag 'stable/for-linus-3.8-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/PVonHVM: fix compile warning in init_hvm_pv_info
    xen: arm: implement remap interfaces needed for privcmd mappings.
    xen: correctly use xen_pfn_t in remap_domain_mfn_range.
    xen: arm: enable balloon driver
    xen: balloon: allow PVMMU interfaces to be compiled out
    xen: privcmd: support autotranslated physmap guests.
    xen: add pages parameter to xen_remap_domain_mfn_range
    xen/acpi: Move the xen_running_on_version_or_later function.
    xen/xenbus: Remove duplicate inclusion of asm/xen/hypervisor.h
    xen/acpi: Fix compile error by missing decleration for xen_domain.
    xen/acpi: revert pad config check in xen_check_mwait
    xen/acpi: ACPI PAD driver
    xen-pciback: reject out of range inputs
    xen-pciback: simplify and tighten parsing of device IDs
    xen PVonHVM: use E820_Reserved area for shared_info

    Linus Torvalds
     
  • Pull s390 update from Martin Schwidefsky:
    "Add support to generate code for the latest machine zEC12, MOD and XOR
    instruction support for the BPF jit compiler, the dasd safe offline
    feature and the big one: the s390 architecture gets PCI support!!
    Right before the world ends on the 21st ;-)"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (41 commits)
    s390/qdio: rename the misleading PCI flag of qdio devices
    s390/pci: remove obsolete email addresses
    s390/pci: speed up __iowrite64_copy by using pci store block insn
    s390/pci: enable NEED_DMA_MAP_STATE
    s390/pci: no msleep in potential IRQ context
    s390/pci: fix potential NULL pointer dereference in dma_free_seg_table()
    s390/pci: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
    s390/bpf,jit: add support for XOR instruction
    s390/bpf,jit: add support MOD instruction
    s390/cio: fix pgid reserved check
    vga: compile fix, disable vga for s390
    s390/pci: add PCI Kconfig options
    s390/pci: s390 specific PCI sysfs attributes
    s390/pci: PCI hotplug support via SCLP
    s390/pci: CHSC PCI support for error and availability events
    s390/pci: DMA support
    s390/pci: PCI adapter interrupts for MSI/MSI-X
    s390/bitops: find leftmost bit instruction support
    s390/pci: CLP interface
    s390/pci: base support
    ...

    Linus Torvalds
     
  • Pull m68k updates from Geert Uytterhoeven.

    Fix up trivial conflict (m68k switched to generic version of
    uapi/asm/socket.h, net tree updated the old one) as per Geert.

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
    m68k/sun3: Fix instruction faults
    m68k/sun3: Get interrupts working again
    m68k: move to a single instance of free_initmem()
    m68k: merge MMU and non-MMU versions of mm/init.c
    m68k: switch to using the asm-generic termios.h
    m68k: switch to using the asm-generic termbits.h
    m68k: switch to using the asm-generic sockios.h
    m68k: switch to using the asm-generic socket.h
    m68k: switch to using the asm-generic shmbuf.h
    m68k: switch to using the asm-generic sembuf.h
    m68k: switch to using the asm-generic msgbuf.h
    m68k: switch to using the asm-generic auxvec.h
    m68k: switch to using the asm-generic shmparam.h
    m68k: switch to using the asm-generic spinlock.h
    m68k: switch to using the asm-generic hw_irq.h
    arch/m68k: remove CONFIG_EXPERIMENTAL

    Linus Torvalds
     
  • Pull tiny sparc update from David Miller:
    "Not much going on this release cycle in sparc land, just a Kconfig
    tweak."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
    of_i2c: sparc: Allow OF_I2C for sparc

    Linus Torvalds
     
  • Pull networking fixes from David Miller:
    "A pile of fixes in response to yesterday's big merge. The SCTP HMAC
    thing hasn't been addressed yet, I'll take care of that myself if Neil
    and Vlad don't show signs of life by tomorrow.

    1) Use after free of SKB in tuntap code. Fix by Eric Dumazet,
    reported by Dave Jones.

    2) NFC LLCP code emits annoying kernel log message, triggerable by
    the user. From Dave Jones.

    3) Fix several endianness bugs noticed by sparse in the bridging
    code, from Stephen Hemminger.

    4) Ipv6 NDISC code doesn't take padding into account properly, fix
    from YOSHIFUJI Hideaki.

    5) Add missing docs to ethtool_flow_ext struct, from Yan Burman."

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
    bridge: fix icmpv6 endian bug and other sparse warnings
    net: ethool: Document struct ethtool_flow_ext
    ndisc: Fix padding error in link-layer address option.
    tuntap: dont use skb after netif_rx_ni(skb)
    nfc: remove noisy message from llcp_sock_sendmsg

    Linus Torvalds
     
  • Merge misc VM changes from Andrew Morton:
    "The rest of most-of-MM. The other MM bits await a slab merge.

    This patch includes the addition of a huge zero_page. Not a
    performance boost but it an save large amounts of physical memory in
    some situations.

    Also a bunch of Fujitsu engineers are working on memory hotplug.
    Which, as it turns out, was badly broken. About half of their patches
    are included here; the remainder are 3.8 material."

    However, this merge disables CONFIG_MOVABLE_NODE, which was totally
    broken. We don't add new features with "default y", nor do we add
    Kconfig questions that are incomprehensible to most people without any
    help text. Does the feature even make sense without compaction or
    memory hotplug?

    * akpm: (54 commits)
    mm/bootmem.c: remove unused wrapper function reserve_bootmem_generic()
    mm/memory.c: remove unused code from do_wp_page()
    asm-generic, mm: pgtable: consolidate zero page helpers
    mm/hugetlb.c: fix warning on freeing hwpoisoned hugepage
    hwpoison, hugetlbfs: fix RSS-counter warning
    hwpoison, hugetlbfs: fix "bad pmd" warning in unmapping hwpoisoned hugepage
    mm: protect against concurrent vma expansion
    memcg: do not check for mm in __mem_cgroup_count_vm_event
    tmpfs: support SEEK_DATA and SEEK_HOLE (reprise)
    mm: provide more accurate estimation of pages occupied by memmap
    fs/buffer.c: remove redundant initialization in alloc_page_buffers()
    fs/buffer.c: do not inline exported function
    writeback: fix a typo in comment
    mm: introduce new field "managed_pages" to struct zone
    mm, oom: remove statically defined arch functions of same name
    mm, oom: remove redundant sleep in pagefault oom handler
    mm, oom: cleanup pagefault oom handler
    memory_hotplug: allow online/offline memory to result movable node
    numa: add CONFIG_MOVABLE_NODE for movable-dedicated node
    mm, memcg: avoid unnecessary function call when memcg is disabled
    ...

    Linus Torvalds
     
  • Pull PCI update from Bjorn Helgaas:
    "Host bridge hotplug:
    - Untangle _PRT from struct pci_bus (Bjorn Helgaas)
    - Request _OSC control before scanning root bus (Taku Izumi)
    - Assign resources when adding host bridge (Yinghai Lu)
    - Remove root bus when removing host bridge (Yinghai Lu)
    - Remove _PRT during hot remove (Yinghai Lu)

    SRIOV
    - Add sysfs knobs to control numVFs (Don Dutile)

    Power management
    - Notify devices when power resource turned on (Huang Ying)

    Bug fixes
    - Work around broken _SEG on HP xw9300 (Bjorn Helgaas)
    - Keep runtime PM enabled for unbound PCI devices (Huang Ying)
    - Fix Optimus dual-GPU runtime D3 suspend issue (Dave Airlie)
    - Fix xen frontend shutdown issue (David Vrabel)
    - Work around PLX PCI 9050 BAR alignment erratum (Ian Abbott)

    Miscellaneous
    - Add GPL license for drivers/pci/ioapic (Andrew Cooks)
    - Add standard PCI-X, PCIe ASPM register #defines (Bjorn Helgaas)
    - NumaChip remote PCI support (Daniel Blueman)
    - Fix PCIe Link Capabilities Supported Link Speed definition (Jingoo
    Han)
    - Convert dev_printk() to dev_info(), etc (Joe Perches)
    - Add support for non PCI BAR ROM data (Matthew Garrett)
    - Add x86 support for host bridge translation offset (Mike Yoknis)
    - Report success only when every driver supports AER (Vijay
    Pandarathil)"

    Fix up trivial conflicts.

    * tag 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (48 commits)
    PCI: Use phys_addr_t for physical ROM address
    x86/PCI: Add NumaChip remote PCI support
    ath9k: Use standard #defines for PCIe Capability ASPM fields
    iwlwifi: Use standard #defines for PCIe Capability ASPM fields
    iwlwifi: collapse wrapper for pcie_capability_read_word()
    iwlegacy: Use standard #defines for PCIe Capability ASPM fields
    iwlegacy: collapse wrapper for pcie_capability_read_word()
    cxgb3: Use standard #defines for PCIe Capability ASPM fields
    PCI: Add standard PCIe Capability Link ASPM field names
    PCI/portdrv: Use PCI Express Capability accessors
    PCI: Use standard PCIe Capability Link register field names
    x86: Use PCI setup data
    PCI: Add support for non-BAR ROMs
    PCI: Add pcibios_add_device
    EFI: Stash ROMs if they're not in the PCI BAR
    PCI: Add and use standard PCI-X Capability register names
    PCI/PM: Keep runtime PM enabled for unbound PCI devices
    xen-pcifront: Handle backend CLOSED without CLOSING
    PCI: SRIOV control and status via sysfs (documentation)
    PCI/AER: Report success only when every device has AER-aware driver
    ...

    Linus Torvalds
     
  • Pull regulator updates from Mark Brown:
    "A fairly quiet release again, a couple of relatively small new
    features and a bunch of driver specific work including yet more code
    elimination and fixes from Axel Lin.

    - Addidion of linear_min_sel for offsetting linear selectors in the
    helpers.
    - Support for continuous voltage ranges for regulators with extremely
    high resolution.
    - Drivers for AS3711, DA9055, MAX9873, TPS51632, TPS80031 and ARM
    vexpress."

    Fix up trivial conflict (due to typo fix) in palmas-regulator.c

    * tag 'regulator-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (80 commits)
    regulator: core: Fix logic to determinate if regulator can change voltage
    regulator: s5m8767: Fix to work even if no DVS gpio present
    regulator: s5m8767: Fix to read the first DVS register.
    regulator: s5m8767: Fix to work when platform registers less regulators
    regulator: gpio-regulator: gpio_set_value should use cansleep
    regulator: gpio-regulator: Fix logical error in for() loop
    regulator: anatop: Use regulator_[get|set]_voltage_sel_regmap
    regulator: anatop: Use linear_min_sel with linear mapping
    regulator: max1586: Implement get_voltage_sel callback
    regulator: lp8788-buck: Kill _gpio_request function
    regulator: tps80031: Convert tps80031_ldo_ops to linear_min_sel and list_voltage_linear
    regulator: lp8788-ldo: Remove val array in lp8788_config_ldo_enable_mode
    regulator: gpio-regulator: Add ifdef CONFIG_OF guard for regulator_gpio_of_match
    regulator: palmas: Convert palmas_ops_smps to regulator_[get|set]_voltage_sel_regmap
    regulator: palmas: Return raw register values as the selectors in [get|set]_voltage_sel
    regulators: add regulator_can_change_voltage() function
    regulator: tps51632: Ensure [base|max]_voltage_uV pdata settings are valid
    regulator: wm831x-dcdc: Add MODULE_ALIAS for wm831x-boostp
    regulator: wm831x-dcdc: Ensure selected voltage falls within requested range
    regulator: tps51632: Use linear_min_sel and regulator_[map|list]_voltage_linear
    ...

    Linus Torvalds
     
  • Pull HID subsystem updates from Jiri Kosina:

    1) Support for HID over I2C bus has been added by Benjamin Tissoires.
    ACPI device discovery is still in the works.

    2) Support for Win8 Multitiouch protocol is being added, most work done
    by Benjamin Tissoires as well

    3) EIO/ERESTARTSYS is fixed in hiddev/hidraw, fixes by Andrew Duggan
    and Jiri Kosina

    4) ION iCade driver added by Bastien Nocera

    5) Support for a couple new Roccat devices has been added by Stefan
    Achatz

    6) HID sensor hubs are now auto-detected instead of having to list all
    the VID/PID combinations in the blacklist array

    7) other random fixes and support for new device IDs

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (65 commits)
    HID: i2c-hid: add mutex protecting open/close race
    Revert "HID: sensors: add to special driver list"
    HID: sensors: autodetect USB HID sensor hubs
    HID: hidp: fallback to input session properly if hid is blacklisted
    HID: i2c-hid: fix ret_count check
    HID: i2c-hid: fix i2c_hid_get_raw_report count mismatches
    HID: i2c-hid: remove extra .irq field in struct i2c_hid
    HID: i2c-hid: reorder allocation/free of buffers
    HID: i2c-hid: fix memory corruption due to missing hid declaration
    HID: i2c-hid: remove superfluous include
    HID: i2c-hid: remove unneeded test in i2c_hid_remove
    HID: i2c-hid: i2c_hid_get_report may fail
    HID: i2c-hid: also call i2c_hid_free_buffers in i2c_hid_remove
    HID: i2c-hid: fix error messages
    HID: i2c-hid: fix return paths
    HID: i2c-hid: remove unused static declarations
    HID: i2c-hid: fix i2c_hid_dbg macro
    HID: i2c-hid: fix checkpatch.pl warning
    HID: i2c-hid: enhance Kconfig
    HID: i2c-hid: change I2C name
    ...

    Linus Torvalds
     
  • Pull trivial branch from Jiri Kosina:
    "Usual stuff -- comment/printk typo fixes, documentation updates, dead
    code elimination."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    HOWTO: fix double words typo
    x86 mtrr: fix comment typo in mtrr_bp_init
    propagate name change to comments in kernel source
    doc: Update the name of profiling based on sysfs
    treewide: Fix typos in various drivers
    treewide: Fix typos in various Kconfig
    wireless: mwifiex: Fix typo in wireless/mwifiex driver
    messages: i2o: Fix typo in messages/i2o
    scripts/kernel-doc: check that non-void fcts describe their return value
    Kernel-doc: Convention: Use a "Return" section to describe return values
    radeon: Fix typo and copy/paste error in comments
    doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
    various: Fix spelling of "asynchronous" in comments.
    Fix misspellings of "whether" in comments.
    eisa: Fix spelling of "asynchronous".
    various: Fix spelling of "registered" in comments.
    doc: fix quite a few typos within Documentation
    target: iscsi: fix comment typos in target/iscsi drivers
    treewide: fix typo of "suport" in various comments and Kconfig
    treewide: fix typo of "suppport" in various comments
    ...

    Linus Torvalds
     
  • Pull IEEE 1394 (FireWire) subsystem updates from Stefan Richter:
    - IPv4-over-1394: fixes for broadcast and multicast
    - SBP-2: allow thin-provisioning related commands
    - trivia

    * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
    firewire: net: remove unused variable in fwnet_receive_broadcast()
    firewire: net: Fix handling of fragmented multicast/broadcast packets.
    firewire: sbp2: allow WRITE SAME and REPORT SUPPORTED OPERATION CODES
    tools/firewire: nosy-dump: check for allocation failure

    Linus Torvalds
     
  • Pull sound updates from Takashi Iwai:
    "This update contains a fairly wide range of changes all over in sound
    subdirectory, mainly because of UAPI header moves by David and __dev*
    annotation removals by Bill. Other highlights are:

    - Introduced the support for wallclock timestamps in ALSA PCM core

    - Add the poll loop implementation for HD-audio jack detection

    - Yet more VGA-switcheroo fixes for HD-audio

    - New VIA HD-audio codec support

    - More fixes on resource management in USB audio and MIDI drivers

    - More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite,
    Roland VG-99, etc

    - Add support for FastTrack C400 usb-audio

    - Clean ups in many drivers regarding firmware loading

    - Add PSC724 Ultiimate Edge support to ice1712

    - A few hdspm driver updates

    - New Stanton SCS.1d/1m FireWire driver

    - Standardisation of the logging in ASoC codes

    - DT and dmaengine support for ASoC Atmel

    - Support for Wolfson ADSP cores

    - New drivers for Freescale/iVeia P1022 and Maxim MAX98090

    - Lots of other ASoC driver fixes and developments"

    Fix up trivial conflicts. And go out on a limb and assume the dts file
    'status' field of one of the conflicting things was supposed to be
    "disabled", not "disable" like in pretty much all other cases.

    * tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits)
    ALSA: hda - Move runtime PM check to runtime_idle callback
    ALSA: hda - Add stereo-dmic fixup for Acer Aspire One 522
    ALSA: hda - Avoid doubly suspend after vga switcheroo
    ALSA: usb-audio: Enable S/PDIF on the ASUS Xonar U3
    ALSA: hda - Check validity of CORB/RIRB WP reads
    ALSA: hda - use usleep_range in link reset and change timeout check
    ALSA: HDA: VIA: Add support for codec VT1808.
    ALSA: HDA: VIA Add support for codec VT1705CF.
    ASoC: codecs: remove __dev* attributes
    ASoC: utils: remove __dev* attributes
    ASoC: ux500: remove __dev* attributes
    ASoC: txx9: remove __dev* attributes
    ASoC: tegra: remove __dev* attributes
    ASoC: spear: remove __dev* attributes
    ASoC: sh: remove __dev* attributes
    ASoC: s6000: remove __dev* attributes
    ASoC: OMAP: remove __dev* attributes
    ASoC: nuc900: remove __dev* attributes
    ASoC: mxs: remove __dev* attributes
    ASoC: kirkwood: remove __dev* attributes
    ...

    Linus Torvalds
     
  • Pull ARM SoC board updates, take 2 from Olof Johansson:
    "This branch contains board updates for shmobile that had dependencies
    on earlier branches past the first driver branch, and thus are merged
    separately.

    Most of these are to enable audio and USB on shmobile. They contain a
    dependent ASoC branch that has been coordinated with Mark Brown."

    * tag 'boards2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: shmobile: mackerel: Add FLCTL IRQ resource
    ARM: shmobile: use FSI driver's audio clock on ap4evb
    ARM: shmobile: use FSI driver's audio clock on mackerel
    ARM: shmobile: use FSI driver's audio clock on armadillo800eva
    ARM: shmobile: mackerel: enable DMAEngine on USB Host
    ARM: shmobile: marzen: add USB OHCI driver support
    ARM: shmobile: marzen: add USB EHCI driver support
    ARM: shmobile: marzen: add USB phy support
    ASoC: fsi: add master clock control functions
    ASoC: fsi: care fsi_hw_start/stop() return value
    ASoC: fsi: fsi_set_master_clk() was called from fsi_hw_xxx() only
    ASoC: fsi: use devm_request_irq()
    ASoC: fsi: fixup channels_min/max

    Linus Torvalds
     
  • Pull ARM SoC driver specific changes from Olof Johansson:
    "A collection of mostly SoC-specific driver updates:
    - a handful of pincontrol and setup changes
    - new drivers for hwmon and reset controller for vexpress
    - timing support updates for OMAP (gpmc and other interfaces)
    - plus a collection of smaller cleanups"

    * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
    ARM: ux500: fix pin warning
    ARM: OMAP2+: tusb6010: generic timing calculation
    ARM: OMAP2+: smc91x: generic timing calculation
    ARM: OMAP2+: onenand: generic timing calculation
    ARM: OMAP2+: gpmc: generic timing calculation
    ARM: OMAP2+: gpmc: handle additional timings
    ARM: OMAP2+: nand: remove redundant rounding
    gpio: samsung: use pr_* instead of printk
    ARM: ux500: fixup magnetometer pins
    ARM: ux500: add STM pin configuration
    ARM: ux500: 8500: add pinctrl support for uart1 and uart2
    ARM: ux500: cosmetic fixups for uart0
    gpio: samsung: Fix input mode setting function for GPIO int
    ARM: SAMSUNG: Insert bitmap_gpio_int member in samsung_gpio_chip
    ARM: ux500: 8500: define SDI sleep states
    ARM: vexpress: Reset driver
    ARM: ux500: 8500: update SKE keypad pinctrl table
    hwmon: Versatile Express hwmon driver
    ARM: ux500: delete duplicate macro
    ARM: ux500: 8500: add IDLE pin configuration for SPI
    ...

    Linus Torvalds
     
  • Pull ARM SoC power management and clock changes from Olof Johansson:
    "This branch contains a largeish set of updates of power management and
    clock setup. The bulk of it is for OMAP/AM33xx platforms, but also a
    few around hotplug/suspend/resume on Exynos.

    It includes a split-up of some of the OMAP clock data into separate
    files which adds to the diffstat, but gross delta is fairly reasonable."

    * tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (60 commits)
    ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
    ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
    watchdog: OMAP: fixup for ARM multiplatform support
    ARM: EXYNOS: Add flush_cache_all in suspend finisher
    ARM: EXYNOS: Remove scu_enable from cpuidle
    ARM: EXYNOS: Fix soft reboot hang after suspend/resume
    ARM: EXYNOS: Add support for rtc wakeup
    ARM: EXYNOS: fix the hotplug for Cortex-A15
    ARM: OMAP2+: omap_device: Correct resource handling for DT boot
    ARM: OMAP2+: hwmod: Add possibility to count hwmod resources based on type
    ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count
    ARM: OMAP2+: PRM: initialize some PRM functions early
    ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n
    ARM: OMAP4: USB: power down MUSB PHY during boot
    ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts
    ARM: OMAP2xxx: clock: drop obsolete clock data
    ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts
    ARM: OMAP3+: DPLL: drop !CONFIG_COMMON_CLK sections
    ARM: AM33xx: clock: drop obsolete clock data
    ARM: OMAP3xxx: clk: drop obsolete clock data
    ...

    Linus Torvalds
     
  • Pull ARM SoC multiplatform conversion patches from Olof Johansson:
    "Here are more patches in the progression towards multiplatform, sparse
    irq conversions in particular.

    Tegra has a handful of cleanups and general groundwork, but is not
    quite there yet on full enablement.

    Platforms that are enabled through this branch are VT8500 and Zynq.
    Note that i.MX was converted in one of the earlier cleanup branches as
    well (before we started a separate topic for multiplatform). And both
    new platforms for this merge window, sunxi and bcm, were merged with
    multiplatform support enabled."

    Fix up conflicts mostly as per Olof.

    * tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
    ARM: zynq: Remove all unused mach headers
    ARM: zynq: add support for ARCH_MULTIPLATFORM
    ARM: zynq: make use of debug_ll_io_init()
    ARM: zynq: remove TTC early mapping
    ARM: tegra: move debug-macro.S to include/debug
    ARM: tegra: don't include iomap.h from debug-macro.S
    ARM: tegra: decouple uncompress.h and debug-macro.S
    ARM: tegra: simplify DEBUG_LL UART selection options
    ARM: tegra: select SPARSE_IRQ
    ARM: tegra: enhance timer.c to get IO address from device tree
    ARM: tegra: enhance timer.c to get IRQ info from device tree
    ARM: timer: fix checkpatch warnings
    ARM: tegra: add TWD to device tree
    ARM: tegra: define DT bindings for and instantiate RTC
    ARM: tegra: define DT bindings for and instantiate timer
    clocksource/mtu-nomadik: use apb_pclk
    clk: ux500: Register mtu apb_pclocks
    ARM: plat-nomadik: convert platforms to SPARSE_IRQ
    mfd/db8500-prcmu: use the irq_domain_add_simple()
    mfd/ab8500-core: use irq_domain_add_simple()
    ...

    Linus Torvalds