1. 04 Aug, 2013 7 commits
  2. 26 Jul, 2013 4 commits
  3. 25 Jul, 2013 8 commits
  4. 24 Jul, 2013 8 commits
  5. 23 Jul, 2013 10 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 549f3a12
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "This is just a regular fixes pull, mostly nouveau and i915, the i915
        ones fix RC6 on Sandybridge after suspend/resume, which I think people
        have be wanting for quite a while!
      
        Now you shouldn't wish for more patches, as the new mutex/reservation
        code found a number of problems with the qxl driver, and it currently
        makes lockdep angry, I'm working on a set of fixes for it, but its a
        bit large, I'll submit them separately later today or tomorrow once
        I've banged on them a bit more, just warning you in advance :-)"
      
      Yeah, I'm definitely over the whole "wish for more patches" thing.
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/crtc-helper: explicit DPMS on after modeset
        drm/i915: fix up gt init sequence fallout
        drm/i915: Serialize almost all register access
        drm/i915: quirk no PCH_PWM_ENABLE for Dell XPS13 backlight
        drm/i915: correctly restore fences with objects attached
        drm/i915: Fix dereferencing invalid connectors in is_crtc_connector_off()
        drm/i915: Sanitize shared dpll state
        drm/i915: fix long-standing SNB regression in power consumption after resume v2
        drm/i915: Preserve the DDI_A_4_LANES bit from the bios
        drm/i915: fix pfit regression for non-autoscaled resolutions
        drm/i915: fix up readout of the lvds dither bit on gen2/3
        drm/nouveau: do not allow negative sizes for now
        drm/nouveau: add falcon interrupt handler
        drm/nouveau: use dedicated channel for async moves on GT/GF chipsets.
        drm/nouveau: bump fence timeout to 15 seconds
        drm/nouveau: do not unpin in nouveau_gem_object_del
        drm/nv50/kms: fix pin refcnt leaks
        drm/nouveau: fix some error-path leaks in fbcon handling code
        drm/nouveau: fix locking issues in page flipping paths
      549f3a12
    • David Howells's avatar
      Fix __wait_on_atomic_t() to call the action func if the counter != 0 · 42577ca8
      David Howells authored
      Fix __wait_on_atomic_t() so that it calls the action func if the counter != 0
      rather than if the counter is 0 so as to be analogous to __wait_on_bit().
      
      Thanks to Yacine who found this by visual inspection.
      
      This will affect FS-Cache in that it will could fail to sleep correctly when
      trying to clean up after a netfs cookie is withdrawn.
      Reported-by: default avatarYacine Belkadi <yacine.belkadi.1@gmail.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
      cc: Milosz Tanski <milosz@adfin.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      42577ca8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha · 7c6d4dca
      Linus Torvalds authored
      Pull alpha architecture fixes from Matt Turner:
       "This contains mostly clean ups and fixes but also an implementation of
        atomic64_dec_if_positive() and a pair of new syscalls"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
        alpha: Use handle_percpu_irq for the timer interrupt
        alpha: Force the user-visible HZ to a constant 1024.
        alpha: Don't if-out dp264_device_interrupt.
        alpha: Use __builtin_alpha_rpcc
        alpha: Fix type compatibility warning for marvel_map_irq
        alpha: Generate dwarf2 unwind info for various kernel entry points.
        alpha: Implement atomic64_dec_if_positive
        alpha: Improve atomic_add_unless
        alpha: Modernize lib/mpi/longlong.h
        alpha: Add kcmp and finit_module syscalls
        alpha: locks: remove unused arch_*_relax operations
        alpha: kernel: typo issue, using '1' instead of '11'
        alpha: kernel: using memcpy() instead of strcpy()
        alpha: Convert print_symbol to %pSR
      7c6d4dca
    • Linus Torvalds's avatar
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · a030cbc3
      Linus Torvalds authored
      Pull vhost fixes from Michael Tsirkin:
       "vhost: more fixes for 3.11
      
        This includes some fixes for vhost net and scsi drivers.
      
        The test module has already been reworked to avoid rcu usage, but the
        necessary core changes are missing, we fixed this.
      
        Unlikely to affect any real-world users, but it's early in the cycle
        so, let's merge them"
      
      (It was earlier when Michael originally sent the email, but it somehot
      got missed in the flood, so here it is after -rc2)
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
        vhost: Remove custom vhost rcu usage
        vhost-scsi: Always access vq->private_data under vq mutex
        vhost-net: Always access vq->private_data under vq mutex
      a030cbc3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 55c62960
      Linus Torvalds authored
      Pull fuse bugfixes from Miklos Szeredi:
       "These are bugfixes and a cleanup to the "readdirplus" feature"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: readdirplus: cleanup
        fuse: readdirplus: change attributes once
        fuse: readdirplus: fix instantiate
        fuse: readdirplus: sanity checks
        fuse: readdirplus: fix dentry leak
      55c62960
    • Trond Myklebust's avatar
      NFSv4: Fix brainfart in attribute length calculation · 4f3cc480
      Trond Myklebust authored
      The calculation of the attribute length was 4 bytes off.
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      Tested-by: default avatarAndre Heider <a.heider@gmail.com>
      Reported-and-tested-by: default avatarHenrik Rydberg <rydberg@euromail.se>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4f3cc480
    • Linus Torvalds's avatar
      Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · b3a3a9c4
      Linus Torvalds authored
      Pull tracing fixes and cleanups from Steven Rostedt:
       "This contains fixes, optimizations and some clean ups
      
        Some of the fixes need to go back to 3.10.  They are minor, and deal
        mostly with incorrect ref counting in accessing event files.
      
        There was a couple of optimizations that should have perf perform a
        bit better when accessing trace events.
      
        And some various clean ups.  Some of the clean ups are necessary to
        help in a fix to a theoretical race between opening a event file and
        deleting that event"
      
      * tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Kill the unbalanced tr->ref++ in tracing_buffers_open()
        tracing: Kill trace_array->waiter
        tracing: Do not (ab)use trace_seq in event_id_read()
        tracing: Simplify the iteration logic in f_start/f_next
        tracing: Add ref_data to function and fgraph tracer structs
        tracing: Miscellaneous fixes for trace_array ref counting
        tracing: Fix error handling to ensure instances can always be removed
        tracing/kprobe: Wait for disabling all running kprobe handlers
        tracing/perf: Move the PERF_MAX_TRACE_SIZE check into perf_trace_buf_prepare()
        tracing/syscall: Avoid perf_trace_buf_*() if sys_data->perf_events is empty
        tracing/function: Avoid perf_trace_buf_*() if event_function.perf_events is empty
        tracing: Typo fix on ring buffer comments
        tracing: Use trace_seq_puts()/trace_seq_putc() where possible
        tracing: Use correct config guard CONFIG_STACK_TRACER
      b3a3a9c4
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · a582e5f5
      Linus Torvalds authored
      Pull thermal management fixes from Zhang Rui:
       "These are fixes collected over the last week, they fixes several
        problems caused by the x86_pkg_temp_thermal introduced in 3.11-rc1.
      
        Specifics:
      
         - the x86_pkg_temp_thermal driver causes crash on systems with no
           package MSR support as there is a bug in the logic to check
           presence of DTHERM and PTS feature together.  Added a change so
           that when there is no PTS support, module doesn't get loaded.
      
         - fix krealloc() misuse in pkg_temp_thermal_device_add().
      
           If krealloc() returns NULL, it doesn't free the original.  Thus if
           we want to exit because of the krealloc() failure, we must make
           sure the original one is freed.
      
         - The error code path of the x86 package temperature thermal driver's
           initialization routine makes an unbalanced call to
           get_online_cpus(), which causes subsequent CPU offline operations,
           and consequently system suspend, to permanently block in
           cpu_hotplug_begin() on systems where get_core_online() returns an
           error code.
      
           Remove the extra get_online_cpus() to fix the problem"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        Thermal: Fix lockup of cpu_down()
        Thermal: x86_pkg_temp: Limit number of pkg temp zones
        Thermal: x86_pkg_temp: fix krealloc() misuse in in pkg_temp_thermal_device_add()
        Thermal: x86 package temp thermal crash
      a582e5f5
    • Linus Torvalds's avatar
      Merge tag 'gpio-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · b7371e31
      Linus Torvalds authored
      Pull gpio fixes from Linus Walleij:
       "A first round of GPIO fixes for the v3.11 series:
         - OMAP device tree boot fix
         - Handle an error condition in the MSM driver
      
        The OMAP patches have been around since around the merge window, but
        since they first caused more breakage I let them boil in -next for a
        while.  These should be fine now"
      
      * tag 'gpio-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        drivers: gpio: msm: Fix the error condition for reading ngpio
        gpio/omap: fix build error when OF_GPIO is not defined.
        gpio/omap: auto request GPIO as input if used as IRQ via DT
        gpio/omap: don't create an IRQ mapping for every GPIO on DT
      b7371e31
    • Linus Torvalds's avatar
      Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block · d4c90b1b
      Linus Torvalds authored
      Pull block IO driver bits from Jens Axboe:
       "As I mentioned in the core block pull request, due to real life
        circumstances the driver pull request would be late.  Now it looks
        like -rc2 late...  On the plus side, apart form the rsxx update, these
        are all things that I could argue could go in later in the cycle as
        they are fixes and not features.  So even though things are late, it's
        not ALL bad.
      
        The pull request contains:
      
         - Updates to bcache, all bug fixes, from Kent.
      
         - A pile of drbd bug fixes (no big features this time!).
      
         - xen blk front/back fixes.
      
         - rsxx driver updates, some of them deferred form 3.10.  So should be
           well cooked by now"
      
      * 'for-3.11/drivers' of git://git.kernel.dk/linux-block: (63 commits)
        bcache: Allocation kthread fixes
        bcache: Fix GC_SECTORS_USED() calculation
        bcache: Journal replay fix
        bcache: Shutdown fix
        bcache: Fix a sysfs splat on shutdown
        bcache: Advertise that flushes are supported
        bcache: check for allocation failures
        bcache: Fix a dumb race
        bcache: Use standard utility code
        bcache: Update email address
        bcache: Delete fuzz tester
        bcache: Document shrinker reserve better
        bcache: FUA fixes
        drbd: Allow online change of al-stripes and al-stripe-size
        drbd: Constants should be UPPERCASE
        drbd: Ignore the exit code of a fence-peer handler if it returns too late
        drbd: Fix rcu_read_lock balance on error path
        drbd: fix error return code in drbd_init()
        drbd: Do not sleep inside rcu
        bcache: Refresh usage docs
        ...
      d4c90b1b
  6. 22 Jul, 2013 3 commits
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2013-07-22' of... · 058ca4a2
      Dave Airlie authored
      Merge tag 'drm-intel-fixes-2013-07-22' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
      
      - fixup panel fitter readout for gen2/3 (just quitens dmesg noise)
      - fix pft computations for non-autoscaled resolutions (i.e. letter/pillar
        boxing on gen2/3)
      - preserve the DDI A/E lane sharing bit (Stéphane Marchesin)
      - fix the "rc6 fails to work after resume" regression, big thanks to
        Konstantin Khlebnikov for the patch and debug insight about what
        actually might be going on here
      - fix Oops in is_crtc_connector_off (Chris)
      - sanitize shared dpll state - our new paranoid state checker tripped up
        over dirt left behind by the BIOS
      - correctly restore fences, fixes the "my screen is all messed up after
        resume" regression introduced in the final 3.10 pull request
      - quirk backlights harder, this time for Dell XPS13 machines to fix a
        regression (patch from Kamal Mostafa)
      - 90% fix for some haswell hangs when accessing registers concurrently,
        the 100% solution is simply too invasive for -fixes and what we have
        here seems to be good enough (Chris)
      
      * tag 'drm-intel-fixes-2013-07-22' of git://people.freedesktop.org/~danvet/drm-intel:
        drm/i915: fix up gt init sequence fallout
        drm/i915: Serialize almost all register access
        drm/i915: quirk no PCH_PWM_ENABLE for Dell XPS13 backlight
        drm/i915: correctly restore fences with objects attached
        drm/i915: Fix dereferencing invalid connectors in is_crtc_connector_off()
        drm/i915: Sanitize shared dpll state
        drm/i915: fix long-standing SNB regression in power consumption after resume v2
        drm/i915: Preserve the DDI_A_4_LANES bit from the bios
        drm/i915: fix pfit regression for non-autoscaled resolutions
        drm/i915: fix up readout of the lvds dither bit on gen2/3
      058ca4a2
    • Steven Rostedt's avatar
      Thermal: Fix lockup of cpu_down() · ace120dc
      Steven Rostedt authored
      Commit f1a18a10 "Thermal: CPU Package temperature thermal" had code
      that did a get_online_cpus(), run a loop and then do a
      put_online_cpus(). The problem is that the loop had an error exit that
      would skip the put_online_cpus() part.
      
      In the error exit part of the function, it also did a get_online_cpus(),
      run a loop and then put_online_cpus(). The only way to get to the error
      exit part is with get_online_cpus() already performed. If this error
      condition is hit, the system will be prevented from taking CPUs offline.
      The process taking the CPU offline will lock up hard.
      
      Removing the get_online_cpus() removes the lockup as the hotplug CPU
      refcount is back to zero.
      
      This was bisected with ktest.
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
      ace120dc
    • Dave Airlie's avatar
      Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 · 27ddabc3
      Dave Airlie authored
      Fixes for some locking issues, and fence timeouts.
      
      * 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
        drm/nouveau: do not allow negative sizes for now
        drm/nouveau: add falcon interrupt handler
        drm/nouveau: use dedicated channel for async moves on GT/GF chipsets.
        drm/nouveau: bump fence timeout to 15 seconds
        drm/nouveau: do not unpin in nouveau_gem_object_del
        drm/nv50/kms: fix pin refcnt leaks
        drm/nouveau: fix some error-path leaks in fbcon handling code
        drm/nouveau: fix locking issues in page flipping paths
      27ddabc3