1. 24 9月, 2012 17 次提交
  2. 23 9月, 2012 4 次提交
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · e5e77cf9
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "Random fixes across arch/mips, essentially.
      
        One fix for an issue in get_user_pages_fast() which previously was
        discovered on x86, a miscalculation in the support for the MIPS MT
        hardware multithreading support, the RTC support for the Malta and a
        fix for a spurious interrupt issue that seems to bite only very
        special Malta configurations."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: Malta: Don't crash on spurious interrupt.
        MIPS: Malta: Remove RTC Data Mode bootstrap breakage
        MIPS: mm: Add compound tail page _mapcount when mapped
        MIPS: CMP/SMTC: Fix tc_id calculation
      e5e77cf9
    • L
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · b3a297d1
      Linus Torvalds 提交于
      Pull ARM and clkdev fixes from Russell King:
       "Two patches for clkdev which resolve the long standing issue that the
        devm_* versions were dependent on clkdev, which they shouldn't have
        been.  Instead, they're dependent on HAVE_CLK instead, which implies
        that you're providing clk_get() and clk_put().
      
        A small fix to the ARM decompressor to ensure that the page tables are
        properly interpreted by the CPU, and reserve syscall 378 for kcmp (the
        checksyscalls.sh script is unfortunately currently broken so arch
        maintainers aren't getting notified of new syscalls...)
      
        Lastly, a larger fix for an issue between the common clk subsystem and
        smp_twd which causes warnings to be spat out."
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: reserve syscall 378 for kcmp
        ARM: 7535/1: Reprogram smp_twd based on new common clk framework notifiers
        ARM: 7537/1: clk: Fix release in devm_clk_put()
        ARM: 7532/1: decompressor: reset SCTLR.TRE for VMSA ARMv7 cores
        ARM: 7534/1: clk: Make the managed clk functions generically available
      b3a297d1
    • L
      Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · cead24c1
      Linus Torvalds 提交于
      Pull HID fixes from Jiri Kosina:
       "The most important fix is Logitech Unifying receiver regression in
        device enumeration fix from Nestor Lopez Casado.  In addition to that,
        there is a small memory leak fix for Thinkpad keyboard driver from
        Axel Lin."
      
      * 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: Fix logitech-dj: missing Unifying device issue
        HID: lenovo-tpkbd: Fix memory leak in tpkbd_remove_tp()
      cead24c1
    • L
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · a4be6c77
      Linus Torvalds 提交于
      Pull cifs fix from Steve French.
      
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: fix return value in cifsConvertToUTF16
      a4be6c77
  3. 22 9月, 2012 19 次提交
    • N
      HID: Fix logitech-dj: missing Unifying device issue · 59626408
      Nestor Lopez Casado 提交于
      This patch fixes an issue introduced after commit 4ea54542
      ("HID: Fix race condition between driver core and ll-driver").
      
      After that commit, hid-core discards any incoming packet that arrives while
      hid driver's probe function is being executed.
      
      This broke the enumeration process of hid-logitech-dj, that must receive
      control packets in-band with the mouse and keyboard packets. Discarding mouse
      or keyboard data at the very begining is usually fine, but it is not the case
      for control packets.
      
      This patch forces a re-enumeration of the paired devices when a packet arrives
      that comes from an unknown device.
      
      Based on a patch originally written by Benjamin Tissoires.
      
      Cc: stable@vger.kernel.org   # v3.2+
      Signed-off-by: NNestor Lopez Casado <nlopezcasad@logitech.com>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      59626408
    • A
      HID: lenovo-tpkbd: Fix memory leak in tpkbd_remove_tp() · 39149980
      Axel Lin 提交于
      We need to kfree names for led_mute and led_micmute in tpkbd_remove_tp().
      Signed-off-by: NAxel Lin <axel.lin@gmail.com>
      Acked-by: NBernhard Seibold <mail@bernhard-seibold.de>
      Signed-off-by: NJiri Kosina <jkosina@suse.cz>
      39149980
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · abef3bd7
      Linus Torvalds 提交于
      Pull networking updates from David Miller:
       "More bug fixes, nothing gets past these guys"
      
       1) More kernel info leaks found by Mathias Krause, this time in the
          IPSEC configuration layers.
      
       2) When IPSEC policies change, we do not properly make sure that cached
          routes (which could now be stale) throughout the system will be
          revalidated.  Fix this by generalizing the generation count
          invalidation scheme used by ipv4.  From Nicolas Dichtel.
      
       3) When repairing TCP sockets, we need to allow to restore not just the
          send window scale, but the receive one too.  Extend the existing
          interface to achieve this in a backwards compatible way.  From
          Andrey Vagin.
      
       4) A fix for FCOE scatter gather feature validation erroneously caused
          scatter gather to be disabled for things like AOE too.  From Ed L
          Cashin.
      
       5) Several cases of mishandling of error pointers, from Mathias Krause,
          Wei Yongjun, and Devendra Naga.
      
       6) Fix gianfar build, from Richard Cochran.
      
       7) CAP_NET_* failures should return -EPERM not -EACCES, from Zhao
          Hongjiang.
      
       8) Hardware reset fix in janz-ican3 CAN driver, from Ira W Snyder.
      
       9) Fix oops during rmmod in ti_hecc CAN driver, from Marc Kleine-Budde.
      
      10) The removal of the conditional compilation of the clk support code
          in the stmmac driver broke things.  This is because the interfaces
          used are the ones that don't also perform the enable/disable of the
          clk.  Fix from Stefan Roese.
      
      11) The QFQ packet scheduler can record out of range virtual start
          times, resulting later in misbehavior and even crashes.  Fix from
          Paolo Valente.
      
      12) If MSG_WAITALL is used with IOAT DMA under TCP, we can wedge the
          receiver when the advertised receive window goes to zero.  Detect
          this case and force the processing of the IOAT DMA queue when it
          happens to avoid getting stuck.  Fix from Michal Kubecek.
      
      13) batman-adv assumes that test_bit() returns only 0 or 1, but this is
          not true for x86 (which returns -1 or 0, via the 'sbb' instruction).
          Fix from Linus Lussing.
      
      14) Fix small packet corruption in e1000, from Tushar Dave.
      
      15) make_blackhole() in the IPSEC policy code can do one read unlock too
          many, fix from Li RongQing.
      
      16) The new tcp_try_coalesce() code introduced a bug in TCP URG
          handling, fix from Eric Dumazet.
      
      17) Fix memory leak in __netif_receive_skb() when doing zerocopy and
          when hit an OOM condition.  From Michael S Tsirkin.
      
      18) netxen blindly deferences pdev->bus->self, which is not guarenteed
          to be non-NULL.  Fix from Nikolay Aleksandrov.
      
      19) Fix a performance regression caused by mistakes in ipv6 checksum
          validation in the bnx2x driver, fix from Michal Schmidt.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
        net/stmmac: Use clk_prepare_enable and clk_disable_unprepare
        net: change return values from -EACCES to -EPERM
        net/irda: sh_sir: fix return value check in sh_sir_set_baudrate()
        stmmac: fix return value check in stmmac_open_ext_timer()
        gianfar: fix phc index build failure
        ipv6: fix return value check in fib6_add()
        bnx2x: remove false warning regarding interrupt number
        can: ti_hecc: fix oops during rmmod
        can: janz-ican3: fix support for older hardware revisions
        net: do not disable sg for packets requiring no checksum
        aoe: assert AoE packets marked as requiring no checksum
        at91ether: return PTR_ERR if call to clk_get fails
        xfrm_user: don't copy esn replay window twice for new states
        xfrm_user: ensure user supplied esn replay window is valid
        xfrm_user: fix info leak in copy_to_user_tmpl()
        xfrm_user: fix info leak in copy_to_user_policy()
        xfrm_user: fix info leak in copy_to_user_state()
        xfrm_user: fix info leak in copy_to_user_auth()
        net: qmi_wwan: adding Huawei E367, ZTE MF683 and Pantech P4200
        tcp: restore rcv_wscale in a repair mode (v2)
        ...
      abef3bd7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 6219844e
      Linus Torvalds 提交于
      Pull sparc updates from David Miller:
      
      1) Debugging builds on 32-bit sparc need to handle the R_SPARC_DISP32
         relocation, not just 64-bit sparc.  From Andreas Larsson.
      
      2) Wei Yongjun noticed that module_alloc() on sparc can return an
         error pointer, but that's not allowed.  module_alloc() should
         return only a valid pointer, or NULL.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc: fix the return value of module_alloc()
        sparc32: Enable the relocation target R_SPARC_DISP32 for sparc32
      6219844e
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9d108907
      Linus Torvalds 提交于
      Pull x86 fixes from Ingo Molnar:
       "Small fixlets"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm/init.c: Fix devmem_is_allowed() off by one
        x86/kconfig: Remove outdated reference to Intel CPUs in CONFIG_SWIOTLB
      9d108907
    • L
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 519b3b74
      Linus Torvalds 提交于
      Pull timer fix from Ingo Molnar:
       "One more timekeeping fix for v3.6"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        time: Fix timeekeping_get_ns overflow on 32bit systems
      519b3b74
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 18f5600b
      Linus Torvalds 提交于
      Pull perf fixes from Ingo Molnar:
       "Small perf fixlets"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        tracing: Don't call page_to_pfn() if page is NULL
        perf/x86: Fix Intel Ivy Bridge support
        perf/x86/ibs: Check syscall attribute flags
        perf/x86: Export Sandy Bridge uncore clockticks event in sysfs
      18f5600b
    • L
      Merge tag 'for-linus-v3.6-rc7' of git://oss.sgi.com/xfs/xfs · 789f95b7
      Linus Torvalds 提交于
      Pull xfs bugfixes from Ben Myers:
       - fix a regression related to xfs_sync_worker racing with unmount.
       - fix a race while discarding xfs buffers.
      
      * tag 'for-linus-v3.6-rc7' of git://oss.sgi.com/xfs/xfs:
        xfs: stop the sync worker before xfs_unmountfs
        xfs: fix race while discarding buffers [V4]
      789f95b7
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 36a21fe6
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Fixes for big 3 drivers:
      
        nouveau: revert earlier MBP fix, put a dmi based MBP fix in its place
        (fixes a regression we found on some Dell eDP panels doing some
        internal testing)
      
        radeon: revert pll fixes, real fix is too invasive, fix scratch leak
      
        intel: 3 minor fixes, one for HDMI audio."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/nouveau: add dmi quirk for gpio reset
        drm/radeon: Prevent leak of scratch register on resume from suspend
        Revert "drm/nv50-/gpio: initialise to vbios defaults during init"
        Revert "drm/radeon: rework pll selection (v3)"
        drm/i915: HDMI - Clear Audio Enable bit for Hot Plug
        drm/i915: Reduce a pin-leak BUG into a WARN
        drm/i915: enable lvds pin pairs before dpll on gen2
      36a21fe6
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 6551d6fe
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "Updates for the input subsystem.  Just a few driver updates mostly
        dealing with recent regressions."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: edt-ft5x06 - return -EFAULT on copy_to_user() error
        Input: sentelic - filter out erratic movement when lifting finger
        Input: ambakmi - [un]prepare clocks when enabling amd disabling
        Input: i8042 - disable mux on Toshiba C850D
        Revert "input: ab8500-ponkey: Create AB8500 domain IRQ mapping"
        Input: imx_keypad - fix missing clk conversions
        Input: usbtouchscreen - initialize eGalax devices
      6551d6fe
    • L
      Merge git://www.linux-watchdog.org/linux-watchdog · 868f480b
      Linus Torvalds 提交于
      Pull watchdog fixes from Wim Van Sebroeck:
       "Fix a kdump issue in hpwdt and a possible NULL dereference."
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: move the dereference below the NULL test
        hpwdt: Fix kdump issue in hpwdt
      868f480b
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 6d77987f
      Linus Torvalds 提交于
      Pull hwmon fixes from Guenter Roeck:
       - Add missing 'name' sysfs attributes to ad7314 and ads7871 drivers
       - Bump maximum wait time for applesmc driver (again)
       - Fix build warning seen with W=1 in include/linux/kernel.h, introduced
         with commit b6d86d3d ("Fix DIV_ROUND_CLOSEST to support negative
         dividends")
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        linux/kernel.h: Fix warning seen with W=1 due to change in DIV_ROUND_CLOSEST
        hwmon: (applesmc) Bump max wait
        hwmon: (ad7314) Add 'name' sysfs attribute
        hwmon: (ads7871) Add 'name' sysfs attribute
      6d77987f
    • L
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 06b050eb
      Linus Torvalds 提交于
      Pull slave-dmaengine fixes from Vinod Koul:
       "There are two trivial fixes in pl330 driver and two in at_hdmac
        driver."
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        DMA: PL330: Check the pointer returned by kzalloc
        DMA: PL330: Fix potential NULL pointer dereference in pl330_submit_req()
        dmaengine: at_hdmac: check that each sg data length is non-null
        dmaengine: at_hdmac: fix comment in atc_prep_slave_sg()
      06b050eb
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 63365013
      Linus Torvalds 提交于
      Pull arm-soc bug fixes from Olof Johansson:
       "A couple of samsung clock locking fixes, at91 device tree gpio
        configuration fix and a couple more for shmobile and i.MX.
      
        All small targeted fixes."
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM i.MX25: Make timer irq work again
        ARM: imx: armadillo5x0: Fix illegal register access
        ARM: shmobile: kzm9g: bugfix: correct mmcif interrupt settings
        ARM: SAMSUNG: Use spin_lock_{irqsave,irqrestore} in clk_set_rate
        ARM: at91: fix missing #interrupt-cells on gpio-controller
        ARM: SAMSUNG: use spin_lock_irqsave() in clk_set_parent
      63365013
    • W
      sparc: fix the return value of module_alloc() · a9e8d1a6
      Wei Yongjun 提交于
      In case of error, function module_alloc() in other platform never
      returns ERR_PTR(), and all of the user only check for NULL, so
      we'd better return NULL instead of ERR_PTR().
      
      dpatch engine is used to auto generated this patch.
      (https://github.com/weiyj/dpatch)
      Signed-off-by: NWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a9e8d1a6
    • A
      sparc32: Enable the relocation target R_SPARC_DISP32 for sparc32 · dfa520af
      Andreas Larsson 提交于
      GNU Binutils 2.20.1 generates .eh_frame sections that uses R_SPARC_DISP32.
      Signed-off-by: NAndreas Larsson <andreas@gaisler.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dfa520af
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 267b50fe
      Linus Torvalds 提交于
      Pull s390 fixes from Martin Schwidefsky:
       "Bug fixes for 3.6-rc7, including some important patches for large page
        related memory management issues."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/dasd: fix read unit address configuration loop
        s390/dasd: fix pathgroup race
        s390/mm: fix user access page-table walk code
        s390/hwcaps: do not report high gprs for 31 bit kernel
        s390/cio: invalidate cdev pointer before deregistration
        s390/cio: fix IO subchannel event race
        s390/dasd: move wake_up call
        s390/hugetlb: use direct TLB flushing for hugetlbfs pages
        s390/mm: fix deadlock in unmap_hugepage_range()
      267b50fe
    • L
      Merge tag 'stable/for-linus-3.6-rc6-tag' of... · 8ca7de91
      Linus Torvalds 提交于
      Merge tag 'stable/for-linus-3.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen bug-fixes from Konrad Rzeszutek Wilk:
       - Fix M2P batching re-using the incorrect structure field.
      
         In v3.5 we added batching for M2P override (Machine Frame Number ->
         Physical Frame Number), but the original MFN was saved in an
         incorrect structure - and we would oops/restore when restoring with
         the old MFN.
      
       - Disable BIOS SMP MP table search.
      
         A bootup issue that we had ignored until we found that on DL380 G6 it
         was needed.
      
      * tag 'stable/for-linus-3.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/boot: Disable BIOS SMP MP table search.
        xen/m2p: do not reuse kmap_op->dev_bus_addr
      8ca7de91
    • S
      net/stmmac: Use clk_prepare_enable and clk_disable_unprepare · a630844d
      Stefan Roese 提交于
      This patch fixes an issue introduced by commit ID 6a81c26f
      [net/stmmac: remove conditional compilation of clk code], which
      switched from the internal stmmac_clk_{en}{dis}able calls to
      clk_{en}{dis}able. By this, calling clk_prepare and clk_unprepare
      was removed.
      
      clk_{un}prepare is mandatory for platforms using common clock framework.
      Since these drivers are used by SPEAr platform, which supports common
      clock framework, add clk_{un}prepare() support for them. Otherwise
      the clocks are not correctly en-/disabled and ethernet support doesn't
      work.
      Signed-off-by: NStefan Roese <sr@denx.de>
      Cc: Viresh Kumar <viresh.kumar@linaro.org>
      Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
      Reviewed-by: NViresh Kumar <viresh.kumar@linaro.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a630844d