1. 09 8月, 2013 3 次提交
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · bb014db0
      Linus Torvalds 提交于
      Pull virtio fixes from Rusty Russell:
       "More virtio console fixes than I'm happy with, but all real issues,
        and all CC:stable.."
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        virtio-scsi: Fix virtqueue affinity setup
        virtio: console: return -ENODEV on all read operations after unplug
        virtio: console: fix raising SIGIO after port unplug
        virtio: console: clean up port data immediately at time of unplug
        virtio: console: fix race in port_fops_open() and port unplug
        virtio: console: fix race with port unplug and open/close
        virtio/console: Add pipe_lock/unlock for splice_write
        virtio/console: Quit from splice_write if pipe->nrbufs is 0
      bb014db0
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 67ef6265
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Kevin Hilman:
       - MSM: GPIO fixes (includes old code removal)
       - OMAP: earlyprintk regression, AM33xx cpgmac PM regression
       - OMAP5: urgent fix for potentially harmful voltage regulator values
       - Renesas: gpio-keys fix, fix SD card detection, fix shdma calculation
         error
       - STi: critical SMP boot fix
       - tegra: DTS fix for usb-phy
       - a couple MAINTAINERS updates
      
      (Arnd is on paternity leave, Kevin is stepping up to help arm-soc
      maintenance)
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        MAINTAINERS: add TI Keystone ARM platform
        MAINTAINERS: delete Srinidhi from ux500
        ARM: tegra: enable ULPI phy on Colibri T20
        ARM: STi: remove sti_secondary_start from INIT section.
        ARM: STi: Fix cpu nodes with correct device_type.
        ARM: shmobile: lager: do not annotate gpio_buttons as __initdata
        ARM: shmobile: BOCK-W: fix SDHI0 PFC settings
        shdma: fixup sh_dmae_get_partial() calculation error
        ARM: OMAP2+: hwmod: AM335x: fix cpgmac address space
        ARM: OMAP2+: hwmod: rt address space index for DT
        ARM: OMAP2+: Sync hwmod state with the pm_runtime and omap_device state
        ARM: OMAP2+: Avoid idling memory controllers with no drivers
        ARM: OMAP2+: hwmod: Fix a crash in _setup_reset() with DEBUG_LL
        ARM: dts: omap5-uevm: update optional/unused regulator configurations
        ARM: dts: omap5-uevm: fix regulator configurations mandatory for SoC
        ARM: dts: omap5-uevm: document regulator signals used on the actual board
        ARM: msm: Consolidate gpiomux for older architectures
        ARM: shmobile: armadillo800eva: Don't request GPIO 166 in board code
        ARM: msm: dts: Fix the gpio register address for msm8960
      67ef6265
    • L
      Revert "slub: do not put a slab to cpu partial list when cpu_partial is 0" · 37090506
      Linus Torvalds 提交于
      This reverts commit 318df36e.
      
      This commit caused Steven Rostedt's hackbench runs to run out of memory
      due to a leak.  As noted by Joonsoo Kim, it is buggy in the following
      scenario:
      
       "I guess, you may set 0 to all kmem caches's cpu_partial via sysfs,
        doesn't it?
      
        In this case, memory leak is possible in following case.  Code flow of
        possible leak is follwing case.
      
         * in __slab_free()
         1. (!new.inuse || !prior) && !was_frozen
         2. !kmem_cache_debug && !prior
         3. new.frozen = 1
         4. after cmpxchg_double_slab, run the (!n) case with new.frozen=1
         5. with this patch, put_cpu_partial() doesn't do anything,
            because this cache's cpu_partial is 0
         6. return
      
        In step 5, leak occur"
      
      And Steven does indeed have cpu_partial set to 0 due to RT testing.
      
      Joonsoo is cooking up a patch, but everybody agrees that reverting this
      for now is the right thing to do.
      Reported-and-bisected-by: NSteven Rostedt <rostedt@goodmis.org>
      Acked-by: NJoonsoo Kim <iamjoonsoo.kim@lge.com>
      Acked-by: NPekka Enberg <penberg@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      37090506
  2. 08 8月, 2013 4 次提交
    • L
      Merge tag 'trace-fixes-3.11-rc3' of... · b7bc9e7d
      Linus Torvalds 提交于
      Merge tag 'trace-fixes-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fixes from Steven Rostedt:
       "Oleg Nesterov has been working hard in closing all the holes that can
        lead to race conditions between deleting an event and accessing an
        event debugfs file.  This included a fix to the debugfs system (acked
        by Greg Kroah-Hartman).  We think that all the holes have been patched
        and hopefully we don't find more.  I haven't marked all of them for
        stable because I need to examine them more to figure out how far back
        some of the changes need to go.
      
        Along the way, some other fixes have been made.  Alexander Z Lam fixed
        some logic where the wrong buffer was being modifed.
      
        Andrew Vagin found a possible corruption for machines that actually
        allocate cpumask, as a reference to one was being zeroed out by
        mistake.
      
        Dhaval Giani found a bad prototype when tracing is not configured.
      
        And I not only had some changes to help Oleg, but also finally fixed a
        long standing bug that Dave Jones and others have been hitting, where
        a module unload and reload can cause the function tracing accounting
        to get screwed up"
      
      * tag 'trace-fixes-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix reset of time stamps during trace_clock changes
        tracing: Make TRACE_ITER_STOP_ON_FREE stop the correct buffer
        tracing: Fix trace_dump_stack() proto when CONFIG_TRACING is not set
        tracing: Fix fields of struct trace_iterator that are zeroed by mistake
        tracing/uprobes: Fail to unregister if probe event files are in use
        tracing/kprobes: Fail to unregister if probe event files are in use
        tracing: Add comment to describe special break case in probe_remove_event_call()
        tracing: trace_remove_event_call() should fail if call/file is in use
        debugfs: debugfs_remove_recursive() must not rely on list_empty(d_subdirs)
        ftrace: Check module functions being traced on reload
        ftrace: Consolidate some duplicate code for updating ftrace ops
        tracing: Change remove_event_file_dir() to clear "d_subdirs"->i_private
        tracing: Introduce remove_event_file_dir()
        tracing: Change f_start() to take event_mutex and verify i_private != NULL
        tracing: Change event_filter_read/write to verify i_private != NULL
        tracing: Change event_enable/disable_read() to verify i_private != NULL
        tracing: Turn event/id->i_private into call->event.type
      b7bc9e7d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 8ef9c292
      Linus Torvalds 提交于
      Pull vfs fixes from Al Viro.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        vfs: add missing check for __O_TMPFILE in fcntl_init()
        fs: Allow unprivileged linkat(..., AT_EMPTY_PATH) aka flink
        fs: Fix file mode for O_TMPFILE
        reiserfs: fix deadlock in umount
      8ef9c292
    • S
      MAINTAINERS: add TI Keystone ARM platform · 1154f858
      Santosh Shilimkar 提交于
      Adding maintainer for arch/arm/mach-keystone/
      Signed-off-by: NSantosh Shilimkar <santosh.shilimkar@ti.com>
      Signed-off-by: NKevin Hilman <khilman@linaro.org>
      1154f858
    • L
      MAINTAINERS: delete Srinidhi from ux500 · 60ba4f48
      Linus Walleij 提交于
      Srinidhi's mail address is now bouncing and he has requested
      me to delete this entry.
      Acked-by: NSrinidhi Kasagar <srinidhi.kasagar@stericsson.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NKevin Hilman <khilman@linaro.org>
      60ba4f48
  3. 07 8月, 2013 9 次提交
  4. 05 8月, 2013 19 次提交
  5. 04 8月, 2013 5 次提交
    • A
      drm/radeon: fix 64 bit divide in SI spm code · adfb8e51
      Alex Deucher 提交于
      Forgot to use the appropriate math64 function.
      Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: NDave Airlie <airlied@gmail.com>
      adfb8e51
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 72a67a94
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Don't ignore user initiated wireless regulatory settings on cards
          with custom regulatory domains, from Arik Nemtsov.
      
       2) Fix length check of bluetooth information responses, from Jaganath
          Kanakkassery.
      
       3) Fix misuse of PTR_ERR in btusb, from Adam Lee.
      
       4) Handle rfkill properly while iwlwifi devices are offline, from
          Emmanuel Grumbach.
      
       5) Fix r815x devices DMA'ing to stack buffers, from Hayes Wang.
      
       6) Kernel info leak in ATM packet scheduler, from Dan Carpenter.
      
       7) 8139cp doesn't check for DMA mapping errors, from Neil Horman.
      
       8) Fix bridge multicast code to not snoop when no querier exists,
          otherwise mutlicast traffic is lost.  From Linus Lüssing.
      
       9) Avoid soft lockups in fib6_run_gc(), from Michal Kubecek.
      
      10) Fix races in automatic address asignment on ipv6, which can result
          in incorrect lifetime assignments.  From Jiri Benc.
      
      11) Cure build bustage when CONFIG_NET_LL_RX_POLL is not set and rename
          it CONFIG_NET_RX_BUSY_POLL to eliminate the last reference to the
          original naming of this feature.  From Cong Wang.
      
      12) Fix crash in TIPC when server socket creation fails, from Ying Xue.
      
      13) macvlan_changelink() silently succeeds when it shouldn't, from
          Michael S Tsirkin.
      
      14) HTB packet scheduler can crash due to sign extension, fix from
          Stephen Hemminger.
      
      15) With the cable unplugged, r8169 prints out a message every 10
          seconds, make it netif_dbg() instead of netif_warn().  From Peter
          Wu.
      
      16) Fix memory leak in rtm_to_ifaddr(), from Daniel Borkmann.
      
      17) sis900 gets spurious TX queue timeouts due to mismanagement of link
          carrier state, from Denis Kirjanov.
      
      18) Validate somaxconn sysctl to make sure it fits inside of a u16.
          From Roman Gushchin.
      
      19) Fix MAC address filtering on qlcnic, from Shahed Shaikh.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (68 commits)
        qlcnic: Fix for flash update failure on 83xx adapter
        qlcnic: Fix link speed and duplex display for 83xx adapter
        qlcnic: Fix link speed display for 82xx adapter
        qlcnic: Fix external loopback test.
        qlcnic: Removed adapter series name from warning messages.
        qlcnic: Free up memory in error path.
        qlcnic: Fix ingress MAC learning
        qlcnic: Fix MAC address filter issue on 82xx adapter
        net: ethernet: davinci_emac: drop IRQF_DISABLED
        netlabel: use domain based selectors when address based selectors are not available
        net: check net.core.somaxconn sysctl values
        sis900: Fix the tx queue timeout issue
        net: rtm_to_ifaddr: free ifa if ifa_cacheinfo processing fails
        r8169: remove "PHY reset until link up" log spam
        net: ethernet: cpsw: drop IRQF_DISABLED
        htb: fix sign extension bug
        macvlan: handle set_promiscuity failures
        macvlan: better mode validation
        tipc: fix oops when creating server socket fails
        net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL
        ...
      72a67a94
    • H
      qlcnic: Fix for flash update failure on 83xx adapter · 4bd8e738
      Himanshu Madhani 提交于
      Flash update routine was improperly checking register read API return value.
      Modify register read API and perform proper error check.
      Signed-off-by: NHimanshu Madhani <himanshu.madhani@qlogic.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4bd8e738
    • R
      qlcnic: Fix link speed and duplex display for 83xx adapter · b1f5037f
      Rajesh Borundia 提交于
      o Set link speed and duplex to unknown when link is not up.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@qlogic.com>
      Signed-off-by: NShahed Shaikh <shahed.shaikh@qlogic.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b1f5037f
    • R
      qlcnic: Fix link speed display for 82xx adapter · beb3d3a4
      Rajesh Borundia 提交于
      o Do not obtain link speed from register when adapter
        link is down.
      Signed-off-by: NRajesh Borundia <rajesh.borundia@qlogic.com>
      Signed-off-by: NShahed Shaikh <shahed.shaikh@qlogic.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      beb3d3a4