1. 19 5月, 2013 2 次提交
  2. 18 5月, 2013 1 次提交
  3. 17 5月, 2013 20 次提交
  4. 16 5月, 2013 17 次提交
    • L
      Merge branch 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 5c64e3a4
      Linus Torvalds 提交于
      Pull target fixes from Nicholas Bellinger:
       "A handful of fixes + minor changes this time around, along with one
        important >= v3.9 regression fix for IBLOCK backends.  The highlights
        include:
      
         - Use FD_MAX_SECTORS in FILEIO for block_device as
           well as files (agrover)
      
         - Fix processing of out-of-order CmdSNs with
           iSBD driver (shlomo)
      
         - Close long-standing target_put_sess_cmd() vs.
           core_tmr_abort_task() race with the addition of
           kref_put_spinlock_irqsave() (joern + greg-kh)
      
         - Fix IBLOCK WCE=1 + DPOFUA=1 backend WRITE
           regression in >= v3.9 (nab + bootc)
      
        Note these four patches are CC'ed to stable.
      
        Also, there is still some work left to be done on the active I/O
        shutdown path in target_wait_for_sess_cmds() used by tcm_qla2xxx +
        ib_isert fabrics that is still being discussed on the list, and will
        hopefully be resolved soon."
      
      * 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target: close target_put_sess_cmd() vs. core_tmr_abort_task() race
        target: removed unused transport_state flag
        target/iblock: Fix WCE=1 + DPOFUA=1 backend WRITE regression
        MAINTAINERS: Update target git tree URL
        iscsi-target: Fix typos in RDMAEXTENSIONS macro usage
        target/rd: Add ramdisk bit for NULLIO operation
        iscsi-target: Fix processing of OOO commands
        iscsi-target: Make buf param of iscsit_do_crypto_hash_buf() const void *
        iscsi-target: Fix NULL pointer dereference in iscsit_send_reject
        target: Have dev/enable show if TCM device is configured
        target: Use FD_MAX_SECTORS/FD_BLOCKSIZE for blockdevs using fileio
        target: Remove unused struct members in se_dev_entry
      5c64e3a4
    • R
      Merge branch 'acpi-fixes' · 49a9e431
      Rafael J. Wysocki 提交于
      * acpi-fixes:
        ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path
      49a9e431
    • R
      Merge branch 'pm-cpufreq' · e50caa95
      Rafael J. Wysocki 提交于
      * pm-cpufreq:
        cpufreq: Preserve sysfs files across suspend/resume
      e50caa95
    • D
    • M
      ALSA: snd-aoa: Add a layout entry for PowerBook6,5 · 08857861
      Michael Ellerman 提交于
      Either one or a combination of commits 81e5d864
      "Register i2c devices from device-tree" and 3a3dd018
      "Improve detection of devices from device-tree" broke sound on
      PowerBook6,5 machines.
      
      Fix it by adding an entry to the new driver to match PowerBook6,5
      machines.
      Signed-off-by: NMichael Ellerman <michael@ellerman.id.au>
      Acked-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      08857861
    • T
      Merge tag 'asoc-v3.10-rc1' of... · 478e858b
      Takashi Iwai 提交于
      Merge tag 'asoc-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
      
      ASoC: Fixes for v3.10
      
      A few small driver-specific fixes, none of them especially crippling.
      478e858b
    • T
      ALSA: hda - Check the activity of the NID to be powered down · b1b9fbd0
      Takashi Iwai 提交于
      When an inactive path is powered down with spec->power_down_unused
      flag, we should check the activity of each widget in the path whether
      it's still referred from any active path.
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      b1b9fbd0
    • T
      workqueue: don't perform NUMA-aware allocations on offline nodes in wq_numa_init() · 1be0c25d
      Tejun Heo 提交于
      wq_numa_init() builds per-node cpumasks which are later used to make
      unbound workqueues NUMA-aware.  The cpumasks are allocated using
      alloc_cpumask_var_node() for all possible nodes.  Unfortunately, on
      machines with off-line nodes, this leads to NUMA-aware allocations on
      existing bug offline nodes, which in turn triggers BUG in the memory
      allocation code.
      
      Fix it by using NUMA_NO_NODE for cpumask allocations for offline
      nodes.
      
        kernel BUG at include/linux/gfp.h:323!
        invalid opcode: 0000 [#1] SMP
        Modules linked in:
        CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.9.0+ #1
        Hardware name: ProLiant BL465c G7, BIOS A19 12/10/2011
        task: ffff880234608000 ti: ffff880234602000 task.ti: ffff880234602000
        RIP: 0010:[<ffffffff8117495d>]  [<ffffffff8117495d>] new_slab+0x2ad/0x340
        RSP: 0000:ffff880234603bf8  EFLAGS: 00010246
        RAX: 0000000000000000 RBX: ffff880237404b40 RCX: 00000000000000d0
        RDX: 0000000000000001 RSI: 0000000000000003 RDI: 00000000002052d0
        RBP: ffff880234603c28 R08: 0000000000000000 R09: 0000000000000001
        R10: 0000000000000001 R11: ffffffff812e3aa8 R12: 0000000000000001
        R13: ffff8802378161c0 R14: 0000000000030027 R15: 00000000000040d0
        FS:  0000000000000000(0000) GS:ffff880237800000(0000) knlGS:0000000000000000
        CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
        CR2: ffff88043fdff000 CR3: 00000000018d5000 CR4: 00000000000007f0
        DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
        DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
        Stack:
         ffff880234603c28 0000000000000001 00000000000000d0 ffff8802378161c0
         ffff880237404b40 ffff880237404b40 ffff880234603d28 ffffffff815edba1
         ffff880237816140 0000000000000000 ffff88023740e1c0
        Call Trace:
         [<ffffffff815edba1>] __slab_alloc+0x330/0x4f2
         [<ffffffff81174b25>] kmem_cache_alloc_node_trace+0xa5/0x200
         [<ffffffff812e3aa8>] alloc_cpumask_var_node+0x28/0x90
         [<ffffffff81a0bdb3>] wq_numa_init+0x10d/0x1be
         [<ffffffff81a0bec8>] init_workqueues+0x64/0x341
         [<ffffffff810002ea>] do_one_initcall+0xea/0x1a0
         [<ffffffff819f1f31>] kernel_init_freeable+0xb7/0x1ec
         [<ffffffff815d50de>] kernel_init+0xe/0xf0
         [<ffffffff815ff89c>] ret_from_fork+0x7c/0xb0
        Code: 45  84 ac 00 00 00 f0 41 80 4d 00 40 e9 f6 fe ff ff 66 0f 1f 84 00 00 00 00 00 e8 eb 4b ff ff 49 89 c5 e9 05 fe ff ff <0f> 0b 4c 8b 73 38 44 89 ff 81 cf 00 00 20 00 4c 89 f6 48 c1 ee
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Reported-and-Tested-by: NLingzhu Xiang <lxiang@redhat.com>
      1be0c25d
    • L
      Merge tag 'trace-fixes-v3.10-rc1' of... · c240a539
      Linus Torvalds 提交于
      Merge tag 'trace-fixes-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fixes from Steven Rostedt:
       "This includes a fix to a memory leak when adding filters to traces.
      
        Also, Masami Hiramatsu fixed up some minor bugs that were discovered
        by sparse."
      
      * tag 'trace-fixes-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing/kprobes: Make print_*probe_event static
        tracing/kprobes: Fix a sparse warning for incorrect type in assignment
        tracing/kprobes: Use rcu_dereference_raw for tp->files
        tracing: Fix leaks of filter preds
      c240a539
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ae3b29e6
      Linus Torvalds 提交于
      Pull x86 fixes from Thomas Gleixner:
      
       - Fix for a CPU hot-add deadlock in microcode update code
      
       - Fix for idle consolidation fallout
      
       - Documentation update for initial kernel direct mapping
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm: Add missing comments for initial kernel direct mapping
        x86/microcode: Add local mutex to fix physical CPU hot-add deadlock
        x86: Fix idle consolidation fallout
      ae3b29e6
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 652df602
      Linus Torvalds 提交于
      Pull perf fixes from Thomas Gleixner:
      
       - Fix for a task exit cleanup race caused by a missing a preempt
         disable
      
       - Cleanup of the event notification functions with a massive reduction
         of duplicated code
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf: Factor out auxiliary events notification
        perf: Fix EXIT event notification
      652df602
    • L
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · cc51bf6e
      Linus Torvalds 提交于
      Pull timer fixes from Thomas Gleixner:
      
       - Cure for not using zalloc in the first place, which leads to random
         crashes with CPUMASK_OFF_STACK.
      
       - Revert a user space visible change which broke udev
      
       - Add a missing cpu_online early return introduced by the new full
         dyntick conversions
      
       - Plug a long standing race in the timer wheel cpu hotplug code.
         Sigh...
      
       - Cleanup NOHZ per cpu data on cpu down to prevent stale data on cpu
         up.
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        time: Revert ALWAYS_USE_PERSISTENT_CLOCK compile time optimizaitons
        timer: Don't reinitialize the cpu base lock during CPU_UP_PREPARE
        tick: Don't invoke tick_nohz_stop_sched_tick() if the cpu is offline
        tick: Cleanup NOHZ per cpu data on cpu down
        tick: Use zalloc_cpumask_var for allocating offstack cpumasks
      cc51bf6e
    • L
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 37cae5e2
      Linus Torvalds 提交于
      Pull core fixes from Thomas Gleixner:
      
       - Two fixlets for the fallout of the generic idle task conversion
      
       - Documentation update
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        rcu/idle: Wrap cpu-idle poll mode within rcu_idle_enter/exit
        idle: Fix hlt/nohlt command-line handling in new generic idle
        kthread: Document ways of reducing OS jitter due to per-CPU kthreads
      37cae5e2
    • L
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · d21572c5
      Linus Torvalds 提交于
      Pull ARM fixes from Russell King:
       "A small number of fixes for stuff from the last merge window, and in
        one case (IRQ time accounting) the previous merge window."
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7720/1: ARM v6/v7 cmpxchg64 shouldn't clear upper 32 bits of the old/new value
        ARM: 7715/1: MCPM: adapt to GIC changes after upstream merge
        ARM: 7714/1: mmc: mmci: Ensure return value of regulator_enable() is checked
        ARM: 7712/1: Remove trailing whitespace in arch/arm/Makefile
        ARM: 7711/1: dove: fix Dove cpu type from V7 to PJ4
        ARM: finally enable IRQ time accounting config
      d21572c5
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 109c3c02
      Linus Torvalds 提交于
      Pull Ceph fixes from Sage Weil:
       "Yes, this is a much larger pull than I would like after -rc1.  There
        are a few things included:
      
         - a few fixes for leaks and incorrect assertions
         - a few patches fixing behavior when mapped images are resized
         - handling for cloned/layered images that are flattened out from
           underneath the client
      
        The last bit was non-trivial, and there is some code movement and
        associated cleanup mixed in.  This was ready and was meant to go in
        last week but I missed the boat on Friday.  My only excuse is that I
        was waiting for an all clear from the testing and there were many
        other shiny things to distract me.
      
        Strictly speaking, handling the flatten case isn't a regression and
        could wait, so if you like we can try to pull the series apart, but
        Alex and I would much prefer to have it all in as it is a case real
        users will hit with 3.10."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (33 commits)
        rbd: re-submit flattened write request (part 2)
        rbd: re-submit write request for flattened clone
        rbd: re-submit read request for flattened clone
        rbd: detect when clone image is flattened
        rbd: reference count parent requests
        rbd: define parent image request routines
        rbd: define rbd_dev_unparent()
        rbd: don't release write request until necessary
        rbd: get parent info on refresh
        rbd: ignore zero-overlap parent
        rbd: support reading parent page data for writes
        rbd: fix parent request size assumption
        libceph: init sent and completed when starting
        rbd: kill rbd_img_request_get()
        rbd: only set up watch for mapped images
        rbd: set mapping read-only flag in rbd_add()
        rbd: support reading parent page data
        rbd: fix an incorrect assertion condition
        rbd: define rbd_dev_v2_header_info()
        rbd: get rid of trivial v1 header wrappers
        ...
      109c3c02
    • S
      cpufreq: Preserve sysfs files across suspend/resume · a66b2e50
      Srivatsa S. Bhat 提交于
      The file permissions of cpufreq per-cpu sysfs files are not preserved
      across suspend/resume because we internally go through the CPU
      Hotplug path which reinitializes the file permissions on CPU online.
      
      But the user is not supposed to know that we are using CPU hotplug
      internally within suspend/resume (IOW, the kernel should not silently
      wreck the user-set file permissions across a suspend cycle).
      Therefore, we need to preserve the file permissions as they are
      across suspend/resume.
      
      The simplest way to achieve that is to just not touch the sysfs files
      at all - ie., just ignore the CPU hotplug notifications in the
      suspend/resume path (_FROZEN) in the cpufreq hotplug callback.
      Reported-by: NRobert Jarzmik <robert.jarzmik@intel.com>
      Reported-by: NDurgadoss R <durgadoss.r@intel.com>
      Signed-off-by: NSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Acked-by: NViresh Kumar <viresh.kumar@linaro.org>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      a66b2e50
    • C
      ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path · 7a26b530
      Catalin Marinas 提交于
      Following commit 6b772e8f (ACPI: Update PNPID match handling for
      notify), the acpi_scan_init_hotplug() calls acpi_set_pnp_ids() which
      allocates acpi_hardware_id and copies a few strings (kstrdup). If the
      devices does not have hardware_id set, the function exits without
      freeing the previously allocated ids (and kmemleak complains). This
      patch calls simply changes 'return' on error to a 'goto out' which
      calls acpi_free_pnp_ids().
      Reported-by: NLarry Finger <Larry.Finger@lwfinger.net>
      Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>
      Reviewed-by: NToshi Kani <toshi.kani@hp.com>
      Tested-by: NToshi Kani <toshi.kani@hp.com>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      7a26b530