1. 06 2月, 2013 3 次提交
    • L
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 1589a3e7
      Linus Torvalds 提交于
      Pull media fixes from Mauro Carvalho Chehab:
       "For a regression fix on a few radio drivers that were preventing radio
        TX to work on those devices"
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] radio: set vfl_dir correctly to fix modulator regression
      1589a3e7
    • L
      Merge tag 'usb-3.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 0f632118
      Linus Torvalds 提交于
      Pull USB fixes from Greg Kroah-Hartman:
       "Here are a few tiny USB fixes for 3.8-rc6.
      
        Nothing major here, some host controller bug fixes to resolve a number
        of bugs that people have reported, and a bunch of additional device
        ids are added to a number of drivers (which caused code to be deleted
        from the usb-storage driver, always nice)"
      
      * tag 'usb-3.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (22 commits)
        USB: storage: optimize to match the Huawei USB storage devices and support new switch command
        USB: storage: Define a new macro for USB storage match rules
        USB: ftdi_sio: add Zolix FTDI PID
        USB: option: add Changhong CH690
        USB: ftdi_sio: add PID/VID entries for ELV WS 300 PC II
        USB: add OWL CM-160 support to cp210x driver
        USB: EHCI: fix bug in scheduling periodic split transfers
        USB: EHCI: fix for leaking isochronous data
        USB: option: add support for Telit LE920
        USB: qcserial: add Telit Gobi QDL device
        USB: EHCI: fix timer bug affecting port resume
        USB: UHCI: notify usbcore about port resumes
        USB: EHCI: notify usbcore about port resumes
        USB: add usb_hcd_{start,end}_port_resume
        USB: EHCI: unlink one async QH at a time
        USB: EHCI: remove ASS/PSS polling timeout
        usb: Using correct way to clear usb3.0 device's remote wakeup feature.
        usb: Prevent dead ports when xhci is not enabled
        USB: XHCI: fix memory leak of URB-private data
        drivers: xhci: fix incorrect bit test
        ...
      0f632118
    • L
      Merge branch 'fixes-for-v3.8-rc7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · 85e28c76
      Linus Torvalds 提交于
      Pull DMA mapping fixes from Marek Szyprowski:
       "This pull request contains important bugfix patches for 9
        architectures, which finally fixes broken allmodconfig builds
        introduced in v3.8-rc1.  Those architectures don't use dma_map_ops
        based implementation and require manual update or additional dummy
        implementations of the missing new dma-mapping api functions:
        dma_mmap_coherent and dma_get_sgtable."
      
      * 'fixes-for-v3.8-rc7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        xtensa: Provide dummy dma_mmap_coherent() and dma_get_sgtable()
        parisc: Provide dummy dma_mmap_coherent() and dma_get_sgtable()
        mn10300: Provide dummy dma_mmap_coherent() and dma_get_sgtable()
        m68k: Provide dma_mmap_coherent() and dma_get_sgtable()
        frv: Provide dummy dma_mmap_coherent() and dma_get_sgtable()
        cris: Provide dma_mmap_coherent() and dma_get_sgtable()
        c6x: Provide dummy dma_mmap_coherent() and dma_get_sgtable()
        blackfin: Provide dma_mmap_coherent() and dma_get_sgtable()
        avr32: Provide dma_mmap_coherent() and dma_get_sgtable()
      85e28c76
  2. 05 2月, 2013 22 次提交
  3. 04 2月, 2013 4 次提交
    • B
      x86/intel/cacheinfo: Shut up annoying warning · f76e39c5
      Borislav Petkov 提交于
      I've been getting the following warning when doing randbuilds
      since forever. Now it finally pissed me off just the perfect
      amount so that I can fix it.
      
        arch/x86/kernel/cpu/intel_cacheinfo.c:489:27: warning: ‘cache_disable_0’ defined but not used [-Wunused-variable]
        arch/x86/kernel/cpu/intel_cacheinfo.c:491:27: warning: ‘cache_disable_1’ defined but not used [-Wunused-variable] arch/x86/kernel/cpu/intel_cacheinfo.c:524:27: warning: ‘subcaches’ defined but not used [-Wunused-variable]
      
      It happens because in randconfigs where CONFIG_SYSFS is not set,
      the whole sysfs-interface to L3 cache index disabling is
      remaining unused and gcc correctly warns about it. Make it
      optional, depending on CONFIG_SYSFS too, as is the case with
      other sysfs-related machinery in this file.
      Signed-off-by: NBorislav Petkov <bp@suse.de>
      Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
      Link: http://lkml.kernel.org/r/1359969195-27362-1-git-send-email-bp@alien8.deSigned-off-by: NIngo Molnar <mingo@kernel.org>
      f76e39c5
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 6edacf05
      Linus Torvalds 提交于
      Pull powerpc update from Benjamin Herrenschmidt:
       "Just so that you don't get too bored on your Island here's a patch for
        3.8 fixing a nasty bug that affects the new 64T support that was
        merged in 3.7.  Please apply whenever you have a chance (and an
        internet connection!)"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/mm: Fix hash computation function
      6edacf05
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · f19637e7
      Linus Torvalds 提交于
      Pull radeon fixes from Dave Airlie:
       "I got these late last week, the main chunks of these fix a rendering
        regression since 3.7, and the settle ones all fix the issue where we
        don't wait long enough for the memory controller to settle after
        turning it off which causes bad memory reads, they all fix real users
        bugs, and most of them are destined for stable.
      
        Can't remember if you had net connection on that island :-)"
      
      I don't know if the "two tin-cans and a string" thing here on "that
      island" can really be considered internet, but I guess I can pull
      things.  Barely.
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: switch back to the CP ring for VM PT updates
        drm/radeon: prevent crash in the ring space allocation
        drm/radeon: Calling object_unrefer() when creating fb failure
        drm/radeon/r5xx-r7xx: wait for the MC to settle after MC blackout
        drm/radeon/evergreen+: wait for the MC to settle after MC blackout
        drm/radeon: protect against div by 0 in backend setup
        drm/radeon: fix backend map setup on 1 RB sumo boards
        drm/radeon: add quirk for RV100 board
        drm/radeon: add WAIT_UNTIL to the non-VM safe regs list for cayman/TN
        drm/radeon: fix MC blackout on evergreen+
      f19637e7
    • A
      powerpc/mm: Fix hash computation function · eda8eebd
      Aneesh Kumar K.V 提交于
      The ASM version of hash computation function was truncating the upper bit.
      Make the ASM version similar to hpt_hash function. Remove masking vsid bits.
      Without this patch, we observed hang during bootup due to not satisfying page
      fault request correctly. The fault handler used wrong hash values to update
      the HPTE. Hence we kept looping with page fault.
      
      hash_page(ea=000001003e260008, access=203, trap=300 ip=3fff91787134 dsisr 42000000
      The computed value of hash 000000000f22f390
      update: avpnv=4003e46054003e00, hash=000000000722f390, f=80000006, psize: 2 ...
      
      BenH: The over-masking has been there for ever but only hurts with the
      new 64T support introduced in 3.7
      Reported-by: NMike Qiu <qiudayu@linux.vnet.ibm.com>
      Signed-off-by: NAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Tested-by: NMike Qiu <qiudayu@linux.vnet.ibm.com>
      Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      CC: <stable@vger.kernel.org> [v3.7]
      eda8eebd
  4. 03 2月, 2013 1 次提交
  5. 02 2月, 2013 4 次提交
  6. 01 2月, 2013 6 次提交