1. 05 Aug, 2013 1 commit
  2. 30 Jul, 2013 1 commit
  3. 25 Jul, 2013 6 commits
  4. 24 Jul, 2013 27 commits
  5. 23 Jul, 2013 5 commits
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux · a474902c
      Linus Torvalds authored
      Pull device tree bug fixes and maintainership updates from Grant Likely:
       "This branch contains a couple of minor bug fixes and documentation
        additions, but the bulk of it are several changes to the MAINTAINERS
        file regarding the subsystems I've been involved with"
      
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
        of/irq: init struct resource to 0 in of_irq_to_resource()
        of/irq: Avoid calling list_first_entry() for empty list
        of: add vendor prefixes for hisilicon
        of: add vendor prefix for Qualcomm Atheros, Inc.
        MAINTAINERS: Fix incorrect status tag
        MAINTAINERS: Refactor device tree maintainership
        MAINTAINERS: Change device tree mailing list
        MAINTAINERS: Remove Grant Likely
      a474902c
    • Borislav Petkov's avatar
      EDAC: Fix lockdep splat · 88d84ac9
      Borislav Petkov authored
      
      
      Fix the following:
      
      BUG: key ffff88043bdd0330 not in .data!
      ------------[ cut here ]------------
      WARNING: at kernel/lockdep.c:2987 lockdep_init_map+0x565/0x5a0()
      DEBUG_LOCKS_WARN_ON(1)
      Modules linked in: glue_helper sb_edac(+) edac_core snd acpi_cpufreq lrw gf128mul ablk_helper iTCO_wdt evdev i2c_i801 dcdbas button cryptd pcspkr iTCO_vendor_support usb_common lpc_ich mfd_core soundcore mperf processor microcode
      CPU: 2 PID: 599 Comm: modprobe Not tainted 3.10.0 #1
      Hardware name: Dell Inc. Precision T3600/0PTTT9, BIOS A08 01/24/2013
       0000000000000009 ffff880439a1d920 ffffffff8160a9a9 ffff880439a1d958
       ffffffff8103d9e0 ffff88043af4a510 ffffffff81a16e11 0000000000000000
       ffff88043bdd0330 0000000000000000 ffff880439a1d9b8 ffffffff8103dacc
      Call Trace:
        dump_stack
        warn_slowpath_common
        warn_slowpath_fmt
        lockdep_init_map
        ? trace_hardirqs_on_caller
        ? trace_hardirqs_on
        debug_mutex_init
        __mutex_init
        bus_register
        edac_create_sysfs_mci_device
        edac_mc_add_mc
        sbridge_probe
        pci_device_probe
        driver_probe_device
        __driver_attach
        ? driver_probe_device
        bus_for_each_dev
        driver_attach
        bus_add_driver
        driver_register
        __pci_register_driver
        ? 0xffffffffa0010fff
        sbridge_init
        ? 0xffffffffa0010fff
        do_one_initcall
        load_module
        ? unset_module_init_ro_nx
        SyS_init_module
        tracesys
      ---[ end trace d24a70b0d3ddf733 ]---
      EDAC MC0: Giving out device to 'sbridge_edac.c' 'Sandy Bridge Socket#0': DEV 0000:3f:0e.0
      EDAC sbridge: Driver loaded.
      
      What happens is that bus_register needs a statically allocated lock_key
      because the last is handed in to lockdep. However, struct mem_ctl_info
      embeds struct bus_type (the whole struct, not a pointer to it) and the
      whole thing gets dynamically allocated.
      
      Fix this by using a statically allocated struct bus_type for the MC bus.
      Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
      Acked-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
      Cc: Markus Trippelsdorf <markus@trippelsdorf.de>
      Cc: stable@kernel.org # v3.10
      Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
      88d84ac9
    • Linus Torvalds's avatar
      Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · c2468d32
      Linus Torvalds authored
      Pull cgroup changes from Tejun Heo:
       "This contains two patches, both of which aren't fixes per-se but I
        think it'd be better to fast-track them.
      
        One removes bcache_subsys_id which was added without proper review
        through the block tree.  Fortunately, bcache cgroup code is
        unconditionally disabled, so this was never exposed to userland.  The
        cgroup subsys_id is removed.  Kent will remove the affected (disabled)
        code through bcache branch.
      
        The other simplifies task_group_path_from_hierarchy().  The function
        doesn't currently have in-kernel users but there are external code and
        development going on dependent on the function and making the function
        available for 3.11 would make things go smoother"
      
      * 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: replace task_cgroup_path_from_hierarchy() with task_cgroup_path()
        cgroup: remove bcache_subsys_id which got added stealthily
      c2468d32
    • 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