Skip to content
  1. Mar 07, 2013
  2. Mar 05, 2013
    • Alan Stern's avatar
      USB: EHCI: don't check DMA values in QH overlays · feca7746
      Alan Stern authored
      
      
      This patch (as1661) fixes a rather obscure bug in ehci-hcd.  In a
      couple of places, the driver compares the DMA address stored in a QH's
      overlay region with the address of a particular qTD, in order to see
      whether that qTD is the one currently being processed by the hardware.
      (If it is then the status in the QH's overlay region is more
      up-to-date than the status in the qTD, and if it isn't then the
      overlay's value needs to be adjusted when the QH is added back to the
      active schedule.)
      
      However, DMA address in the overlay region isn't always valid.  It
      sometimes will contain a stale value, which may happen by coincidence
      to be equal to a qTD's DMA address.  Instead of checking the DMA
      address, we should check whether the overlay region is active and
      valid.  The patch tests the ACTIVE bit in the overlay, and clears this
      bit when the overlay becomes invalid (which happens when the
      currently-executing URB is unlinked).
      
      This is the second part of a fix for the regression reported at:
      
      	https://bugs.launchpad.net/bugs/1088733
      
      Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
      Reported-by: default avatarJoseph Salisbury <joseph.salisbury@canonical.com>
      Reported-and-tested-by: default avatarStephen Thirlwall <sdt@dr.com>
      CC: <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      feca7746
    • Alan Stern's avatar
      USB: EHCI: work around silicon bug in Intel's EHCI controllers · 6402c796
      Alan Stern authored
      
      
      This patch (as1660) works around a hardware problem present in some
      (if not all) Intel EHCI controllers.  After a QH has been unlinked
      from the async schedule and the corresponding IAA interrupt has
      occurred, the controller is not supposed access the QH and its qTDs.
      There certainly shouldn't be any more DMA writes to those structures.
      Nevertheless, Intel's controllers have been observed to perform a
      final writeback to the QH's overlay region and to the most recent qTD.
      For more information and a test program to determine whether this
      problem is present in a particular controller, see
      
      	http://marc.info/?l=linux-usb&m=135492071812265&w=2
      	http://marc.info/?l=linux-usb&m=136182570800963&w=2
      
      This patch works around the problem by always waiting for two IAA
      cycles when unlinking an async QH.  The extra IAA delay gives the
      controller time to perform its final writeback.
      
      Surprisingly enough, the effects of this silicon bug have gone
      undetected until quite recently.  More through luck than anything
      else, it hasn't caused any apparent problems.  However, it does
      interact badly with the path that follows this one, so it needs to be
      addressed.
      
      This is the first part of a fix for the regression reported at:
      
      	https://bugs.launchpad.net/bugs/1088733
      
      Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
      Tested-by: default avatarStephen Thirlwall <sdt@dr.com>
      CC: <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      6402c796
    • Greg Kroah-Hartman's avatar
      Merge tag 'fixes-for-v3.9-rc2' of... · ea5301aa
      Greg Kroah-Hartman authored
      Merge tag 'fixes-for-v3.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
      
      Felipe writes:
      
      "usb: fixes for v3.9-rc2
      
      A few drivers got their gadget->dev registration problems
      exposed by the removal of ->start()/->stop() functions from
      udc-core.c. All of such instances are now fixed.
      
      We're also fixing chipidea's mistake of registering private
      debugging sysfs files under the gadget's device. This is
      in preparation to complete removal of gadget->dev handling
      from all UDC drivers which will happen for v3.10 merge window.
      
      MUSB's Kconfig got a fix to avoid a non-buildable selection
      of its Kconfig choices.
      
      Some extra devm_ioremap_resource() are added here because they
      missed the merge window.
      
      Finally, we have a temporary fix linking function drivers
      before gadget drivers so they work fine when they're statically
      linked to the kernel. We've done it so since the real fix wouldn't
      fit the -rc cycle."
      ea5301aa
  3. Mar 04, 2013
    • Dan Carpenter's avatar
      usb: gadget: u_uac1: NULL dereference on error path · 29240e23
      Dan Carpenter authored
      
      
      We should return here with an error code instead of continuing.
      
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      29240e23
    • Dan Carpenter's avatar
      usb: gadget: f_uac1: silence an info leak warning · fddedd83
      Dan Carpenter authored
      
      
      Smatch complains that "len" could be larger than the sizeof(value)
      so we could be copying garbage here.  I have changed this to match
      how things are done in composite_setup().
      
      The call tree looks like:
        composite_setup()
        --> f_audio_setup()
            --> audio_get_intf_req()
      
      composite_setup() expects the return value to be set to
      sizeof(value).
      
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      fddedd83
    • Sachin Kamat's avatar
      usb: phy: omap-control-usb: Convert to devm_ioremap_resource() · 57ae575b
      Sachin Kamat authored
      
      
      Use the newly introduced devm_ioremap_resource() instead of
      devm_request_and_ioremap() which provides more consistent error handling.
      
      devm_ioremap_resource() provides its own error messages; so all explicit
      error messages can be removed from the failure code paths.
      
      Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Cc: Kishon Vijay Abraham I <kishon@ti.com>
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      57ae575b
    • Sachin Kamat's avatar
      usb: phy: omap-usb3: Convert to devm_ioremap_resource() · 862421da
      Sachin Kamat authored
      
      
      Use the newly introduced devm_ioremap_resource() instead of
      devm_request_and_ioremap() which provides more consistent error handling.
      
      devm_ioremap_resource() provides its own error messages; so all explicit
      error messages can be removed from the failure code paths.
      
      Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Cc: Kishon Vijay Abraham I <kishon@ti.com>
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      862421da
    • Sachin Kamat's avatar
      usb: phy: samsung: Convert to devm_ioremap_resource() · a4007041
      Sachin Kamat authored
      
      
      Use the newly introduced devm_ioremap_resource() instead of
      devm_request_and_ioremap() which provides more consistent error handling.
      
      devm_ioremap_resource() provides its own error messages; so all explicit
      error messages can be removed from the failure code paths.
      
      Reviewed-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      a4007041
    • Marc Kleine-Budde's avatar
      usb: otg: use try_module_get in all usb_get_phy functions and add missing module_put · 1dd03d8a
      Marc Kleine-Budde authored
      In patch "5d3c28b5
      
       usb: otg: add device tree support to otg library"
      devm_usb_get_phy_by_phandle() was added. It uses try_module_get() to lock the
      phy driver in memory. The corresponding module_put() is missing in that patch.
      
      This patch adds try_module_get() to usb_get_phy() and usb_get_phy_dev().
      Further the missing module_put() is added to usb_put_phy().
      
      Tested-by: default avatarSteffen Trumtrar <s.trumtrar@pengutronix.de>
      Reviewed-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
      Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
      Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      1dd03d8a
    • Peter Ujfalusi's avatar
      usb: musb: correct Kconfig in order to avoid non compilable selection · a10840c9
      Peter Ujfalusi authored
      
      
      Currently it is possible to have:
      
      USB_MUSB_OMAP2PLUS=m
      TWL4030_USB=y
      
      which would result compile time error due to missing symbols.
      
      With this change USB_MUSB_OMAP2PLUS and TWL4030_USB will be in sync.
      
      Reported-by: default avatarVincent Stehle <v-stehle@ti.com>
      Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      a10840c9
    • Felipe Balbi's avatar
      usb: gadget: s3c2410: fix build breakage · 4ea34de7
      Felipe Balbi authored
      
      
      add missing semicolon to fix compile breakage.
      
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      4ea34de7
    • Felipe Balbi's avatar
      usb: gadget: imx_udc: fix gadget->dev registration · bc530a72
      Felipe Balbi authored
      
      
      Whenever ->udc_start() gets called, gadget driver
      has already being bound to the udc controller, which
      means that gadget->dev had to be already initialized
      and added to driver model.
      
      This patch fixes imx_udc mistake.
      
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      bc530a72
    • Felipe Balbi's avatar
      usb: gadget: pxa25x: fix gadget->dev registration · 9992a997
      Felipe Balbi authored
      
      
      Whenever ->udc_start() gets called, gadget driver
      has already being bound to the udc controller, which
      means that gadget->dev had to be already initialized
      and added to driver model.
      
      This patch fixes pxa25x mistake.
      
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      9992a997
    • Felipe Balbi's avatar
      usb: gadget: s3c2410: fix gadget->dev registration · 7597a49b
      Felipe Balbi authored
      
      
      Whenever ->udc_start() gets called, gadget driver
      has already being bound to the udc controller, which
      means that gadget->dev had to be already initialized
      and added to driver model.
      
      This patch fixes s3c2410 mistake.
      
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      7597a49b
    • Kishon Vijay Abraham I's avatar
      usb: gadget: make usb functions to load before gadget driver · 56aa45ad
      Kishon Vijay Abraham I authored
      
      
      The current ordering in makefile makes gadget
      drivers be loaded before usb functions which
      causes usb_get_function_instance() to fail when
      gadget modules are statically linked to the
      kernel binary.
      
      Changed the ordering here so that USB functions
      are loaded before gadget drivers.
      
      Note that this is only a temporary solution and
      a more robust fix is needed in the long run.
      
      Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      56aa45ad
    • Felipe Balbi's avatar
      usb: gadget: pxa27x: fix gadget->dev registration · fe2a4297
      Felipe Balbi authored
      
      
      Whenever ->udc_start() gets called, gadget driver
      has already being bound to the udc controller, which
      means that gadget->dev had to be already initialized
      and added to driver model.
      
      This patch fixes pxa27x mistake.
      
      Tested-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      fe2a4297
    • Felipe Balbi's avatar
      usb: chipidea: register debugging sysfs on our device · 2b7dc3b1
      Felipe Balbi authored
      
      
      Don't register anything non-generic under
      the gadget's device as we don't really *own*
      it.
      
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      2b7dc3b1
    • Felipe Balbi's avatar
      usb: dwc3: gadget: remove unnecessary code · e5b29b25
      Felipe Balbi authored
      
      
      the params variables on dwc3_gadget_conndone_interrupt()
      is only memset() to zero but never used in
      that function, so we can safely drop the variable
      and memset() call.
      
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      e5b29b25
    • Felipe Balbi's avatar
      usb: dwc3: glue layers shouldn't know about the core IP · d82f3e3c
      Felipe Balbi authored
      
      
      remove inclusion of "core.h" from all glue
      layers as they don't need to know details
      about the core IP.
      
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      d82f3e3c
    • Felipe Balbi's avatar
      usb: dwc3: omap: fix a typo on of_device_id · 2c2dc89c
      Felipe Balbi authored
      
      
      s/matach/match
      
      No functional changes
      
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      2c2dc89c
    • Felipe Balbi's avatar
      usb: dwc3: core: don't forget to free coherent memory · d9b4330a
      Felipe Balbi authored
      commit 3921426b
      
       (usb: dwc3: core: move
      event buffer allocation out of
      dwc3_core_init()) introduced a memory leak
      of the coherent memory we use as event
      buffers on dwc3 driver.
      
      If the driver is compiled as a dynamically
      loadable module and use constantly loads
      and unloads the driver, we will continue
      to leak the coherent memory allocated during
      ->probe() because dwc3_free_event_buffers()
      is never called during ->remove().
      
      Cc: <stable@vger.kernel.org> # v3.7 v3.8
      Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
      d9b4330a
    • Linus Torvalds's avatar
      Linux 3.9-rc1 · 6dbe51c2
      Linus Torvalds authored
      6dbe51c2
    • Linus Torvalds's avatar
      Merge tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/users/dhowells/linux-headers · ea882c2e
      Linus Torvalds authored
      Pull fbdev UAPI disintegration from David Howells:
       "You'll be glad to here that the end is nigh for the UAPI patches.
        Only the fbdev/framebuffer piece remains now that the SCSI stuff has
        gone in.
      
        Here are the UAPI disintegration bits for the fbdev drivers.  It
        appears that Florian hasn't had time to deal with my patch, but back
        in December he did say he didn't mind if I pushed it forward."
      
      Yay.  No more uapi movement.  And hopefully no more big header file
      cleanups coming up either, it just tends to be very painful.
      
      * tag 'disintegrate-fbdev-20121220' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate include/video
      ea882c2e
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.9-rc1-tag' of... · 8e8b180a
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.9-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
       - Update the Xen ACPI memory and CPU hotplug locking mechanism.
       - Fix PAT issues wherein various applications would not start
       - Fix handling of multiple MSI as AHCI now does it.
       - Fix ARM compile failures.
      
      * tag 'stable/for-linus-3.9-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xenbus: fix compile failure on ARM with Xen enabled
        xen/pci: We don't do multiple MSI's.
        xen/pat: Disable PAT using pat_enabled value.
        xen/acpi: xen cpu hotplug minor updates
        xen/acpi: xen memory hotplug minor updates
      8e8b180a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 56a79b7b
      Linus Torvalds authored
      Pull  more VFS bits from Al Viro:
       "Unfortunately, it looks like xattr series will have to wait until the
        next cycle ;-/
      
        This pile contains 9p cleanups and fixes (races in v9fs_fid_add()
        etc), fixup for nommu breakage in shmem.c, several cleanups and a bit
        more file_inode() work"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        constify path_get/path_put and fs_struct.c stuff
        fix nommu breakage in shmem.c
        cache the value of file_inode() in struct file
        9p: if v9fs_fid_lookup() gets to asking server, it'd better have hashed dentry
        9p: make sure ->lookup() adds fid to the right dentry
        9p: untangle ->lookup() a bit
        9p: double iput() in ->lookup() if d_materialise_unique() fails
        9p: v9fs_fid_add() can't fail now
        v9fs: get rid of v9fs_dentry
        9p: turn fid->dlist into hlist
        9p: don't bother with private lock in ->d_fsdata; dentry->d_lock will do just fine
        more file_inode() open-coded instances
        selinux: opened file can't have NULL or negative ->f_path.dentry
      
      (In the meantime, the hlist traversal macros have changed, so this
      required a semantic conflict fixup for the newly hlistified fid->dlist)
      56a79b7b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 1c82315a
      Linus Torvalds authored
      Pull btrfs fixup from Chris Mason:
       "Geert and James both sent this one in, sorry guys"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        btrfs/raid56: Add missing #include <linux/vmalloc.h>
      1c82315a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 530ede14
      Linus Torvalds authored
      Pull second set of s390 patches from Martin Schwidefsky:
       "The main part of this merge are Heikos uaccess patches.  Together with
        commit 09884964 ("mm: do not grow the stack vma just because of an
        overrun on preceding vma") the user string access is hopefully fixed
        for good.
      
        In addition some bug fixes and two cleanup patches."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/module: fix compile warning
        qdio: remove unused parameters
        s390/uaccess: fix kernel ds access for page table walk
        s390/uaccess: fix strncpy_from_user string length check
        input: disable i8042 PC Keyboard controller for s390
        s390/dis: Fix invalid array size
        s390/uaccess: remove pointless access_ok() checks
        s390/uaccess: fix strncpy_from_user/strnlen_user zero maxlen case
        s390/uaccess: shorten strncpy_from_user/strnlen_user
        s390/dasd: fix unresponsive device after all channel paths were lost
        s390/mm: ignore change bit for vmemmap
        s390/page table dumper: add support for change-recording override bit
      530ede14
    • Linus Torvalds's avatar
      Merge branch 'fixes-for-3.9-latest' of... · 6977c6fc
      Linus Torvalds authored
      Merge branch 'fixes-for-3.9-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
      
      Pull second round of PARISC updates from Helge Deller:
       "The most important fix in this branch is the switch of io_setup,
        io_getevents and io_submit syscalls to use the available compat
        syscalls when running 32bit userspace on 64bit kernel.  Other than
        that it's mostly removal of compile warnings."
      
      * 'fixes-for-3.9-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: fix redefinition of SET_PERSONALITY
        parisc: do not install modules when installing kernel
        parisc: fix compile warnings triggered by atomic_sub(sizeof(),v)
        parisc: check return value of down_interruptible() in hp_sdc_rtc.c
        parisc: avoid unitialized variable warning in pa_memcpy()
        parisc: remove unused variable 'compat_val'
        parisc: switch to compat_functions of io_setup, io_getevents and io_submit
        parisc: select ARCH_WANT_FRAME_POINTERS
      6977c6fc
    • Linus Torvalds's avatar
      Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · 8fd5e7a2
      Linus Torvalds authored
      Pull new ImgTec Meta architecture from James Hogan:
       "This adds core architecture support for Imagination's Meta processor
        cores, followed by some later miscellaneous arch/metag cleanups and
        fixes which I kept separate to ease review:
      
         - Support for basic Meta 1 (ATP) and Meta 2 (HTP) core architecture
         - A few fixes all over, particularly for symbol prefixes
         - A few privilege protection fixes
         - Several cleanups (setup.c includes, split out a lot of
           metag_ksyms.c)
         - Fix some missing exports
         - Convert hugetlb to use vm_unmapped_area()
         - Copy device tree to non-init memory
         - Provide dma_get_sgtable()"
      
      * tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag: (61 commits)
        metag: Provide dma_get_sgtable()
        metag: prom.h: remove declaration of metag_dt_memblock_reserve()
        metag: copy devicetree to non-init memory
        metag: cleanup metag_ksyms.c includes
        metag: move mm/init.c exports out of metag_ksyms.c
        metag: move usercopy.c exports out of metag_ksyms.c
        metag: move setup.c exports out of metag_ksyms.c
        metag: move kick.c exports out of metag_ksyms.c
        metag: move traps.c exports out of metag_ksyms.c
        metag: move irq enable out of irqflags.h on SMP
        genksyms: fix metag symbol prefix on crc symbols
        metag: hugetlb: convert to vm_unmapped_area()
        metag: export clear_page and copy_page
        metag: export metag_code_cache_flush_all
        metag: protect more non-MMU memory regions
        metag: make TXPRIVEXT bits explicit
        metag: kernel/setup.c: sort includes
        perf: Enable building perf tools for Meta
        metag: add boot time LNKGET/LNKSET check
        metag: add __init to metag_cache_probe()
        ...
      8fd5e7a2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · 529e5fbc
      Linus Torvalds authored
      Pull late ARM updates from Russell King:
       "Here is the late set of ARM updates for this merge window; in here is:
      
         - The ARM parts of the broadcast timer support, core parts merged
           through tglx's tree.  This was left over from the previous merge to
           allow the dependency on tglx's tree to be resolved.
      
         - A fix to the VFP code which shows up on Raspberry Pi's, as well as
           fixing the fallout from a previous commit in this area.
      
         - A number of smaller fixes scattered throughout the ARM tree"
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: Fix broken commit 0cc41e4a corrupting kernel messages
        ARM: fix scheduling while atomic warning in alignment handling code
        ARM: VFP: fix emulation of second VFP instruction
        ARM: 7656/1: uImage: Error out on build of multiplatform without LOADADDR
        ARM: 7640/1: memory: tegra_ahb_enable_smmu() depends on TEGRA_IOMMU_SMMU
        ARM: 7654/1: Preserve L_PTE_VALID in pte_modify()
        ARM: 7653/2: do not scale loops_per_jiffy when using a constant delay clock
        ARM: 7651/1: remove unused smp_timer_broadcast #define
      529e5fbc
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 686c0940
      Linus Torvalds authored
      
      
      Pull char/misc patch from Greg Kroah-Hartman:
       "Here is one remaining patch for 3.9-rc1.  It is for the hyper-v
        drivers, and had to wait until some other patches went in through the
        x86 tree."
      
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      
      * tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        Drivers: hv: vmbus: Use the new infrastructure for delivering VMBUS interrupts
      686c0940
    • Linus Torvalds's avatar
      Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · bc2e4a90
      Linus Torvalds authored
      Pull USB patch revert from Greg Kroah-Hartman:
       "Here is one remaining USB patch for 3.9-rc1, it reverts a 3.8 patch
        that has caused a lot of regressions for some VIA EHCI controllers."
      
      * tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: EHCI: revert "remove ASS/PSS polling timeout"
      bc2e4a90
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 68b86a25
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
       "This contains:
         - fixes and improvements
         - devicetree bindings
         - conversion to watchdog generic framework of the following drivers:
              - booke_wdt
              - bcm47xx_wdt.c
              - at91sam9_wdt
         - Removal of old STMP3xxx driver
         - Addition of following new drivers:
              - new driver for STMP3xxx and i.MX23/28
              - Retu watchdog driver"
      
      * git://www.linux-watchdog.org/linux-watchdog: (30 commits)
        watchdog: sp805_wdt depends on ARM
        watchdog: davinci_wdt: update to devm_* API
        watchdog: davinci_wdt: use devm managed clk get
        watchdog: at91rm9200: add DT support
        watchdog: add timeout-sec property binding
        watchdog: at91sam9_wdt: Convert to use the watchdog framework
        watchdog: omap_wdt: Add option nowayout
        watchdog: core: dt: add support for the timeout-sec dt property
        watchdog: bcm47xx_wdt.c: add hard timer
        watchdog: bcm47xx_wdt.c: rename wdt_time to timeout
        watchdog: bcm47xx_wdt.c: rename ops methods
        watchdog: bcm47xx_wdt.c: use platform device
        watchdog: bcm47xx_wdt.c: convert to watchdog core api
        watchdog: Convert BookE watchdog driver to watchdog infrastructure
        watchdog: s3c2410_wdt: Use devm_* functions
        watchdog: remove old STMP3xxx driver
        watchdog: add new driver for STMP3xxx and i.MX23/28
        rtc: stmp3xxx: add wdt-accessor function
        watchdog: introduce retu_wdt driver
        watchdog: intel_scu_watchdog: fix Kconfig dependency
        ...
      68b86a25
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma · 527c680f
      Linus Torvalds authored
      Pull second set of slave-dmaengine updates from Vinod Koul:
       "Arnd's patch moves the dw_dmac to use generic DMA binding.  I agreed
        to merge this late as it will avoid the conflicts between trees.
      
        The second patch from Matt adding a dma_request_slave_channel_compat
        API was supposed to be picked up, but somehow never got picked up.
        Some patches dependent on this are already in -next :("
      
      * 'next' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: dw_dmac: move to generic DMA binding
        dmaengine: add dma_request_slave_channel_compat()
      527c680f
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 · 23caaeea
      Linus Torvalds authored
      Pull x86 platform driver updates from Matthew Garrett:
       "Mostly relatively small updates, along with some hardware enablement
        for Sony hardware and a pile of updates to Google's Chromebook driver"
      
      * 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (49 commits)
        ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it
        ideapad: depends on backlight subsystem and update comment
        Platform: x86: chromeos_laptop - add i915 gmbuses to adapter names
        Platform: x86: chromeos_laptop - Add isl light sensor for Pixel
        Platform: x86: chromeos_laptop - Add a more general add_i2c_device
        Platform: x86: chromeos_laptop - Add Pixel Touchscreen
        Platform: x86: chromeos_laptop - Add support for probing devices
        Platform: x86: chromeos_laptop - Add Pixel Trackpad
        hp-wmi: fix handling of platform device
        sony-laptop: leak in error handling sony_nc_lid_resume_setup()
        hp-wmi: Add support for SMBus hotkeys
        asus-wmi: Fix unused function build warning
        acer-wmi: avoid the warning of 'devices' may be used uninitialized
        drivers/platform/x86/thinkpad_acpi.c: Handle HKEY event 0x6040
        Platform: x86: chromeos_laptop - Add HP Pavilion 14
        Platform: x86: chromeos_laptop - Add Taos tsl2583 device
        Platform: x86: chromeos_laptop - Add Taos tsl2563 device
        Platform: x86: chromeos_laptop - Add Acer C7 trackpad
        Platform: x86: chromeos_laptop - Rename setup_lumpy_tp to setup_cyapa_smbus_tp
        asus-laptop: always report brightness key events
        ...
      23caaeea
  4. Mar 03, 2013
    • Geert Uytterhoeven's avatar
      btrfs/raid56: Add missing #include <linux/vmalloc.h> · d7011f5b
      Geert Uytterhoeven authored
      
      
      tilegx_defconfig:
      
      fs/btrfs/raid56.c: In function 'btrfs_alloc_stripe_hash_table':
      fs/btrfs/raid56.c:206:3: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration]
      fs/btrfs/raid56.c:206:9: warning: assignment makes pointer from integer without a cast [enabled by default]
      fs/btrfs/raid56.c:226:4: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
      
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
      d7011f5b
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · a7c1120d
      Linus Torvalds authored
      Pull ext4 bug fixes from Ted Ts'o:
       "Various bug fixes for ext4.  The most important is a fix for the new
        extent cache's slab shrinker which can cause significant, user-visible
        pauses when the system is under memory pressure."
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: enable quotas before orphan cleanup
        ext4: don't allow quota mount options when quota feature enabled
        ext4: fix a warning from sparse check for ext4_dir_llseek
        ext4: convert number of blocks to clusters properly
        ext4: fix possible memory leak in ext4_remount()
        jbd2: fix ERR_PTR dereference in jbd2__journal_start
        ext4: use percpu counter for extent cache count
        ext4: optimize ext4_es_shrink()
      a7c1120d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal · 6ec40b42
      Linus Torvalds authored
      Pull sigprocmask compat fix from Al Viro:
       "generic compat_sys_rt_sigprocmask() had a very dumb braino; I'd spent
        quite a while staring at the offending commit before finally managing
        to spot the idiocy ;-/"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
        fix compat_sys_rt_sigprocmask()
      6ec40b42