09 Oct, 2012

1 commit

  • Pull sound updates from Takashi Iwai:
    "This contains pretty many small commits covering fairly large range of
    files in sound/ directory. Partly because of additional API support
    and partly because of constantly developed ASoC and ARM stuff.

    Some highlights:

    - Introduced the helper function and documentation for exposing the
    channel map via control API, as discussed in Plumbers; most of PCI
    drivers are covered, will follow more drivers later

    - Most of drivers have been replaced with the new PM callbacks (if
    the bus is supported)

    - HD-audio controller got the support of runtime PM and the support
    of D3 clock-stop. Also changing the power_save option in sysfs
    kicks off immediately to enable / disable the power-save mode.

    - Another significant code change in HD-audio is the rewrite of
    firmware loading code. Other than that, most of changes in
    HD-audio are continued cleanups and standardization for the generic
    auto parser and bug fixes (HBR, device-specific fixups), in
    addition to the support of channel-map API.

    - Addition of ASoC bindings for the compressed API, used by the
    mid-x86 drivers.

    - Lots of cleanups and API refreshes for ASoC codec drivers and
    DaVinci.

    - Conversion of OMAP to dmaengine.

    - New machine driver for Wolfson Microelectronics Bells.

    - New CODEC driver for Wolfson Microelectronics WM0010.

    - Enhancements to the ux500 and wm2000 drivers

    - A new driver for DA9055 and the support for regulator bypass mode."

    Fix up various arm soc header file reorg conflicts.

    * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits)
    ALSA: hda - Add new codec ALC283 ALC290 support
    ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls
    ALSA: hda - fix indices on boost volume on Conexant
    ALSA: aloop - add locking to timer access
    ALSA: hda - Fix hang caused by race during suspend.
    sound: Remove unnecessary semicolon
    ALSA: hda/realtek - Fix detection of ALC271X codec
    ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
    ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event
    ALSA: hda - make a generic unsol event handler
    ASoC: codecs: Add DA9055 codec driver
    ASoC: eukrea-tlv320: Convert it to platform driver
    ALSA: ASoC: add DT bindings for CS4271
    ASoC: wm_hubs: Ensure volume updates are handled during class W startup
    ASoC: wm5110: Adding missing volume update bits
    ASoC: wm5110: Add OUT3R support
    ASoC: wm5110: Add AEC loopback support
    ASoC: wm5110: Rename EPOUT to HPOUT3
    ASoC: arizona: Add more clock rates
    ASoC: arizona: Add more DSP options for mixer input muxes
    ...

    Linus Torvalds
     

08 Oct, 2012

4 commits

  • Pul ACPI & Power Management updates from Len Brown:
    - acpidump utility added
    - intel_idle driver now supports IVB Xeon
    - turbostat utility can now count SMIs
    - ACPI can now bind to USB3 hubs
    - misc fixes

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (49 commits)
    ACPI: Add new sysfs interface to export device description
    ACPI: Harden acpi_table_parse_entries() against BIOS bug
    tools/power/turbostat: add option to count SMIs, re-name some options
    tools/power turbostat: add [-d MSR#][-D MSR#] options to print counter deltas
    intel_idle: enable IVB Xeon support
    tools/power turbostat: add [-m MSR#] option
    tools/power turbostat: make -M output pretty
    tools/power turbostat: print more turbo-limit information
    tools/power turbostat: delete unused line
    tools/power turbostat: run on IVB Xeon
    tools/power/acpi/acpidump: create acpidump(8), local make install targets
    tools/power/acpi/acpidump: version 20101221 - find dynamic tables in sysfs
    ACPI: run _OSC after ACPI_FULL_INITIALIZATION
    tools/power/acpi/acpidump: create acpidump(8), local make install targets
    tools/power/acpi/acpidump: version 20101221 - find dynamic tables in sysfs
    tools/power/acpi/acpidump: version 20071116
    tools/power/acpi/acpidump: version 20070714
    tools/power/acpi/acpidump: version 20060606
    tools/power/acpi/acpidump: version 20051111
    xo15-ebook: convert to module_acpi_driver()
    ...

    Linus Torvalds
     
  • Pull ceph updates from Sage Weil:
    "The bulk of this pull is a series from Alex that refactors and cleans
    up the RBD code to lay the groundwork for supporting the new image
    format and evolving feature set. There are also some cleanups in
    libceph, and for ceph there's fixed validation of file striping
    layouts and a bugfix in the code handling a shrinking MDS cluster."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (71 commits)
    ceph: avoid 32-bit page index overflow
    ceph: return EIO on invalid layout on GET_DATALOC ioctl
    rbd: BUG on invalid layout
    ceph: propagate layout error on osd request creation
    libceph: check for invalid mapping
    ceph: convert to use le32_add_cpu()
    ceph: Fix oops when handling mdsmap that decreases max_mds
    rbd: update remaining header fields for v2
    rbd: get snapshot name for a v2 image
    rbd: get the snapshot context for a v2 image
    rbd: get image features for a v2 image
    rbd: get the object prefix for a v2 rbd image
    rbd: add code to get the size of a v2 rbd image
    rbd: lay out header probe infrastructure
    rbd: encapsulate code that gets snapshot info
    rbd: add an rbd features field
    rbd: don't use index in __rbd_add_snap_dev()
    rbd: kill create_snap sysfs entry
    rbd: define rbd_dev_image_id()
    rbd: define some new format constants
    ...

    Linus Torvalds
     
  • Pull ext4 updates from Ted Ts'o:
    "The big new feature added this time is supporting online resizing
    using the meta_bg feature. This allows us to resize file systems
    which are greater than 16TB. In addition, the speed of online
    resizing has been improved in general.

    We also fix a number of races, some of which could lead to deadlocks,
    in ext4's Asynchronous I/O and online defrag support, thanks to good
    work by Dmitry Monakhov.

    There are also a large number of more minor bug fixes and cleanups
    from a number of other ext4 contributors, quite of few of which have
    submitted fixes for the first time."

    * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (69 commits)
    ext4: fix ext4_flush_completed_IO wait semantics
    ext4: fix mtime update in nodelalloc mode
    ext4: fix ext_remove_space for punch_hole case
    ext4: punch_hole should wait for DIO writers
    ext4: serialize truncate with owerwrite DIO workers
    ext4: endless truncate due to nonlocked dio readers
    ext4: serialize unlocked dio reads with truncate
    ext4: serialize dio nonlocked reads with defrag workers
    ext4: completed_io locking cleanup
    ext4: fix unwritten counter leakage
    ext4: give i_aiodio_unwritten a more appropriate name
    ext4: ext4_inode_info diet
    ext4: convert to use leXX_add_cpu()
    ext4: ext4_bread usage audit
    fs: reserve fallocate flag codepoint
    ext4: remove redundant offset check in mext_check_arguments()
    ext4: don't clear orphan list on ro mount with errors
    jbd2: fix assertion failure in commit code due to lacking transaction credits
    ext4: release donor reference when EXT4_IOC_MOVE_EXT ioctl fails
    ext4: enable FITRIM ioctl on bigalloc file system
    ...

    Linus Torvalds
     
  • Pull i2c updates from Jean Delvare:
    "Most visible changes are the SMBus multiplexing support added to the
    i2c-i801 driver, as well as support for the VIA VX900."

    * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    i2c-piix4: Fix build failure
    i2c: Correct struct i2c_driver doc about detection
    i2c-i801: Let i2c-mux-gpio find the GPIO chip
    i2c-mux-gpio: Update documentation
    i2c-mux-gpio: Add support for dynamically allocated GPIO pins
    i2c-mux-gpio: Use devm_kzalloc instead of kzalloc
    i2c-i801: Support SMBus multiplexing on Asus Z8 series
    i2c-viapro: Add VIA VX900 device ID
    i2c-parport: i2c_parport_irq can be static
    i2c-designware: i2c_dw_xfer_msg can be static
    i2c/scx200_*: Replace printks with pr_s
    i2c: Make I2C available on UML
    i2c: Convert struct i2c_msg initialization to C99 format
    i2c-smbus: Convert kzalloc to devm_kzalloc
    i2c-mux: Add support for device auto-detection

    Linus Torvalds
     

07 Oct, 2012

8 commits

  • Pull ARM updates from Russell King:
    "This is the first chunk of ARM updates for this merge window.
    Conflicts are expected in two files - asm/timex.h and
    mach-integrator/integrator_cp.c. Nothing particularly stands out more
    than anything else.

    Most of the growth is down to the opcodes stuff from Dave Martin,
    which is countered by Rob's patches to use more of the asm-generic
    headers on ARM."

    (A few more conflicts grew since then, but it all looked fairly trivial)

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (44 commits)
    ARM: 7548/1: include linux/sched.h in syscall.h
    ARM: 7541/1: Add ARM ERRATA 775420 workaround
    ARM: ensure vm_struct has its phys_addr member filled in
    ARM: 7540/1: kexec: Check segment memory addresses
    ARM: 7539/1: kexec: scan for dtb magic in segments
    ARM: 7538/1: delay: add registration mechanism for delay timer sources
    ARM: 7536/1: smp: Formalize an IPI for wakeup
    ARM: 7525/1: ptrace: use updated syscall number for syscall auditing
    ARM: 7524/1: support syscall tracing
    ARM: 7519/1: integrator: convert platform devices to Device Tree
    ARM: 7518/1: integrator: convert AMBA devices to device tree
    ARM: 7517/1: integrator: initial device tree support
    ARM: 7516/1: plat-versatile: add DT support to FPGA IRQ
    ARM: 7515/1: integrator: check PL010 base address from resource
    ARM: 7514/1: integrator: call common init function from machine
    ARM: 7522/1: arch_timers: register a time/cycle counter
    ARM: 7523/1: arch_timers: enable the use of the virtual timer
    ARM: 7531/1: mark kernelmode mem{cpy,set} non-experimental
    ARM: 7520/1: Build dtb files in all target
    ARM: Fix build warning in arch/arm/mm/alignment.c
    ...

    Linus Torvalds
     
  • Pull late ARM soc platform updates from Olof Johansson:
    "This branch contains updates to OMAP and Marvell platforms (kirkwood,
    dove, mvebu) that came in after we had done the big multiplatform
    merges, so they were kept separate from the rest, and not separated
    into the traditional topics of cleanup/driver/platform features.

    For OMAP, the updates are:
    - Runtime PM conversions for the GPMC and RNG IP blocks
    - Preparation patches for the OMAP common clock framework conversion
    - clkdev alias additions required by other drivers
    - Performance Monitoring Unit (PMU) support for OMAP2, 3, and
    non-4430 OMAP4
    - OMAP hwmod code and data improvements
    - Preparation patches for the IOMMU runtime PM conversion
    - Preparation patches for OMAP4 full-chip retention support

    For Kirkwood/Dove/mvebu:
    - New driver for "address decoder controller" for mvebu, which is a
    piece of hardware that configures addressable devices and
    peripherals. First user is the boot rom aperture on armada XP
    since it is needed for SMP support.
    - New device tree bindings for peripherals such as gpio-fan, iconnect
    nand, mv_cesa and the above address decoder controller.
    - Some defconfig updates, mostly to enable new DT boards and a few
    drivers.
    - New drivers using the pincontrol subsystem for dove, kirkwood and
    mvebu
    - New clean gpio driver for mvebu"

    * tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (98 commits)
    ARM: mvebu: fix build breaks from multi-platform conversion
    ARM: OMAP4460/4470: PMU: Enable PMU for OMAP4460/70
    ARM: OMAP2+: PMU: Add runtime PM support
    ARM: OMAP4430: PMU: prepare to create PMU device via HWMOD
    ARM: OMAP2+: PMU: Convert OMAP2/3 devices to use HWMOD
    ARM: OMAP3: hwmod data: Add debugss HWMOD data
    ARM: OMAP2+: clockdomain/hwmod: add workaround for EMU clockdomain idle problems
    ARM: OMAP: Add a timer attribute for timers that can interrupt the DSP
    hwrng: OMAP: remove SoC restrictions from driver registration
    ARM: OMAP: split OMAP1, OMAP2+ RNG device registration
    hwrng: OMAP: convert to use runtime PM
    hwrng: OMAP: store per-device data in per-device variables, not file statics
    ARM: OMAP2xxx: hwmod/CM: add RNG integration data
    ARM: OMAP2+: gpmc: minimal driver support
    ARM: OMAP2+: gpmc: Adapt to HWMOD
    ARM: OMAP2/3: hwmod data: add gpmc
    ARM: OMAP4: hwmod data: add mmu hwmod for ipu and dsp
    ARM: OMAP3: hwmod data: add mmu data for iva and isp
    ARM: OMAP: iommu: fix including iommu.h without IOMMU_API selected
    ARM: OMAP4: hwmod data: add missing HWMOD_NO_IDLEST flags to some PRCM IP blocks
    ...

    Linus Torvalds
     
  • Pull media updates from Mauro Carvalho Chehab:
    "The first part of the media updates for Kernel 3.7.

    This series contain:

    - A major tree renaming patch series: now, drivers are organized
    internally by their used bus, instead of by V4L2 and/or DVB API,
    providing a cleaner driver location for hybrid drivers that
    implement both APIs, and allowing to cleanup the Kconfig items and
    make them more intuitive for the end user;

    - Media Kernel developers are typically very lazy with their duties
    of keeping the MAINTAINERS entries for their drivers updated. As
    now the tree is more organized, we're doing an effort to add/update
    those entries for the drivers that aren't currently orphan;

    - Several DVB USB drivers got moved to a new DVB USB v2 core; the new
    core fixes several bugs (as the existing one that got bitroted).
    Now, suspend/resume finally started to work fine (at least with
    some devices - we should expect more work with regards to it);

    - added multistream support for DVB-T2, and unified the API for
    DVB-S2 and ISDB-S. Backward binary support is preserved;

    - as usual, a few new drivers, some V4L2 core improvements and lots
    of drivers improvements and fixes.

    There are some points to notice on this series:

    1) you should expect a trivial merge conflict on your tree, with the
    removal of Documentation/feature-removal-schedule.txt: this series
    would be adding two additional entries there. I opted to not
    rebase it due to this recent change;

    2) With regards to the PCTV 520e udev-related breakage, I opted to
    fix it in a way that the patches can be backported to 3.5 even
    without your firmware fix patch. This way, Greg doesn't need to
    rush backporting your patch (as there are still the firmware cache
    and firmware path customization issues to be addressed there).

    I'll send later a patch (likely after the end of the merge window)
    reverting the rest of the DRX-K async firmware request, fully
    restoring its original behaviour to allow media drivers to
    initialize everything serialized as before for 3.7 and upper.

    3) I'm planning to work on this weekend to test the DMABUF patches
    for V4L2. The patches are on my queue for several Kernel cycles,
    but, up to now, there is/was no way to test the series locally.

    I have some concerns about this particular changeset with regards
    to security issues, and with regards to the replacement of the old
    VIDIOC_OVERLAY ioctl's that is broken on modern systems, due to
    GPU drivers change. The Overlay API allows direct PCI2PCI
    transfers from a media capture card into the GPU framebuffer, but
    its API is crappy. Also, the only existing X11 driver that
    implements it requires a XV extension that is not available
    anymore on modern drivers. The DMABUF can do the same thing, but
    with it is promising to be a properly-designed API. If I can
    successfully test this series and be happy with it, I should be
    asking you to pull them next week."

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (717 commits)
    em28xx: regression fix: use DRX-K sync firmware requests on em28xx
    drxk: allow loading firmware synchrousnously
    em28xx: Make all em28xx extensions to be initialized asynchronously
    [media] tda18271: properly report read errors in tda18271_get_id
    [media] tda18271: delay IR & RF calibration until init() if delay_cal is set
    [media] MAINTAINERS: add Michael Krufky as tda827x maintainer
    [media] MAINTAINERS: add Michael Krufky as tda8290 maintainer
    [media] MAINTAINERS: add Michael Krufky as cxusb maintainer
    [media] MAINTAINERS: add Michael Krufky as lg2160 maintainer
    [media] MAINTAINERS: add Michael Krufky as lgdt3305 maintainer
    [media] MAINTAINERS: add Michael Krufky as mxl111sf maintainer
    [media] MAINTAINERS: add Michael Krufky as mxl5007t maintainer
    [media] MAINTAINERS: add Michael Krufky as tda18271 maintainer
    [media] s5p-tv: Report only multi-plane capabilities in vidioc_querycap
    [media] s5p-mfc: Fix misplaced return statement in s5p_mfc_suspend()
    [media] exynos-gsc: Add missing static storage class specifiers
    [media] exynos-gsc: Remove header file inclusion
    [media] s5p-fimc: Fix incorrect condition in fimc_lite_reqbufs()
    [media] s5p-tv: Fix potential NULL pointer dereference error
    [media] s5k6aa: Fix possible NULL pointer dereference
    ...

    Linus Torvalds
     
  • Pull pstore changes from Anton Vorontsov:

    1) We no longer ad-hoc to the function tracer "high level"
    infrastructure and no longer use its debugfs knobs. The change
    slightly touches kernel/trace directory, but it got the needed ack
    from Steven Rostedt:

    http://lkml.org/lkml/2012/8/21/688

    2) Added maintainers entry;

    3) A bunch of fixes, nothing special.

    * tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore:
    pstore: Avoid recursive spinlocks in the oops_in_progress case
    pstore/ftrace: Convert to its own enable/disable debugfs knob
    pstore/ram: Add missing platform_device_unregister
    MAINTAINERS: Add pstore maintainers
    pstore/ram: Mark ramoops_pstore_write_buf() as notrace
    pstore/ram: Fix printk format warning
    pstore/ram: Fix possible NULL dereference

    Linus Torvalds
     
  • Pull battery updates from Anton Vorontsov:
    "1. New drivers:
    - Marvell 88pm860x charger and battery drivers;
    - Texas Instruments LP8788 charger driver;
    2. Two new power supply properties: whether a battery is authentic,
    and chargers' maximal currents and voltages;
    3. A lot of TI LP8727 Charger cleanups;
    4. New features for Charger Manager, mainly now we can disable
    specific regulators;
    5. Random fixes and cleanups for other drivers."

    Fix up trivial conflicts in

    * tag 'for-v3.7' of git://git.infradead.org/battery-2.6: (52 commits)
    pda_power: Remove ac_draw_failed goto and label
    charger-manager: Add support sysfs entry for charger
    charger-manager: Support limit of maximum possible
    charger-manager: Check fully charged state of battery periodically
    lp8727_charger: More pure cosmetic improvements
    lp8727_charger: Fix checkpatch warning
    lp8727_charger: Add description in the private data
    lp8727_charger: Fix a typo - chg_parm to chg_param
    lp8727_charger: Make some cosmetic changes in lp8727_delayed_func()
    lp8727_charger: Clean up lp8727_charger_changed()
    lp8727_charger: Return if the battery is discharging
    lp8727_charger: Make lp8727_charger_get_propery() simpler
    lp8727_charger: Make lp8727_ctrl_switch() inline
    lp8727_charger: Make lp8727_init_device() shorter
    lp8727_charger: Clean up lp8727_is_charger_attached()
    lp8727_charger: Use specific definition
    lp8727_charger: Clean up lp8727 definitions
    lp8727_charger: Use the definition rather than enum
    lp8727_charger: Fix code for getting battery temp
    lp8727_charger: Clear interrrupts at inital time
    ...

    Linus Torvalds
     
  • Pull ADM Xen support from Konrad Rzeszutek Wilk:

    Features:
    * Allow a Linux guest to boot as initial domain and as normal guests
    on Xen on ARM (specifically ARMv7 with virtualized extensions). PV
    console, block and network frontend/backends are working.
    Bug-fixes:
    * Fix compile linux-next fallout.
    * Fix PVHVM bootup crashing.

    The Xen-unstable hypervisor (so will be 4.3 in a ~6 months), supports
    ARMv7 platforms.

    The goal in implementing this architecture is to exploit the hardware
    as much as possible. That means use as little as possible of PV
    operations (so no PV MMU) - and use existing PV drivers for I/Os
    (network, block, console, etc). This is similar to how PVHVM guests
    operate in X86 platform nowadays - except that on ARM there is no need
    for QEMU. The end result is that we share a lot of the generic Xen
    drivers and infrastructure.

    Details on how to compile/boot/etc are available at this Wiki:

    http://wiki.xen.org/wiki/Xen_ARMv7_with_Virtualization_Extensions

    and this blog has links to a technical discussion/presentations on the
    overall architecture:

    http://blog.xen.org/index.php/2012/09/21/xensummit-sessions-new-pvh-virtualisation-mode-for-arm-cortex-a15arm-servers-and-x86/

    * tag 'stable/for-linus-3.7-arm-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (21 commits)
    xen/xen_initial_domain: check that xen_start_info is initialized
    xen: mark xen_init_IRQ __init
    xen/Makefile: fix dom-y build
    arm: introduce a DTS for Xen unprivileged virtual machines
    MAINTAINERS: add myself as Xen ARM maintainer
    xen/arm: compile netback
    xen/arm: compile blkfront and blkback
    xen/arm: implement alloc/free_xenballooned_pages with alloc_pages/kfree
    xen/arm: receive Xen events on ARM
    xen/arm: initialize grant_table on ARM
    xen/arm: get privilege status
    xen/arm: introduce CONFIG_XEN on ARM
    xen: do not compile manage, balloon, pci, acpi, pcpu and cpu_hotplug on ARM
    xen/arm: Introduce xen_ulong_t for unsigned long
    xen/arm: Xen detection and shared_info page mapping
    docs: Xen ARM DT bindings
    xen/arm: empty implementation of grant_table arch specific functions
    xen/arm: sync_bitops
    xen/arm: page.h definitions
    xen/arm: hypercalls
    ...

    Linus Torvalds
     
  • …implify', 'turbostat' and 'usb3' into release

    add acpidump utility
    intel_idle driver now supports IVB Xeon
    turbostat can now count SMIs
    ACPI can now bind to USB3 hubs
    misc fixes

    Len Brown
     
  • Add support to export the device description obtained from the ACPI _STR
    method, if one exists for a device, to user-space via a sysfs interface.
    This new interface provides a standard and platform neutral way for users
    to obtain the description text stored in the ACPI _STR method. If no
    _STR method exists for the device, no sysfs 'description' file will be
    created. The 'description' file will be located in the /sys/devices/
    directory using the device's path.

    /sys/device///.../firmware_node/description

    Example:

    /sys/devices/pci0000:00/0000:00.07.0/0000:0e:00.0/firmware_node/description

    It can also be located using the ACPI device path, for example:

    /sys/devices/LNXSYSTM:00/device:00/ACPI0004:00/PNP0A08:00/device:13/device:15/description
    /sys/devices/LNXSYSTM:00/device:00/ACPI0004:00/ACPI0004:01/ACPI0007:02/description

    Execute the 'cat' command on the 'description' file to obtain the
    description string for that device.

    This patch also includes documentation describing how the new sysfs
    interface works

    Changes from v1-v2 based on comments by Len Brown and Fengguang Wu
    * Removed output "No Description" and leaving a NULL attribute if the
    _STR method failed to evaluate.

    * In acpi_device_remove_files() removed the redundent check of
    dev->pnp.str_obj before calling free. This check triggered a message
    from smatch.

    Signed-off-by: Lance Ortiz
    Signed-off-by: Len Brown

    Lance Ortiz
     

06 Oct, 2012

12 commits

  • ASoC: Additional updates for v3.7

    A couple more updates for 3.7, enhancements to the ux500 and wm2000
    drivers, a new driver for DA9055 and the support for regulator bypass
    mode. With the exception of the DA9055 this has all had a chance to
    soak in -next (the driver was added on Friday so should be in -next
    today).

    Takashi Iwai
     
  • * Document the possibility to pass relative GPIO pin numbers.
    * Document what platform device IDs to use, so that they do not
    collide.

    Signed-off-by: Jean Delvare
    Cc: Peter Korsgaard

    Jean Delvare
     
  • The SMBus controller in the VIA VX900 appears to be compatible with
    the VIA VX855, so just add the device ID.

    This closes kernel bug #43096.

    Signed-off-by: Jean Delvare

    Jean Delvare
     
  • Pull powerpc updates from Benjamin Herrenschmidt:
    "Some highlights in addition to the usual batch of fixes:

    - 64TB address space support for 64-bit processes by Aneesh Kumar

    - Gavin Shan did a major cleanup & re-organization of our EEH support
    code (IBM fancy PCI error handling & recovery infrastructure) which
    paves the way for supporting different platform backends, along
    with some rework of the PCIe code for the PowerNV platform in order
    to remove home made resource allocations and instead use the
    generic code (which is possible after some small improvements to it
    done by Gavin).

    - Uprobes support by Ananth N Mavinakayanahalli

    - A pile of embedded updates from Freescale folks, including new SoC
    and board supports, more KVM stuff including preparing for 64-bit
    BookE KVM support, ePAPR 1.1 updates, etc..."

    Fixup trivial conflicts in drivers/scsi/ipr.c

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (146 commits)
    powerpc/iommu: Fix multiple issues with IOMMU pools code
    powerpc: Fix VMX fix for memcpy case
    driver/mtd:IFC NAND:Initialise internal SRAM before any write
    powerpc/fsl-pci: use 'Header Type' to identify PCIE mode
    powerpc/eeh: Don't release eeh_mutex in eeh_phb_pe_get
    powerpc: Remove tlb batching hack for nighthawk
    powerpc: Set paca->data_offset = 0 for boot cpu
    powerpc/perf: Sample only if SIAR-Valid bit is set in P7+
    powerpc/fsl-pci: fix warning when CONFIG_SWIOTLB is disabled
    powerpc/mpc85xx: Update interrupt handling for IFC controller
    powerpc/85xx: Enable USB support in p1023rds_defconfig
    powerpc/smp: Do not disable IPI interrupts during suspend
    powerpc/eeh: Fix crash on converting OF node to edev
    powerpc/eeh: Lock module while handling EEH event
    powerpc/kprobe: Don't emulate store when kprobe stwu r1
    powerpc/kprobe: Complete kprobe and migrate exception frame
    powerpc/kprobe: Introduce a new thread flag
    powerpc: Remove unused __get_user64() and __put_user64()
    powerpc/eeh: Global mutex to protect PE tree
    powerpc/eeh: Remove EEH PE for normal PCI hotplug
    ...

    Linus Torvalds
     
  • Merge misc patches from Andrew Morton:
    "The MM tree is rather stuck while I wait to find out what the heck is
    happening with sched/numa. Probably I'll need to route around all the
    code which was added to -next, sigh.

    So this is "everything else", or at least most of it - other small
    bits are still awaiting resolutions of various kinds."

    * emailed patches from Andrew Morton : (180 commits)
    lib/decompress.c add __init to decompress_method and data
    kernel/resource.c: fix stack overflow in __reserve_region_with_split()
    omfs: convert to use beXX_add_cpu()
    taskstats: cgroupstats_user_cmd() may leak on error
    aoe: update aoe-internal version number to 50
    aoe: update documentation to better reflect aoe-plus-udev usage
    aoe: remove unused code
    aoe: make dynamic block minor numbers the default
    aoe: update and specify AoE address guards and error messages
    aoe: retain static block device numbers for backwards compatibility
    aoe: support more AoE addresses with dynamic block device minor numbers
    aoe: update documentation with new URL and VM settings reference
    aoe: update copyright year in touched files
    aoe: update internal version number to 49
    aoe: remove unused code and add cosmetic improvements
    aoe: increase net_device reference count while using it
    aoe: associate frames with the AoE storage target
    aoe: disallow unsupported AoE minor addresses
    aoe: do revalidation steps in order
    aoe: failover remote interface based on aoe_deadsecs parameter
    ...

    Linus Torvalds
     
  • Signed-off-by: Ed Cashin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ed Cashin
     
  • The old area has a new URL. Also, now that the driver can perform better,
    it is worth mentioning the VM settings that help aoe to sink dirty pages
    out early, avoiding unecessary memory pressure when much I/O is going on.

    Signed-off-by: Ed Cashin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Ed Cashin
     
  • Some coredump handlers want to create a core file in a way compatible with
    standard behavior. Standard behavior with fs.suid_dumpable = 2 is to
    create core file with uid=gid=0. However, there was no way for coredump
    handler to know that the process being dumped was suid'ed.

    This patch adds the new %d specifier for format_corename() which simply
    reports __get_dumpable(mm->flags), this is compatible with
    /proc/sys/fs/suid_dumpable we already have.

    Addresses https://bugzilla.redhat.com/show_bug.cgi?id=787135

    Developed during a discussion with Denys Vlasenko.

    Signed-off-by: Oleg Nesterov
    Cc: Denys Vlasenko
    Cc: Alex Kelly
    Cc: Andi Kleen
    Cc: Cong Wang
    Cc: Jiri Moskovcak
    Acked-by: Neil Horman
    Cc: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Oleg Nesterov
     
  • Add an RTC driver for Freescale Secure Non-Volatile Storage (SNVS)
    Low Power (LP) RTC.

    Signed-off-by: Shawn Guo
    Reviewed-by: Stephen Boyd
    Cc: Alessandro Zummo
    Cc: Kim Phillips
    Cc: Sascha Hauer
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Shawn Guo
     
  • To get time information via /proc/driver/rtc, only the first device (rtc0)
    is used. If the rtcN (eg. rtc1 or rtc2) is used for the system clock,
    there is no way to get information of rtcN via /proc/driver/rtc. With
    this patch, the time data can be retrieved from the system clock RTC.

    If the RTC_HCTOSYS_DEVICE is not defined, then rtc0 is used by default.

    Signed-off-by: Milo(Woogyom) Kim
    Cc: Alessandro Zummo
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kim, Milo
     
  • The block comment style in net/ and drivers/net is non-standard.
    Document it.

    Signed-off-by: Joe Perches
    Cc: "Allan, Bruce W"
    Cc: Andy Whitcroft
    Cc: David Miller
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Acked-by: Andrei Emeltchenko
    Signed-off-by: Andy Shevchenko
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andy Shevchenko
     

05 Oct, 2012

4 commits

  • Pull MFD changes from Samuel Ortiz:
    "MFD bits for the 3.7 merge window.

    As usual we have a few new drivers:

    - TI LP8788
    - TI OMAP USB TLL
    - Maxim MAX8907
    - SMSC ECE1099
    - Dialog Semiconductor DA9055
    - A simpler syscon driver that allow us to get rid of the anatop one.

    Drivers are also gradually getting Device Tree and IRQ domain support.

    The following drivers got DT support:
    - palmas, 88pm860x, tc3589x and twl4030-audio

    And those ones now use the IRQ domain APIs:
    - 88pm860x, tc3589x, db8500_prcmu

    Also some other interesting changes:
    - Intel's ICH LPC now supports Lynx Point
    - TI's twl4030-audio added a GPO child
    - tps6527 enabled its backlight subdevice
    - The twl6030 pwm driver moved to the new PWM subsystem

    And finally a bunch of cleanup and casual fixes for mc13xxx, 88pm860x,
    palmas, ab8500, wm8994, wm5110, max8907 and the tps65xxx family."

    Fix up various annoying conflicts: the DT and IRQ domain support came in
    twice and was already in 3.6. And then it was apparently rebased.

    Guys, DON'T REBASE!

    * tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (89 commits)
    ARM: dts: Enable 88pm860x pmic
    mfd: 88pm860x: Move gpadc init into touch
    mfd: 88pm860x: Device tree support
    mfd: 88pm860x: Use irqdomain
    mfd: smsc: Add support for smsc gpio io/keypad driver
    backlight: tps65217_bl: Add missing platform_set_drvdata in tps65217_bl_probe
    mfd: DA9055 core driver
    mfd: tps65910: Add alarm interrupt of TPS65910 RTC to mfd device list
    mfd: wm5110: Add register patches for revision B
    mfd: wm5110: Disable control interface error report for WM5110 rev B
    mfd: max8907: Remove regulator-compatible from DT docs
    backlight: Add TPS65217 WLED driver
    mfd: Add backlight as subdevice to the tps65217
    mfd: Provide the PRCMU with its own IRQ domain
    mfd: Fix max8907 sparse warning
    mfd: Add lp8788 mfd driver
    mfd: dbx500: Provide a more accurate smp_twd clock
    mfd: rc5t583: Fix warning messages
    regulator: palmas: Add DT support
    mfd: palmas: Change regulator defns to better suite DT
    ...

    Linus Torvalds
     
  • …opcodes' and 'syscall' into for-linus

    Russell King
     
  • Pull KVM updates from Avi Kivity:
    "Highlights of the changes for this release include support for vfio
    level triggered interrupts, improved big real mode support on older
    Intels, a streamlines guest page table walker, guest APIC speedups,
    PIO optimizations, better overcommit handling, and read-only memory."

    * tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (138 commits)
    KVM: s390: Fix vcpu_load handling in interrupt code
    KVM: x86: Fix guest debug across vcpu INIT reset
    KVM: Add resampling irqfds for level triggered interrupts
    KVM: optimize apic interrupt delivery
    KVM: MMU: Eliminate pointless temporary 'ac'
    KVM: MMU: Avoid access/dirty update loop if all is well
    KVM: MMU: Eliminate eperm temporary
    KVM: MMU: Optimize is_last_gpte()
    KVM: MMU: Simplify walk_addr_generic() loop
    KVM: MMU: Optimize pte permission checks
    KVM: MMU: Update accessed and dirty bits after guest pagetable walk
    KVM: MMU: Move gpte_access() out of paging_tmpl.h
    KVM: MMU: Optimize gpte_access() slightly
    KVM: MMU: Push clean gpte write protection out of gpte_access()
    KVM: clarify kvmclock documentation
    KVM: make processes waiting on vcpu mutex killable
    KVM: SVM: Make use of asm.h
    KVM: VMX: Make use of asm.h
    KVM: VMX: Make lto-friendly
    KVM: x86: lapic: Clean up find_highest_vector() and count_vectors()
    ...

    Conflicts:
    arch/s390/include/asm/processor.h
    arch/x86/kvm/i8259.c

    Linus Torvalds
     
  • Pull remoteproc update from Ohad Ben-Cohen:

    - Remoteproc Recovery - by Fernando Guzman Lugo

    When a remote processor crash is detected, this mechanism will remove
    all virtio children devices, wait until their drivers let go, hard
    reset the remote processor and reload the firmware (resulting in the
    relevant virtio children devices re-added). Essentially the entire
    software stack is reset, together with the relevant hardware, so
    users don't have to reset the entire phone.

    - STE Modem driver is added - by Sjur Brændeland

    - OMAP DSP boot address support is added - by Juan Gutierrez

    - A handful of fixes/cleanups - Sjur Brændeland, Dan Carpenter, Emil
    Goode

    * tag 'remoteproc-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
    remoteproc: Fix use of format specifyer
    remoteproc: fix a potential NULL-dereference on cleanup
    remoteproc: select VIRTIO to avoid build breakage
    remoteproc: return -EFAULT on copy_from_user failure
    remoteproc: snprintf() can return more than was printed
    remoteproc: Add STE modem driver
    remtoteproc: maintain max notifyid
    remoteproc: create a 'recovery' debugfs entry
    remoteproc: add actual recovery implementation
    remoteproc: add rproc_report_crash function to notify rproc crashes
    remoteproc: Add dependency to HAS_DMA
    remoteproc/omap: set bootaddr support

    Linus Torvalds
     

04 Oct, 2012

3 commits

  • Pull drm merge (part 1) from Dave Airlie:
    "So first of all my tree and uapi stuff has a conflict mess, its my
    fault as the nouveau stuff didn't hit -next as were trying to rebase
    regressions out of it before we merged.

    Highlights:
    - SH mobile modesetting driver and associated helpers
    - some DRM core documentation
    - i915 modesetting rework, haswell hdmi, haswell and vlv fixes, write
    combined pte writing, ilk rc6 support,
    - nouveau: major driver rework into a hw core driver, makes features
    like SLI a lot saner to implement,
    - psb: add eDP/DP support for Cedarview
    - radeon: 2 layer page tables, async VM pte updates, better PLL
    selection for > 2 screens, better ACPI interactions

    The rest is general grab bag of fixes.

    So why part 1? well I have the exynos pull req which came in a bit
    late but was waiting for me to do something they shouldn't have and it
    looks fairly safe, and David Howells has some more header cleanups
    he'd like me to pull, that seem like a good idea, but I'd like to get
    this merge out of the way so -next dosen't get blocked."

    Tons of conflicts mostly due to silly include line changes, but mostly
    mindless. A few other small semantic conflicts too, noted from Dave's
    pre-merged branch.

    * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (447 commits)
    drm/nv98/crypt: fix fuc build with latest envyas
    drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
    drm/nv41/vm: fix and enable use of "real" pciegart
    drm/nv44/vm: fix and enable use of "real" pciegart
    drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
    drm/nouveau: store supported dma mask in vmmgr
    drm/nvc0/ibus: initial implementation of subdev
    drm/nouveau/therm: add support for fan-control modes
    drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
    drm/nouveau/therm: calculate the pwm divisor on nv50+
    drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
    drm/nouveau/therm: move thermal-related functions to the therm subdev
    drm/nouveau/bios: parse the pwm divisor from the perf table
    drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
    drm/nouveau/therm: rework thermal table parsing
    drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
    drm/nouveau: fix pm initialization order
    drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
    drm/nouveau: log channel debug/error messages from client object rather than drm client
    drm/nouveau: have drm debugging macros build on top of core macros
    ...

    Linus Torvalds
     
  • Pull preparatory patches for user API disintegration from David Howells:
    "The patches herein prepare for the extraction of the Userspace API
    bits from the various header files named in the Kbuild files.

    New subdirectories are created under either include/uapi/ or
    arch/x/include/uapi/ that correspond to the subdirectory containing
    that file under include/ or arch/x/include/.

    The new subdirs under the uapi/ directory are populated with Kbuild
    files that mostly do nothing at this time. Further patches will
    disintegrate the headers in each original directory and fill in the
    Kbuild files as they do it.

    These patches also:

    (1) fix up #inclusions of "foo.h" rather than .

    (2) Remove some redundant #includes from the DRM code.

    (3) Make the kernel build infrastructure handle Kbuild files both in
    the old places and the new UAPI place that both specify headers
    to be exported.

    (4) Fix some kernel tools that #include kernel headers during their
    build.

    I have compile tested this with allyesconfig against x86_64,
    allmodconfig against i386 and a scattering of additional defconfigs of
    other arches. Prepared for main script

    Signed-off-by: David Howells
    Acked-by: Arnd Bergmann
    Acked-by: Thomas Gleixner
    Acked-by: Michael Kerrisk
    Acked-by: Paul E. McKenney
    Acked-by: Dave Jones
    Acked-by: H. Peter Anvin "

    * tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers:
    UAPI: Plumb the UAPI Kbuilds into the user header installation and checking
    UAPI: x86: Differentiate the generated UAPI and internal headers
    UAPI: Remove the objhdr-y export list
    UAPI: Move linux/version.h
    UAPI: Set up uapi/asm/Kbuild.asm
    UAPI: x86: Fix insn_sanity build failure after UAPI split
    UAPI: x86: Fix the test_get_len tool
    UAPI: (Scripted) Set up UAPI Kbuild files
    UAPI: Partition the header include path sets and add uapi/ header directories
    UAPI: (Scripted) Convert #include "..." to #include in kernel system headers
    UAPI: (Scripted) Convert #include "..." to #include in drivers/gpu/
    UAPI: (Scripted) Remove redundant DRM UAPI header #inclusions from drivers/gpu/.
    UAPI: Refer to the DRM UAPI headers with and from certain headers only

    Linus Torvalds
     
  • Pull devicetree updates from Rob Herring:
    - Import of latest upstream device tree compiler (dtc)
    - New function of_get_child_by_name
    - Support for #size-cells of 0 and #addr-cells of >2
    - Couple of DT binding documentation updates

    Fix up trivial conflicts due to of_get_child_by_name() having been added
    next to the new of_get_next_available_child().

    * tag 'dt-for-3.7' of git://sources.calxeda.com/kernel/linux:
    MAINTAINERS: add scripts/dtc under Devicetree maintainers
    dtc: import latest upstream dtc
    dt: Document general interrupt controller bindings
    dt/s3c64xx/spi: Use of_get_child_by_name to get a named child
    dt: introduce of_get_child_by_name to get child node by name
    of: i2c: add support for wakeup-source property
    of/address: Handle #address-cells > 2 specially
    DT: export of_irq_to_resource_table()
    devicetree: serial: Add documentation for imx serial
    devicetree: pwm: mxs-pwm.txt: Fix reg field annotation
    of: Allow busses with #size-cells=0

    Linus Torvalds
     

03 Oct, 2012

8 commits

  • Pull JFS update from Dave Kleikamp:
    "JFS TRIM support and some minor fixes"

    * tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy:
    jfs: Fix do_div precision in commit b40c2e66
    JFS: use list_move instead of list_del/list_add
    jfs: Remove obsolete email address
    fs/jfs: TRIM support for JFS Filesystem

    Linus Torvalds
     
  • Pull security subsystem updates from James Morris:
    "Highlights:

    - Integrity: add local fs integrity verification to detect offline
    attacks
    - Integrity: add digital signature verification
    - Simple stacking of Yama with other LSMs (per LSS discussions)
    - IBM vTPM support on ppc64
    - Add new driver for Infineon I2C TIS TPM
    - Smack: add rule revocation for subject labels"

    Fixed conflicts with the user namespace support in kernel/auditsc.c and
    security/integrity/ima/ima_policy.c.

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (39 commits)
    Documentation: Update git repository URL for Smack userland tools
    ima: change flags container data type
    Smack: setprocattr memory leak fix
    Smack: implement revoking all rules for a subject label
    Smack: remove task_wait() hook.
    ima: audit log hashes
    ima: generic IMA action flag handling
    ima: rename ima_must_appraise_or_measure
    audit: export audit_log_task_info
    tpm: fix tpm_acpi sparse warning on different address spaces
    samples/seccomp: fix 31 bit build on s390
    ima: digital signature verification support
    ima: add support for different security.ima data types
    ima: add ima_inode_setxattr/removexattr function and calls
    ima: add inode_post_setattr call
    ima: replace iint spinblock with rwlock/read_lock
    ima: allocating iint improvements
    ima: add appraise action keywords and default rules
    ima: integrity appraisal extension
    vfs: move ima_file_free before releasing the file
    ...

    Linus Torvalds
     
  • This is a major rework of the nouveau driver core, to reflect more closely
    how the hw is used and to make it easier to implement newer features now
    that the GPUs are more clearly understood than when nouveau started.

    It also contains a few other bits:
    thermal patches
    nv41/44 pcie gart fixes
    i2c unregistering fixes.

    * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (191 commits)
    drm/nv98/crypt: fix fuc build with latest envyas
    drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
    drm/nv41/vm: fix and enable use of "real" pciegart
    drm/nv44/vm: fix and enable use of "real" pciegart
    drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
    drm/nouveau: store supported dma mask in vmmgr
    drm/nvc0/ibus: initial implementation of subdev
    drm/nouveau/therm: add support for fan-control modes
    drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
    drm/nouveau/therm: calculate the pwm divisor on nv50+
    drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
    drm/nouveau/therm: move thermal-related functions to the therm subdev
    drm/nouveau/bios: parse the pwm divisor from the perf table
    drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
    drm/nouveau/therm: rework thermal table parsing
    drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
    drm/nouveau: fix pm initialization order
    drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
    drm/nouveau: log channel debug/error messages from client object rather than drm client
    drm/nouveau: have drm debugging macros build on top of core macros
    ...

    Conflicts:
    drivers/gpu/drm/nouveau/nouveau_dp.c

    Dave Airlie
     
  • Pull CMA and DMA-mapping updates from Marek Szyprowski:
    "This time the pull request is rather small, because the further
    redesign patches were not ready on time.

    This pull request consists of the patches which extend ARM DMA-mapping
    subsystem with support for CPU coherent (ACP) DMA busses. The first
    client of the new version is HighBank SATA driver. The second part of
    the pull request includes various cleanup for both CMA common code and
    ARM DMA-mapping subsystem."

    Fix up trivial add-add conflict due to the "dma-coherent" DT property
    being added next to the "calxeda,port-phys" property for the Calxeda
    AHCI controller.

    * 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
    ARM: dma-mapping: Remove unsed var at arm_coherent_iommu_unmap_page
    ARM: highbank: add coherent DMA setup
    ARM: kill off arch_is_coherent
    ARM: add coherent iommu dma ops
    ARM: add coherent dma ops
    ARM: dma-mapping: Refrain noisy console message
    ARM: dma-mapping: Small logical clean up
    drivers: dma-contiguous: refactor dma_alloc_from_contiguous()

    Linus Torvalds
     
  • Pull first round of SCSI updates from James Bottomley:
    "This is a large set of updates, mostly for drivers (qla2xxx [including
    support for new 83xx based card], qla4xxx, mpt2sas, bfa, zfcp, hpsa,
    be2iscsi, isci, lpfc, ipr, ibmvfc, ibmvscsi, megaraid_sas).

    There's also a rework for tape adding virtually unlimited numbers of
    tape drives plus a set of dif fixes for sd and a fix for a live lock
    on hot remove of SCSI devices.

    This round includes a signed tag pull of isci-for-3.6

    Signed-off-by: James Bottomley "

    Fix up trivial conflict in drivers/scsi/qla2xxx/qla_nx.c due to new PCI
    helper function use in a function that was removed by this pull.

    * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (198 commits)
    [SCSI] st: remove st_mutex
    [SCSI] sd: Ensure we correctly disable devices with unknown protection type
    [SCSI] hpsa: gen8plus Smart Array IDs
    [SCSI] qla4xxx: Update driver version to 5.03.00-k1
    [SCSI] qla4xxx: Disable generating pause frames for ISP83XX
    [SCSI] qla4xxx: Fix double clearing of risc_intr for ISP83XX
    [SCSI] qla4xxx: IDC implementation for Loopback
    [SCSI] qla4xxx: update copyrights in LICENSE.qla4xxx
    [SCSI] qla4xxx: Fix panic while rmmod
    [SCSI] qla4xxx: Fail probe_adapter if IRQ allocation fails
    [SCSI] qla4xxx: Prevent MSI/MSI-X falling back to INTx for ISP82XX
    [SCSI] qla4xxx: Update idc reg in case of PCI AER
    [SCSI] qla4xxx: Fix double IDC locking in qla4_8xxx_error_recovery
    [SCSI] qla4xxx: Clear interrupt while unloading driver for ISP83XX
    [SCSI] qla4xxx: Print correct IDC version
    [SCSI] qla4xxx: Added new mbox cmd to pass driver version to FW
    [SCSI] scsi_dh_alua: Enable STPG for unavailable ports
    [SCSI] scsi_remove_target: fix softlockup regression on hot remove
    [SCSI] ibmvscsi: Fix host config length field overflow
    [SCSI] ibmvscsi: Remove backend abstraction
    ...

    Linus Torvalds
     
  • Pull power management updates from Rafael J Wysocki:

    - Improved system suspend/resume and runtime PM handling for the SH
    TMU, CMT and MTU2 clock event devices (also used by ARM/shmobile).

    - Generic PM domains framework extensions related to cpuidle support
    and domain objects lookup using names.

    - ARM/shmobile power management updates including improved support for
    the SH7372's A4S power domain containing the CPU core.

    - cpufreq changes related to AMD CPUs support from Matthew Garrett,
    Andre Przywara and Borislav Petkov.

    - cpu0 cpufreq driver from Shawn Guo.

    - cpufreq governor fixes related to the relaxing of limit from Michal
    Pecio.

    - OMAP cpufreq updates from Axel Lin and Richard Zhao.

    - cpuidle ladder governor fixes related to the disabling of states from
    Carsten Emde and me.

    - Runtime PM core updates related to the interactions with the system
    suspend core from Alan Stern and Kevin Hilman.

    - Wakeup sources modification allowing more helper functions to be
    called from interrupt context from John Stultz and additional
    diagnostic code from Todd Poynor.

    - System suspend error code path fix from Feng Hong.

    Fixed up conflicts in cpufreq/powernow-k8 that stemmed from the
    workqueue fixes conflicting fairly badly with the removal of support for
    hardware P-state chips. The changes were independent but somewhat
    intertwined.

    * tag 'pm-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)
    Revert "PM QoS: Use spinlock in the per-device PM QoS constraints code"
    PM / Runtime: let rpm_resume() succeed if RPM_ACTIVE, even when disabled, v2
    cpuidle: rename function name "__cpuidle_register_driver", v2
    cpufreq: OMAP: Check IS_ERR() instead of NULL for omap_device_get_by_hwmod_name
    cpuidle: remove some empty lines
    PM: Prevent runtime suspend during system resume
    PM QoS: Use spinlock in the per-device PM QoS constraints code
    PM / Sleep: use resume event when call dpm_resume_early
    cpuidle / ACPI : move cpuidle_device field out of the acpi_processor_power structure
    ACPI / processor: remove pointless variable initialization
    ACPI / processor: remove unused function parameter
    cpufreq: OMAP: remove loops_per_jiffy recalculate for smp
    sections: fix section conflicts in drivers/cpufreq
    cpufreq: conservative: update frequency when limits are relaxed
    cpufreq / ondemand: update frequency when limits are relaxed
    properly __init-annotate pm_sysrq_init()
    cpufreq: Add a generic cpufreq-cpu0 driver
    PM / OPP: Initialize OPP table from device tree
    ARM: add cpufreq transiton notifier to adjust loops_per_jiffy for smp
    cpufreq: Remove support for hardware P-state chips from powernow-k8
    ...

    Linus Torvalds
     
  • Pull libata changes from Jeff Garzik:
    "Minor libata updates, nothing notable.

    1) Apply -- and then revert -- the FUA feature. Caused disk
    corruption in linux-next, proving it cannot be turned on by
    default.

    Net effect to upstream tree: zero

    2) New AHCI platform driver sata_highbank

    3) Improve SCSI MODE SENSE handling; support MODE SELECT

    4) AHCI: support aggressive device sleep (power mgmt)

    5) sata_fsl: minor fix

    6) pata_arasan: clk support"

    * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
    sata_mv: Fix warnings when no PCI
    [libata] Makefile: Fix build error in sata_highbank
    [libata] export ata_dev_set_feature()
    libata-core: use ATA_LBA in ata_build_rw_tf()
    ata/ahci_platform: Add clock framework support
    pata_arasan: add Device Tree probing capability
    pata_arasan: Add clk_{un}prepare() support
    ata: add platform driver for Calxeda AHCI controller
    sata_fsl: add workaround for data length mismatch on freescale V2 controller
    ahci: implement aggressive SATA device sleep support
    ata: define enum constants for IDENTIFY DEVICE
    Revert "libata: enable SATA disk fua detection on default"
    [libata] scsi: implement MODE SELECT command
    [libata] scsi: support MODE SENSE request for changeable and default parameters
    [libata] scsi: Remove unlikely() from FUA check
    libata: enable SATA disk fua detection on default

    Linus Torvalds
     
  • Pull spi updates from Mark Brown:
    "No framework work here, only a bunch of driver updates of varying
    sizes:

    - Factoring out of the core hardware support from the MXS MMC driver
    by Marek Vasut to allow the hardware to also be used for SPI.
    - Lots of error handling cleanups from Guenter Roeck
    - Removal of the existing Tegra driver which is quite comprehensively
    broken as detailed in the changelog for the removal.
    - DT suppport for the PL022 and GPIO drivers.
    - pinctrl support for OMAP and PL022."

    Pulling from Mark Brown as Grant Likely is still busy moving.

    * tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc: (53 commits)
    spi: remove completely broken Tegra driver
    spi/imx: set the inactive state of the clock according to the clock polarity
    spi/pl022: get/put resources on suspend/resume
    spi/pl022: use more managed resources
    spi/pl022: Devicetree support w/o platform data
    spi/s3c64xx: Don't free controller_data on non-dt platforms
    spi: omap2-mcspi: add pinctrl support
    spi/pl022: adopt pinctrl support
    spi: omap2-mcspi: Cleanup the omap2_mcspi_txrx_dma function
    spi/gpio: Fix stub for spi_gpio_probe_dt()
    spi/mxs: Make the SPI block clock speed configurable via DT
    spi: spi-sh-hspi: drop frees of devm_ alloc'd data
    spi/pl022: Fix chipselects pointer computation
    spi: spi-tle62x0: Use module_spi_driver macro
    mxs/spi: Rework the mxs_ssp_timeout to be more readable
    mxs/spi: Decrement the DMA/PIO border
    mxs/spi: Increment the transfer length only if transfer succeeded
    mxs/spi: Fix issues when doing long continuous transfer
    spi: spi-gpio: Add DT bindings
    spi: spi-gpio: store chipselect information in private structure
    ...

    Linus Torvalds