1. 01 Aug, 2013 8 commits
    • Kirill Tkhai's avatar
      sparc32: Fix exit flag passed from traced sys_sigreturn · 7a3b0f89
      Kirill Tkhai authored
      Pass 1 in %o1 to indicate that syscall_trace accounts exit.
      Signed-off-by: default avatarKirill Tkhai <tkhai@yandex.ru>
      CC: David Miller <davem@davemloft.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7a3b0f89
    • Kirill Tkhai's avatar
      sparc64: Fix wrong syscall return value passed to trace_sys_exit() · 04001552
      Kirill Tkhai authored
      Syscall number is passed instead of return value. Fix that.
      Signed-off-by: default avatarKirill Tkhai <tkhai@yandex.ru>
      CC: David Miller <davem@davemloft.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      04001552
    • Allen Pais's avatar
      support sparc64x chip type in cpumap.c · a84ae809
      Allen Pais authored
      Add SPARC64X chip type in cpumap.c to correctly
      build CPU distribution map that spans all CPUs.
      Signed-off-by: default avatarAllen Pais <allen.pais@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a84ae809
    • Allen Pais's avatar
      cpu hw caps support for sparc64x · 4e963779
      Allen Pais authored
      Signed-off-by: default avatarAllen Pais <allen.pais@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4e963779
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 64ccccf8
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Radeon, nouveau, exynos, intel, mgag200..
      
        Not all strictly regressions but there was probably only one patch I'd
        have really left out and it didn't seem worth respinning exynos to
        avoid it, the line change count is quite low.
      
         radeon: regressions + more dynamic powermanagement fixes, since DPM
           is a new feature, and off by default I'd prefer to keep merging
           fixes since it has a large userbase already and I'd like to keep
           them on mainline
      
         nouveau: is mostly regression fixes
      
         i915: is a regression fix since Daniel is on holidays I've merged it.
      
         mgag200: I've picked a bunch of targetted fixes from a big bunch of
           distro patches,
      
         exynos: build fixes mostly, one regression fix
      
        I expect things will slow right down now, I may send on the intel
        early quirk from Jesse separatly, since I think the x86 maintainers
        acked it"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (37 commits)
        drm/i915: fix missed hunk after GT access breakage
        drm/radeon/dpm: re-enable cac control on SI
        drm/radeon/dpm: fix calculations in si_calculate_leakage_for_v_and_t_formula
        drm: fix 64 bit drm fixed point helpers
        drm/radeon/atom: initialize more atom interpretor elements to 0
        drm/nouveau: fix semaphore dmabuf obj
        drm/nouveau/vm: make vm refcount into a kref
        drm/nv31/mpeg: don't recognize nv3x cards as having nv44 graph class
        drm/nv40/mpeg: write magic value to channel object to make it work
        drm/nouveau: fix size check for cards without vm
        drm/nv50-/disp: remove dcb_outp_match call, and related variables
        drm/nva3-/disp: fix hda eld writing, needs to be padded
        drm/nv31/mpeg: fix mpeg engine initialization
        drm/nv50/mc: include vp in the fb error reporting mask
        drm/nouveau: fix null pointer dereference in poll_changed
        drm/nv50/gpio: post-nv92 cards have 32 interrupt lines
        drm/nvc0/fb: take lock in nvc0_ram_put()
        drm/nouveau/core: xtensa firmware size needs to be 0x40000 no matter what
        drm/mgag200: Fix LUT programming for 16bpp
        drm/mgag200: Fix framebuffer pitch calculation
        ...
      64ccccf8
    • Linus Torvalds's avatar
      Merge tag 'fbdev-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · ec8fa306
      Linus Torvalds authored
      Pull fbdev fixes from Tomi Valkeinen:
       "Small fbdev fixes:
         - compile fixes
         - atyfb initialization fix
         - Fix freeing of the irq in sh7760fb & nuc900fb"
      
      * tag 'fbdev-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        video: sh7760fb: fix to pass correct device identity to free_irq()
        fbdev/atyfb: fix recent breakage in correct_chipset()
        fbdev/sgivwfb: fix compilation error in sgivwfb_mmap()
        video: nuc900fb: fix to pass correct device identity to request_irq()
        vga16fb: Remove unused variable
        video: xilinxfb: Fix compilation warning
      ec8fa306
    • Linus Torvalds's avatar
      Merge tag 'vfio-v3.11-rc4' of git://github.com/awilliam/linux-vfio · 3df765fc
      Linus Torvalds authored
      Pull vfio fixes from Alex Williamson:
       "misc fixes around overreacting to bus notifier events and a locking
        fix for a corner case blocked remove"
      
      * tag 'vfio-v3.11-rc4' of git://github.com/awilliam/linux-vfio:
        vfio-pci: Avoid deadlock on remove
        vfio: Ignore sprurious notifies
        vfio: Don't overreact to DEL_DEVICE
      3df765fc
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew Morton) · 19788a90
      Linus Torvalds authored
      Merge more patches from Andrew Morton:
       "A bunch of fixes.
      
        Plus Joe's printk move and rework.  It's not a -rc3 thing but now
        would be a nice time to offload it, while things are quiet.  I've been
        sitting on it all for a couple of weeks, no issues"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        vmpressure: make sure there are no events queued after memcg is offlined
        vmpressure: do not check for pending work to prevent from new work
        vmpressure: change vmpressure::sr_lock to spinlock
        printk: rename struct log to struct printk_log
        printk: use pointer for console_cmdline indexing
        printk: move braille console support into separate braille.[ch] files
        printk: add console_cmdline.h
        printk: move to separate directory for easier modification
        drivers/rtc/rtc-twl.c: fix: rtcX/wakealarm attribute isn't created
        mm: zbud: fix condition check on allocation size
        thp, mm: avoid PageUnevictable on active/inactive lru lists
        mm/swap.c: clear PageActive before adding pages onto unevictable list
        arch/x86/platform/ce4100/ce4100.c: include reboot.h
        mm: sched: numa: fix NUMA balancing when !SCHED_DEBUG
        rapidio: fix use after free in rio_unregister_scan()
        .gitignore: ignore *.lz4 files
        MAINTAINERS: dynamic debug: Jason's not there...
        dmi_scan: add comments on dmi_present() and the loop in dmi_scan_machine()
        ocfs2/refcounttree: add the missing NULL check of the return value of find_or_create_page()
        mm: mempolicy: fix mbind_range() && vma_adjust() interaction
      19788a90
  2. 31 Jul, 2013 30 commits
  3. 30 Jul, 2013 2 commits
    • Ben Widawsky's avatar
      drm/i915: fix missed hunk after GT access breakage · e1b4d303
      Ben Widawsky authored
      Upon some code refactoring, a hunk was missed. This was fixed for
      next, but missed the current trees, and hasn't yet been merged by Dave
      Airlie. It is fixed in:
      commit 907b28c5
      Author: Chris Wilson <chris@chris-wilson.co.uk>
      Date:   Fri Jul 19 20:36:52 2013 +0100
      
          drm/i915: Colocate all GT access routines in the same file
      
      It is introduced by:
      commit 181d1b9e
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Sun Jul 21 13:16:24 2013 +0200
      
          drm/i915: fix up gt init sequence fallout
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Cc: stable <stable@vger.kernel.org>
      Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e1b4d303
    • Pablo Neira's avatar
      genetlink: fix usage of NLM_F_EXCL or NLM_F_REPLACE · e1ee3673
      Pablo Neira authored
      Currently, it is not possible to use neither NLM_F_EXCL nor
      NLM_F_REPLACE from genetlink. This is due to this checking in
      genl_family_rcv_msg:
      
      	if (nlh->nlmsg_flags & NLM_F_DUMP)
      
      NLM_F_DUMP is NLM_F_MATCH|NLM_F_ROOT. Thus, if NLM_F_EXCL or
      NLM_F_REPLACE flag is set, genetlink believes that you're
      requesting a dump and it calls the .dumpit callback.
      
      The solution that I propose is to refine this checking to
      make it stricter:
      
      	if ((nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP)
      
      And given the combination NLM_F_REPLACE and NLM_F_EXCL does
      not make sense to me, it removes the ambiguity.
      
      There was a patch that tried to fix this some time ago (0ab03c2b
      netlink: test for all flags of the NLM_F_DUMP composite) but it
      tried to resolve this ambiguity in *all* existing netlink subsystems,
      not only genetlink. That patch was reverted since it broke iproute2,
      which is using NLM_F_ROOT to request the dump of the routing cache.
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e1ee3673