20 Aug, 2013

2 commits

  • To fix:

    # Untracked files:
    # (use "git add ..." to include in what will be committed)
    #
    # samples/hidraw/hid-example

    as seen in git status output after an allyesconfig build.

    Signed-off-by: Paul Gortmaker
    Signed-off-by: Jiri Kosina

    Paul Gortmaker
     
  • Until today all gamepad input drivers report their data differently. It is
    nearly impossible to write applications for more than one device in a
    generic way. Therefore, this patch introduces a uniform gamepad API which
    will be used for all new drivers.

    Instead of mapping buttons by their labels, we now map them by position.
    This allows applications to work with any gamepad regardless of the labels
    on the buttons. Furthermore, we standardize the ABS_* codes for analog
    triggers and sticks.

    For D-Pads the long overdue BTN_DPAD_* codes are introduced. They should
    be fairly obvious how to use. To avoid confusion, the action buttons now
    have BTN_EAST/SOUTH/WEST/NORTH aliases.

    Reported-by: Todd Showalter
    Signed-off-by: David Herrmann
    Acked-by: Dmitry Torokhov
    Signed-off-by: Jiri Kosina

    David Herrmann
     

09 Aug, 2013

1 commit

  • This changes puts the commit 4fe9f8e203f back in place
    with the fixes for slab corruption because of the commit.

    When a device is unplugged, wait for all processes that
    have opened the device to close before deallocating the device.

    This commit was solving kernel crash because of the corruption in
    rb tree of vmalloc. The rootcause was the device data pointer was
    geting excessed after the memory associated with hidraw was freed.

    The commit 4fe9f8e203f was buggy as it was also freeing the hidraw
    first and then calling delete operation on the list associated with
    that hidraw leading to slab corruption.

    Signed-off-by: Manoj Chourasia
    Tested-by: Peter Wu
    Cc: stable@vger.kernel.org
    Signed-off-by: Jiri Kosina

    Manoj Chourasia
     

05 Aug, 2013

2 commits


01 Aug, 2013

1 commit

  • The ll_driver's .hidinput_input_event() method is called from
    atomic context [1]. Use GFP_ATOMIC for allocation of the
    synthesized hid report.

    BUG: sleeping function called from invalid context at /home/peter/src/kernels/next/mm/slub.c:941
    in_atomic(): 1, irqs_disabled(): 1, pid: 2095, name: Xorg
    INFO: lockdep is turned off.
    irq event stamp: 1502178
    hardirqs last enabled at (1502177): [] _raw_spin_unlock_irqrestore+0x65/0x80
    hardirqs last disabled at (1502178): [] common_interrupt+0x6a/0x6f
    softirqs last enabled at (1501802): [] __do_softirq+0x183/0x420
    softirqs last disabled at (1501799): [] irq_exit+0xb5/0xc0
    CPU: 3 PID: 2095 Comm: Xorg Not tainted 3.11-next-20130725-xeon+lockdep #20130725
    Hardware name: Dell Inc. Precision WorkStation T5400 /0RW203, BIOS A11 04/30/2012
    ffffffff81a662e0 ffff8802adcf9ca8 ffffffff8177c330 0000000000000000
    ffff8802a76d2440 ffff8802adcf9cd8 ffffffff810867d0 ffff8802a7ac8000
    0000000000000010 00000000ffffffff 00000000000000d0 ffff8802adcf9d38
    Call Trace:
    [] dump_stack+0x4f/0x84
    [] __might_sleep+0x140/0x1f0
    [] __kmalloc+0x6b/0x2e0
    [] ? hid_alloc_report_buf+0x28/0x30 [hid]
    [] hid_alloc_report_buf+0x28/0x30 [hid]
    [] logi_dj_ll_input_event+0xb0/0x1b0 [hid_logitech_dj]
    [] input_handle_event+0x8e/0x540
    [] ? input_inject_event+0x5d/0x220
    [] input_inject_event+0x1c0/0x220
    [] ? input_inject_event+0x44/0x220
    [] ? might_fault+0xa0/0xb0
    [] ? might_fault+0x57/0xb0
    [] evdev_write+0xde/0x160
    [] vfs_write+0xc8/0x1f0
    [] SyS_write+0x55/0xa0
    [] system_call_fastpath+0x16/0x1b

    Signed-off-by: Peter Hurley
    Signed-off-by: Jiri Kosina

    Peter Hurley
     

29 Jul, 2013

1 commit

  • The driver currently only supports the Dual Arcade controller.
    It fixes the negative axis event values (the devices sends -2) to match the
    logical axis minimum of the HID report descriptor (the report announces -1).
    It is needed because hid-input discards out of bounds values.

    Signed-off-by: Olivier Scherler
    Signed-off-by: Jiri Kosina

    Olivier Scherler
     

23 Jul, 2013

1 commit


22 Jul, 2013

2 commits

  • 27ce4050 ("HID: fix data access in implement()") by mistake removed
    a setting of buffer size in hidp. Fix that by putting it back.

    Reported-by: kbuild test robot
    Signed-off-by: Jiri Kosina

    Jiri Kosina
     
  • implement() is setting bytes in LE data stream. In case the data is not
    aligned to 64bits, it reads past the allocated buffer. It doesn't really
    change any value there (it's properly bitmasked), but in case that this
    read past the boundary hits a page boundary, pagefault happens when
    accessing 64bits of 'x' in implement(), and kernel oopses.

    This happens much more often when numbered reports are in use, as the
    initial 8bit skip in the buffer makes the whole process work on values
    which are not aligned to 64bits.

    This problem dates back to attempts in 2005 and 2006 to make implement()
    and extract() as generic as possible, and even back then the problem
    was realized by Adam Kroperlin, but falsely assumed to be impossible
    to cause any harm:

    http://www.mail-archive.com/linux-usb-devel@lists.sourceforge.net/msg47690.html

    I have made several attempts at fixing it "on the spot" directly in
    implement(), but the results were horrible; the special casing for processing
    last 64bit chunk and switching to different math makes it unreadable mess.

    I therefore took a path to allocate a few bytes more which will never make
    it into final report, but are there as a cushion for all the 64bit math
    operations happening in implement() and extract().

    All callers of hid_output_report() are converted at the same time to allocate
    the buffer by newly introduced hid_alloc_report_buf() helper.

    Bruno noticed that the whole raw_size test can be dropped as well, as
    hid_alloc_report_buf() makes sure that the buffer is always of a proper
    size.

    Reviewed-by: Benjamin Tissoires
    Acked-by: Gustavo Padovan
    Signed-off-by: Jiri Kosina

    Jiri Kosina
     

15 Jul, 2013

1 commit


13 Jul, 2013

1 commit


05 Jul, 2013

15 commits

  • Pull HID updates from Jiri Kosina:
    - HID battery handling cleanup by David Herrmann
    - ELO 4000/4500 driver, which has been finally ported to be proper HID
    driver by Jiri Slaby
    - ps3remote driver functionality is now provided by generic sony
    driver, by Jiri Kosina
    - PS2/3 Buzz controllers support, by Colin Leitner
    - rework of wiimote driver including full extensions hotpluggin
    support, sub-device modularization and speaker support by David
    Herrmann

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (55 commits)
    HID: wacom: Intuos4 battery charging changes
    HID: i2c-hid: support sending HID output reports using the output register
    HID: kye: Add report fixup for Genius Gila Gaming mouse
    HID: wiimote: support Nintendo Wii U Pro Controller
    Input: make gamepad API keycodes more clear
    input: document gamepad API and add extra keycodes
    HID: explain out-of-range check better
    HID: fix false positive out of range values
    HID: wiimote: fix coccinelle warnings
    HID: roccat: check cdev_add return value
    HID: fold ps3remote driver into generic Sony driver
    HID: hyperv: convert alloc+memcpy to memdup
    HID: core: fix reporting of raw events
    HID: wiimote: discard invalid EXT data reports
    HID: wiimote: fix classic controller parsing
    HID: wiimote: init EXT/MP during device detection
    HID: wiimote: fix DRM debug-attr to correctly parse input
    HID: wiimote: add MP quirks
    HID: wiimote: remove old static extension support
    HID: wiimote: add "bboard_calib" attribute
    ...

    Linus Torvalds
     
  • Pull md updates from NeilBrown:
    "Mostly fixes, with a few minor features (eg 'last_sync_action' sysfs
    file)

    A couple marked for -stable including one recent bug which causes a
    RAID10 reshape to complete without moving any data :-(

    A couple more bugfixes (at least) to come, but haven't confirmed the
    right solution yet."

    * tag 'md-3.11' of git://neil.brown.name/md:
    md/raid10: fix bug which causes all RAID10 reshapes to move no data.
    md/raid5: allow 5-device RAID6 to be reshaped to 4-device.
    md/raid10: fix two bugs affecting RAID10 reshape.
    md: remove doubled description for sync_max, merging it within sync_min/sync_max
    MD: Remember the last sync operation that was performed
    md: fix buglet in RAID5 -> RAID0 conversion.
    md/raid10: check In_sync flag in 'enough()'.
    md/raid10: locking changes for 'enough()'.
    md: replace strict_strto*() with kstrto*()
    md: Wait for md_check_recovery before attempting device removal.
    dm-raid: silence compiler warning on rebuilds_per_group.
    DM RAID: Fix raid_resume not reviving failed devices in all cases
    DM RAID: Break-up untidy function
    DM RAID: Add ability to restore transiently failed devices on resume

    Linus Torvalds
     
  • Merge Kconfig menu diet patches from Dave Hansen:
    "I think the "Kernel Hacking" menu has gotten a bit out of hand. It is
    over 120 lines long on my system with everything enabled and options
    are scattered around it haphazardly.

    http://sr71.net/~dave/linux/kconfig-horror.png

    Let's try to introduce some sanity. This set takes that 120 lines
    down to 55 and makes it vastly easier to find some things. It's a
    start.

    This set stands on its own, but there is plenty of room for follow-up
    patches. The arch-specific debug options still end up getting stuck
    in the top-level "kernel hacking" menu. OPTIMIZE_INLINING, for
    instance, could obviously go in to the "compiler options" menu, but
    the fact that it is defined in arch/ in a separate Kconfig file keeps
    it on its own for the moment.

    The Signed-off-by's in here look funky. I changed employers while
    working on this set, so I have signoffs from both email addresses"

    * emailed patches from Dave Hansen :
    hang and lockup detection menu
    kconfig: consolidate printk options
    group locking debugging options
    consolidate compilation option configs
    consolidate runtime testing configs
    order memory debugging Kconfig options
    consolidate per-arch stack overflow debugging options

    Linus Torvalds
     
  • The hard/softlockup and hung-task entries take up 6 lines
    of screen real-estate when enabled. I bet folks don't
    mess with these _that_ often, so move them in a group
    down a level.

    Signed-off-by: Dave Hansen
    Signed-off-by: Linus Torvalds

    Dave Hansen
     
  • Same deal, take the printk-related things and hide them in a menu.
    This takes another 4 items out of the top-level menu.

    Signed-off-by: Dave Hansen
    Signed-off-by: Linus Torvalds

    Dave Hansen
     
  • Original posting:

    http://lkml.kernel.org/r/20121214184208.D9E5804D@kernel.stglabs.ibm.com

    There are quite a few of these, and we want to make sure that
    there is one-stop-shopping for lock debugging.

    Signed-off-by: Dave Hansen
    Signed-off-by: Dave Hansen
    Signed-off-by: Linus Torvalds

    Dave Hansen
     
  • Original Post:

    http://lkml.kernel.org/r/20121214184207.6E00DDEC@kernel.stglabs.ibm.com

    Again, trying to come up with some common themes of the stuff in
    the kernel hacking menu... There are quite a few options to
    tweak compilation in some way, or perform extra compile-time
    checks. Give them their own menu.

    The diff here looks a bit funny... makes it look like I'm
    moving debugfs even though I'm actually moving the options on
    either side of it.

    Signed-off-by: Dave Hansen
    Signed-off-by: Dave Hansen
    Signed-off-by: Linus Torvalds

    Dave Hansen
     
  • Original posting:

    http://lkml.kernel.org/r/20121214184206.FC11422F@kernel.stglabs.ibm.com

    These runtime tests are great, except that there are a lot of them,
    and they are very rarely needed. Give them their own menu so that
    only the folks who need them will have to go looking for them.

    Note that there are some other runtime tests that are not in here,
    like for RCU or locking. This menu should only be used for tests
    that do not have a more appropriate home.

    Signed-off-by: Dave Hansen
    Signed-off-by: Dave Hansen
    Signed-off-by: Linus Torvalds

    Dave Hansen
     
  • Original posting:

    http://lkml.kernel.org/r/20121214184203.37E6C724@kernel.stglabs.ibm.com

    There are a *LOT* of memory debugging options. They are just scattered
    all over the "Kernel Hacking" menu. Sure, "memory debugging" is a very
    vague term and it's going to be hard to make absolute rules about what
    goes in here, but this has to be better than what we had before.

    This does, however, leave out the architecture-specific memory
    debugging options (like x86's DEBUG_SET_MODULE_RONX). There would need
    to be some substantial changes to move those in here. Kconfig can not
    easily mix arch-specific and generic options together: it really
    requires a file per-architecture, and I think having an
    arch/foo/Kconfig.debug-memory might be taking things a bit too far

    Signed-off-by: Dave Hansen
    Signed-off-by: Dave Hansen
    Signed-off-by: Linus Torvalds

    Dave Hansen
     
  • Original posting:

    http://lkml.kernel.org/r/20121214184202.F54094D9@kernel.stglabs.ibm.com

    Several architectures have similar stack debugging config options.
    They all pretty much do the same thing, some with slightly
    differing help text.

    This patch changes the architectures to instead enable a Kconfig
    boolean, and then use that boolean in the generic Kconfig.debug
    to present the actual menu option. This removes a bunch of
    duplication and adds consistency across arches.

    Signed-off-by: Dave Hansen
    Reviewed-by: H. Peter Anvin
    Reviewed-by: James Hogan
    Acked-by: Chris Metcalf [for tile]
    Signed-off-by: Dave Hansen
    Signed-off-by: Linus Torvalds

    Dave Hansen
     
  • Merge hpfs patches from Mikulas Patocka.

    * emailed patches from Mikulas Patocka :
    hpfs: implement prefetch to improve performance
    hpfs: use mpage
    hpfs: better test for errors

    Linus Torvalds
     
  • This patch implements prefetch to improve performance. It helps mostly
    when scanning the bitmaps to calculate free space.

    Signed-off-by: Mikulas Patocka
    Signed-off-by: Linus Torvalds

    Mikulas Patocka
     
  • Use the mpage interface to improve performance.

    Signed-off-by: Mikulas Patocka
    Signed-off-by: Linus Torvalds

    Mikulas Patocka
     
  • The test if bitmap access is out of bound could errorneously pass if the
    device size is divisible by 16384 sectors and we are asking for one bitmap
    after the end.

    Check for invalid size in the superblock. Invalid size could cause integer
    overflows in the rest of the code.

    Signed-off-by: Mikulas Patocka
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds

    Mikulas Patocka
     
  • Pull powerpc updates from Ben Herrenschmidt:
    "This is the powerpc changes for the 3.11 merge window. In addition to
    the usual bug fixes and small updates, the main highlights are:

    - Support for transparent huge pages by Aneesh Kumar for 64-bit
    server processors. This allows the use of 16M pages as transparent
    huge pages on kernels compiled with a 64K base page size.

    - Base VFIO support for KVM on power by Alexey Kardashevskiy

    - Wiring up of our nvram to the pstore infrastructure, including
    putting compressed oopses in there by Aruna Balakrishnaiah

    - Move, rework and improve our "EEH" (basically PCI error handling
    and recovery) infrastructure. It is no longer specific to pseries
    but is now usable by the new "powernv" platform as well (no
    hypervisor) by Gavin Shan.

    - I fixed some bugs in our math-emu instruction decoding and made it
    usable to emulate some optional FP instructions on processors with
    hard FP that lack them (such as fsqrt on Freescale embedded
    processors).

    - Support for Power8 "Event Based Branch" facility by Michael
    Ellerman. This facility allows what is basically "userspace
    interrupts" for performance monitor events.

    - A bunch of Transactional Memory vs. Signals bug fixes and HW
    breakpoint/watchpoint fixes by Michael Neuling.

    And more ... I appologize in advance if I've failed to highlight
    something that somebody deemed worth it."

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (156 commits)
    pstore: Add hsize argument in write_buf call of pstore_ftrace_call
    powerpc/fsl: add MPIC timer wakeup support
    powerpc/mpic: create mpic subsystem object
    powerpc/mpic: add global timer support
    powerpc/mpic: add irq_set_wake support
    powerpc/85xx: enable coreint for all the 64bit boards
    powerpc/8xx: Erroneous double irq_eoi() on CPM IRQ in MPC8xx
    powerpc/fsl: Enable CONFIG_E1000E in mpc85xx_smp_defconfig
    powerpc/mpic: Add get_version API both for internal and external use
    powerpc: Handle both new style and old style reserve maps
    powerpc/hw_brk: Fix off by one error when validating DAWR region end
    powerpc/pseries: Support compression of oops text via pstore
    powerpc/pseries: Re-organise the oops compression code
    pstore: Pass header size in the pstore write callback
    powerpc/powernv: Fix iommu initialization again
    powerpc/pseries: Inform the hypervisor we are using EBB regs
    powerpc/perf: Add power8 EBB support
    powerpc/perf: Core EBB support for 64-bit book3s
    powerpc/perf: Drop MMCRA from thread_struct
    powerpc/perf: Don't enable if we have zero events
    ...

    Linus Torvalds
     

04 Jul, 2013

13 commits

  • Jiri Kosina
     
  • Intuos4 WL is separately reporting power supply and battery
    charging status - now hid-wacom is using that information.
    Previously hid-wacom was wrongly treating "battery charging" bit
    as "power supply connected". Now it should report battery charging,
    battery discharging, battery full and power supply status.

    Intuos4 WL sends reports when is in use (obvious) and when unplugging
    power supply. If means that if the device is being charged, but it's not
    being used it will never report "battery full". The same problem happens
    after the device has been connected, but it's not in use - the
    battery/ac status will be incorrect. Currently there is no mechanism to
    ask the device to send a report containing battery/ac status.

    Signed-off-by: Przemo Firszt
    Signed-off-by: Jiri Kosina

    Przemo Firszt
     
  • Conflicts:
    drivers/hid/hid-core.c

    Jiri Kosina
     
  • …11/i2c-hid-fixed' into for-linus

    Jiri Kosina
     
  • The current i2c hid driver does not support sending HID output reports using
    the output register for devices which support receiving reports through this
    method. This patch determines which method to use to send output reports based
    on the value of wMaxOutputLength in the device's HID descriptor.

    Signed-off-by: Andrew Duggan
    Reviewed-by: Benjamin Tissoires
    Signed-off-by: Jiri Kosina

    Andrew Duggan
     
  • The recent comment:
    commit 7e83ccbecd608b971f340e951c9e84cd0343002f
    md/raid10: Allow skipping recovery when clean arrays are assembled

    Causes raid10 to skip a recovery in certain cases where it is safe to
    do so. Unfortunately it also causes a reshape to be skipped which is
    never safe. The result is that an attempt to reshape a RAID10 will
    appear to complete instantly, but no data will have been moves so the
    array will now contain garbage.
    (If nothing is written, you can recovery by simple performing the
    reverse reshape which will also complete instantly).

    Bug was introduced in 3.10, so this is suitable for 3.10-stable.

    Cc: stable@vger.kernel.org (3.10)
    Cc: Martin Wilck
    Signed-off-by: NeilBrown

    NeilBrown
     
  • There is a bug in 'check_reshape' for raid5.c To checks
    that the new minimum number of devices is large enough (which is
    good), but it does so also after the reshape has started (bad).

    This is bad because
    - the calculation is now wrong as mddev->raid_disks has changed
    already, and
    - it is pointless because it is now too late to stop.

    So only perform that test when reshape has not been committed to.

    Signed-off-by: NeilBrown

    NeilBrown
     
  • Pull hwmon updates from Guenter Roeck:
    - new driver to support GMT G762/G763 pwm fan controllers
    - add support for DS1631, DS1721, and DS1731 to ds1621 driver
    - remove detect function from ds1621 driver as unreliable
    - bug fixes in nct6775, iio_hwmon, and adm1021 drivers
    - remove redundant platform_set_drvdata in various drivers
    - add device tree support to ina2xx driver

    * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
    hwmon: (ds1621) Fix temperature rounding operations
    hwmon: (nct6775) Drop unsupported fan alarm attributes for NCT6775
    hwmon: (nct6775) Fix temperature alarm attributes
    Add support for GMT G762/G763 PWM fan controllers
    hwmon: (ina2xx) Add device tree support to pass the shunt resistor
    hwmon: (ds1621) Update documentation
    hwmon: (ds1621) Add DS1731 chip support to ds1621 driver
    hwmon: (iio_hwmon) add alias table
    hwmon: (adm1021) Do not create min sysfs attributes for LM84
    hwmon: (ds1621) Remove detect function
    hwmon: (ds1621) Add ds1631 chip support to ds1621 driver and documentation
    hwmon: (ds1621) Add ds1721 update interval sysfs attribute
    hwmon: (ds1621) Add ds1721 chip support
    hwmon: (w83627ehf) Remove redundant platform_set_drvdata()
    hwmon: (ntc_thermistor) Remove redundant platform_set_drvdata()
    hwmon: (i5k_amb) Remove redundant platform_set_drvdata()
    hwmon: (coretemp) Remove redundant platform_set_drvdata()
    hwmon: (abituguru3) Remove redundant platform_set_drvdata()

    Linus Torvalds
     
  • Pull LED subsystem updates from Bryan Wu:
    - lp55xx device tree updates
    - mc13xxx driver updates
    - some clean up

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
    leds: mc13783: Fix "uninitialized variable" warning
    leds: Convert led class driver from legacy pm ops to dev_pm_ops
    leds: leds-mc13783: Add MC13892 LED support
    leds: leds-mc13783: Prepare driver to support MC13892 LEDs
    leds: renesas-tpu: cleanup a small type issue
    leds: use platform_{get,set}_drvdata()
    leds: leds-gpio: Let device core handle pinctrl
    leds: lp5562: Properly setup of_device_id table
    leds: lp5523: Properly setup of_device_id table
    leds: lp5521: Properly setup of_device_id table
    leds: lp5562: support the device tree feature
    leds: lp55xx: support dynamic channel settings in the device tree structure
    leds: leds-ns2: remove unnecessary platform_set_drvdata()
    leds: leds-mc13783: remove unnecessary platform_set_drvdata()
    leds: leds-gpio: remove unnecessary platform_set_drvdata()
    leds: atmel-pwm: remove unnecessary platform_set_drvdata()
    leds: lp55xx: add support for Device Tree bindings

    Linus Torvalds
     
  • Pull sound updates from Takashi Iwai:
    "A relative calm release at this time with a flat diffstat. The only
    significant change in the ALSA core side is the support for more than
    32 card instances, configurable via kconfig. Other than that, in both
    ASoC and other parts, mostly some improvements and fixes on the driver
    side.

    - hda: More quirks for ALC269-variants on Dell & co, VIA codec fixes
    - hda: Haswell HDMI audio fixes, runtime PM improvements
    - hda: Intel BayTrail support, ALC5505 DSP support
    - es1968: MediaForte M56VAP support
    - usb-audio: Improved support for Yamaha/Roland devices
    - usb-audio: M2Tech hiFace, Audio Advantage Micro II support
    - hdspm: wordclock fixes
    - ASoC: Pending fixes for WM8962
    - ASoC: Cleanups and fixes for Blackfin, SGTL5000 and UX500
    - ASoC: Generalisation of the Bluetooth and HDMI stub drivers
    - ASoC: SSM2518 and RT5640 codec drivers.
    - ASoC: Tegra CPUs with RT5640 machine driver
    - ASoC: AC'97 refactoring bug fixes
    - ASoC: ADAU1701 driver fixes
    - Clean up of *_set_drvdata() in a wide range of drivers"

    * tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (284 commits)
    ALSA: vmaster: Fix the regression of missing vmaster hook call
    ALSA: hda - Add Dell SSID to support Headset Mic recording
    ASoC: adau1701: remove control_data assignment
    ASoC: adau1701: more direct regmap usage
    ASoC: ac97: fixup multi-platform AC'97 module build failure
    ASoC: pxa2xx: fixup multi-platform AC'97 build failures
    ASoC: tegra20-ac97: Remove unused variable
    ASoC: tegra20-ac97: Remove duplicate error message
    ALSA: usb-audio: Add Audio Advantage Micro II
    ASoC: tas5086: fix Mid-Z implementation
    ASoC: tas5086: fix TAS5086_CLOCK_CONTROL register size
    ALSA: Replace the magic number 44 with const
    ALSA: hda - Fix the max length of control name in generic parser
    ALSA: hda - Guess what, it's two more Dell headset mic quirks
    ALSA: hda - Yet another Dell headset mic quirk
    ALSA: hda - Add support for ALC5505 DSP power-save mode
    ASoC: mfld: Remove unused variable
    ALSA: usb-audio: add quirks for Roland QUAD/OCTO-CAPTURE
    ALSA: usb-audio: claim autodetected PCM interfaces all at once
    ALSA: usb-audio: remove superfluous Roland quirks
    ...

    Linus Torvalds
     
  • Pull libata updates from Tejun Heo:
    "Overview of changes:

    - The rest of maintainer email address updates.

    - Some core updates - more robust default behavior for port
    multipliers, better error reporting for SG_IO commands, and a way
    to better work around now ancient and probably pretty rare PATA ->
    SATA bridges with ATAPI devices.

    - sata_rcar stabilization.

    - Some hardware PCI ID additions and one-off low level driver
    updates."

    * 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (22 commits)
    AHCI: use ATA_BUSY
    libata-zpodd: must use ata_tf_init()
    ahci: AHCI-mode SATA patch for Intel Coleto Creek DeviceIDs
    ata_piix: IDE-mode SATA patch for Intel Coleto Creek DeviceIDs
    libata: cleanup SAT error translation
    ahci: sata: add support for exynos5440 sata
    libata: skip SRST for all SIMG [34]7x port-multipliers
    ahci: remove pmp link online check in FBS EH
    sata highbank: add bit-banged SGPIO driver support
    ahci: make ahci_transmit_led_message into a function pointer
    sata_rcar: fix compilation warning in sata_rcar_thaw()
    sata_highbank: increase retry count but shorten duration for Calxeda controller
    ata: use pci_get_drvdata()
    ipr: qc_fill_rtf() method should not store alternate status register
    sata_rcar: add 'base' local variable to some functions
    sata_rcar: correct 'sata_rcar_sht'
    sata_rcar: kill superfluous code in sata_rcar_bmdma_fill_sg()
    libata: do not limit R-Car SATA driver to shmobile
    ata: use platform_{get,set}_drvdata()
    AHCI: Make distinct names for ports in /proc/interrupts
    ...

    Linus Torvalds
     
  • Merge first patch-bomb from Andrew Morton:
    - various misc bits
    - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been
    distracted. There has been quite a bit of activity.
    - About half the MM queue
    - Some backlight bits
    - Various lib/ updates
    - checkpatch updates
    - zillions more little rtc patches
    - ptrace
    - signals
    - exec
    - procfs
    - rapidio
    - nbd
    - aoe
    - pps
    - memstick
    - tools/testing/selftests updates

    * emailed patches from Andrew Morton : (445 commits)
    tools/testing/selftests: don't assume the x bit is set on scripts
    selftests: add .gitignore for kcmp
    selftests: fix clean target in kcmp Makefile
    selftests: add .gitignore for vm
    selftests: add hugetlbfstest
    self-test: fix make clean
    selftests: exit 1 on failure
    kernel/resource.c: remove the unneeded assignment in function __find_resource
    aio: fix wrong comment in aio_complete()
    drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
    drivers/memstick/host/r592.c: convert to module_pci_driver
    drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
    pps-gpio: add device-tree binding and support
    drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
    drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
    drivers/parport/share.c: use kzalloc
    Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
    aoe: update internal version number to v83
    aoe: update copyright date
    aoe: perform I/O completions in parallel
    ...

    Linus Torvalds
     
  • Pull PCI changes from Bjorn Helgaas:
    "PCI device hotplug
    - Add pci_alloc_dev() interface (Gu Zheng)
    - Add pci_bus_get()/put() for reference counting (Jiang Liu)
    - Fix SR-IOV reference count issues (Jiang Liu)
    - Remove unused acpi_pci_roots list (Jiang Liu)

    MSI
    - Conserve interrupt resources on x86 (Alexander Gordeev)

    AER
    - Force fatal severity when component has been reset (Betty Dall)
    - Reset link below Root Port as well as Downstream Port (Betty Dall)
    - Fix "Firmware first" flag setting (Bjorn Helgaas)
    - Don't parse HEST for non-PCIe devices (Bjorn Helgaas)

    ASPM
    - Warn when we can't disable ASPM as driver requests (Bjorn Helgaas)

    Miscellaneous
    - Add CircuitCo PCI IDs (Darren Hart)
    - Add AMD CZ SATA and SMBus PCI IDs (Shane Huang)
    - Work around Ivytown NTB BAR size issue (Jon Mason)
    - Detect invalid initial BAR values (Kevin Hao)
    - Add pcibios_release_device() (Sebastian Ott)
    - Fix powerpc & sparc PCI_UNKNOWN power state usage (Bjorn Helgaas)"

    * tag 'pci-v3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (51 commits)
    MAINTAINERS: Add ACPI folks for ACPI-related things under drivers/pci
    PCI: Add CircuitCo vendor ID and subsystem ID
    PCI: Use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
    PCI: Return early on allocation failures to unindent mainline code
    PCI: Simplify IOV implementation and fix reference count races
    PCI: Drop redundant setting of bus->is_added in virtfn_add_bus()
    unicore32/PCI: Remove redundant call of pci_bus_add_devices()
    m68k/PCI: Remove redundant call of pci_bus_add_devices()
    PCI / ACPI / PM: Use correct power state strings in messages
    PCI: Fix comment typo for pcie_pme_remove()
    PCI: Rename pci_release_bus_bridge_dev() to pci_release_host_bridge_dev()
    PCI: Fix refcount issue in pci_create_root_bus() error recovery path
    ia64/PCI: Clean up pci_scan_root_bus() usage
    PCI/AER: Reset link for devices below Root Port or Downstream Port
    ACPI / APEI: Force fatal AER severity when component has been reset
    PCI/AER: Remove "extern" from function declarations
    PCI/AER: Move AER severity defines to aer.h
    PCI/AER: Set dev->__aer_firmware_first only for matching devices
    PCI/AER: Factor out HEST device type matching
    PCI/AER: Don't parse HEST table for non-PCIe devices
    ...

    Linus Torvalds