Skip to content
  1. Jul 10, 2015
    • Peter Zijlstra's avatar
      x86, perf: Fix static_key bug in load_mm_cr4() · a833581e
      Peter Zijlstra authored
      
      
      Mikulas reported his K6-3 not booting. This is because the
      static_key API confusion struck and bit Andy, this wants to be
      static_key_false().
      
      Reported-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Tested-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Cc: <stable@vger.kernel.org>
      Cc: Andrea Arcangeli <aarcange@redhat.com>
      Cc: Andy Lutomirski <luto@amacapital.net>
      Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Brian Gerst <brgerst@gmail.com>
      Cc: Denys Vlasenko <dvlasenk@redhat.com>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Kees Cook <keescook@chromium.org>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
      Cc: Vince Weaver <vince@deater.net>
      Cc: hillf.zj <hillf.zj@alibaba-inc.com>
      Fixes: a6673429
      
       ("perf/x86: Add /sys/devices/cpu/rdpmc=2 to allow rdpmc for all tasks")
      Link: http://lkml.kernel.org/r/20150709172338.GC19282@twins.programming.kicks-ass.net
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      a833581e
    • Ingo Molnar's avatar
      Merge tag 'perf-urgent-for-mingo-2' of... · 4756e196
      Ingo Molnar authored
      
      Merge tag 'perf-urgent-for-mingo-2' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
      
        - Fix 'perf top -u username', where not enough memory per thread_map
          entry was being allocated nor was being initialized, causing a
          segfault (Arnaldo Carvalho de Melo)
      
        - Fix locking lockup using 32-bit compat vdso (Adrian Hunter)
      
        - Fix shadow declaration of 'close' with older build environments (Jiri Olsa)
      
        - Make the 'clean' target do a better job, removing some more temp files (Riku Voipio)
      
        - The python binding also has a MANIFEST like file where we list the files that
          need to be built and linked to form the resulting python shared object module
          file. And it has an entry for rbtree.c that still pointed to the one in the
          kernel sources, fix it by also removing one level of indirection so that it
          uses the tools/lib/rbtree.c copy. (Arnaldo Carvalho de Melo)
      
        - For the same reasons as for rbtree.c, copy the kernel lib/hweight.c file to
          tools/lib/, sanitizing it in the process to remove kernel specific stuff like
          EXPORT_SYMBOL() lines and the linux/export.h include reference, as that file
          doesn't exist anymore in tools/include/linux. (Arnaldo Carvalho de Melo)
      
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      4756e196
    • Linus Torvalds's avatar
      Merge branch 'hpfs-patches' (patches from Mikulas Patocka) · c4b5fd3f
      Linus Torvalds authored
      Merge hpfs updates from Mikulas Patocka.
      
      Mainly fstrim support, with some minor other cleanups.
      
      These were actually sent during the merge window, but I wanted to wait
      for the FSTRIM compat handling cleanup before applying them.  Mikulas
      sent that earlier today.
      
      * emailed patches from Mikulas Patocka <mikulas@twibright.com>:
        hpfs: hpfs_error: Remove static buffer, use vsprintf extension %pV instead
        hpfs: kstrdup() out of memory handling
        hpfs: Remove unessary cast
        hpfs: add fstrim support
      c4b5fd3f
    • Joe Perches's avatar
      hpfs: hpfs_error: Remove static buffer, use vsprintf extension %pV instead · a28e4b2b
      Joe Perches authored
      
      
      Removing unnecessary static buffers is good.
      Use the vsprintf %pV extension instead.
      
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarMikulas Patocka <mikulas@twibright.com>
      Cc: stable@vger.kernel.org      # v2.6.36+
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a28e4b2b
    • Sanidhya Kashyap's avatar
      hpfs: kstrdup() out of memory handling · ce657611
      Sanidhya Kashyap authored
      
      
      There is a possibility of nothing being allocated to the new_opts in
      case of memory pressure, therefore return ENOMEM for such case.
      
      Signed-off-by: default avatarSanidhya Kashyap <sanidhya.gatech@gmail.com>
      Signed-off-by: default avatarMikulas Patocka <mikulas@twibright.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ce657611
    • Firo Yang's avatar
      hpfs: Remove unessary cast · d7b04097
      Firo Yang authored
      
      
      Avoid a pointless kmem_cache_alloc() return value cast in
      fs/hpfs/super.c::hpfs_alloc_inode()
      
      Signed-off-by: default avatarFiro Yang <firogm@gmail.com>
      Signed-off-by: default avatarMikulas Patocka <mikulas@twibright.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d7b04097
    • Mikulas Patocka's avatar
      hpfs: add fstrim support · a27b5b97
      Mikulas Patocka authored
      
      
      This patch adds support for fstrim to the HPFS filesystem.
      
      Signed-off-by: default avatarMikulas Patocka <mikulas@twibright.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a27b5b97
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 4c0a9f74
      Linus Torvalds authored
      Pull Ceph fixes from Sage Weil:
       "There is a fix for CephFS and RBD when used within containers/namespaces,
         and a fix for the address learning the client is supposed to do when
        initially talking to the Ceph cluster.
      
        There are also two patches updating MAINTAINERS.  One breaks out the
        common Ceph code shared by fs/ceph and drivers/block/rbd.c into a
        separate entry with the appropriate maintainers listed.  The second
        adds a second reference to the github tree where the Ceph client
        development takes place (before it is pushed to korg and then to you).
      
        The goal here is to move closer to a situation where Ilya Dryomov or
        one of the other maintainers can push things to you if I am
        unavailable.  Ilya has done most of the work preparing branches for
        upstream recently; you should not be surprised to hear from him if I
        am trapped in some internet-less wasteland or hit by a bus or
        something.  In the meantime, we'll work on getting him added to the
        kernel web of trust"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        MAINTAINERS: add secondary tree for ceph modules
        MAINTAINERS: update ceph entries
        libceph: treat sockaddr_storage with uninitialized family as blank
        libceph: enable ceph in a non-default network namespace
      4c0a9f74
    • Arnaldo Carvalho de Melo's avatar
      tools: Copy lib/hweight.c from the kernel sources · 0aefc359
      Arnaldo Carvalho de Melo authored
      
      
      Instead of accessing it directly, as it uses EXPORT_SYMBOL, that has
      no meaning in tools/perf and because we removed the stubs for it, i.e.
      we removed the tools/include/linux/export.h file.
      
      This fixes the build for the detached tarball sources cases and removes
      one more source of entanglement with the kernel sources.
      
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Borislav Petkov <bp@suse.de>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/n/tip-oyqx541o7apa2cskjhcxi6nx@git.kernel.org
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      0aefc359
    • Arnaldo Carvalho de Melo's avatar
      perf tools: Fix the detached tarball wrt rbtree copy · f3efe3a0
      Arnaldo Carvalho de Melo authored
      
      
      The python binding build process was still looking at the kernel
      rbtree.c file, so, when doing a in-tree build it would work, but when
      creating a tarball using tools/perf/MANIFEST as the contents list and
      then trying to build the resulting detached sources, it failed.
      
      Fix it by removing one level of indirection from rbtree.c in the
      tools/perf/util/python-ext-sources file.
      
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Borislav Petkov <bp@suse.de>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/n/tip-8u83c2k5guyhxdlkaaqis8k4@git.kernel.org
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      f3efe3a0
    • Mikulas Patocka's avatar
      ioctl_compat: handle FITRIM · 9abea2d6
      Mikulas Patocka authored
      
      
      The FITRIM ioctl has the same arguments on 32-bit and 64-bit
      architectures, so we can add it to the list of compatible ioctls and
      drop it from compat_ioctl method of various filesystems.
      
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: Ted Ts'o <tytso@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9abea2d6
    • Linus Torvalds's avatar
      Fix firmware loader uevent buffer NULL pointer dereference · 6f957724
      Linus Torvalds authored
      The firmware class uevent function accessed the "fw_priv->buf" buffer
      without the proper locking and testing for NULL.  This is an old bug
      (looks like it goes back to 2012 and commit 1244691c
      
      : "firmware
      loader: introduce firmware_buf"), but for some reason it's triggering
      only now in 4.2-rc1.
      
      Shuah Khan is trying to bisect what it is that causes this to trigger
      more easily, but in the meantime let's just fix the bug since others are
      hitting it too (at least Ingo reports having seen it as well).
      
      Reported-and-tested-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
      Acked-by: default avatarMing Lei <ming.lei@canonical.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6f957724
    • Kirill A. Shutemov's avatar
      mm: avoid setting up anonymous pages into file mapping · 6b7339f4
      Kirill A. Shutemov authored
      
      
      Reading page fault handler code I've noticed that under right
      circumstances kernel would map anonymous pages into file mappings: if
      the VMA doesn't have vm_ops->fault() and the VMA wasn't fully populated
      on ->mmap(), kernel would handle page fault to not populated pte with
      do_anonymous_page().
      
      Let's change page fault handler to use do_anonymous_page() only on
      anonymous VMA (->vm_ops == NULL) and make sure that the VMA is not
      shared.
      
      For file mappings without vm_ops->fault() or shred VMA without vm_ops,
      page fault on pte_none() entry would lead to SIGBUS.
      
      Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Willy Tarreau <w@1wt.eu>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6b7339f4
    • Sage Weil's avatar
      MAINTAINERS: add secondary tree for ceph modules · 6e67b7ae
      Sage Weil authored
      
      
      The Ceph kernel code is primarily developed in the github tree, and only
      pushed to the korg tree before going to Linus.  If Sage is unavailable and
      another maintainer needs to push something upstream, pull requests may
      originate from the github tree instead of Sage's korg tree.
      
      Signed-off-by: default avatarSage Weil <sage@redhat.com>
      Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
      6e67b7ae
    • Sage Weil's avatar
      MAINTAINERS: update ceph entries · 398ecff5
      Sage Weil authored
      
      
      - The Ceph common code is used by both fs/ceph and drivers/block/rbd.
        Add a separate maintainers entry.
      
      - Add Ilya as libceph maintainer and cephfs submaintainer.
      
      - Attribute Documentation/ABI/testing/sysfs-bus-rbd to rbd.
      
      - ceph-devel@vger.kernel.org should be L, not M in rbd entry.
      
      Signed-off-by: default avatarSage Weil <sage@redhat.com>
      Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
      398ecff5
    • Ilya Dryomov's avatar
      libceph: treat sockaddr_storage with uninitialized family as blank · c44bd69c
      Ilya Dryomov authored
      
      
      addr_is_blank() should return true if family is neither AF_INET nor
      AF_INET6.  This is what its counterpart entity_addr_t::is_blank_ip() is
      doing and it is the right thing to do: in process_banner() we check if
      our address is blank and if it is "learn" it from our peer.  As it is,
      we never learn our address and always send out a blank one.  This goes
      way back to ceph.git commit dd732cbfc1c9 ("use sockaddr_storage; and
      some ipv6 support groundwork") from 2009.
      
      While at at, do not open-code ipv6_addr_any() and use INADDR_ANY
      constant instead of 0.
      
      Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
      Reviewed-by: default avatarSage Weil <sage@redhat.com>
      c44bd69c
    • Ilya Dryomov's avatar
      libceph: enable ceph in a non-default network namespace · 757856d2
      Ilya Dryomov authored
      
      
      Grab a reference on a network namespace of the 'rbd map' (in case of
      rbd) or 'mount' (in case of ceph) process and use that to open sockets
      instead of always using init_net and bailing if network namespace is
      anything but init_net.  Be careful to not share struct ceph_client
      instances between different namespaces and don't add any code in the
      !CONFIG_NET_NS case.
      
      This is based on a patch from Hong Zhiguo <zhiguohong@tencent.com>.
      
      Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
      Reviewed-by: default avatarSage Weil <sage@redhat.com>
      757856d2
  2. Jul 09, 2015
    • Arnaldo Carvalho de Melo's avatar
      perf thread_map: Fix the sizeof() calculation for map entries · 08ae217b
      Arnaldo Carvalho de Melo authored
      
      
      When we started adding extra stuff per array entry, growing the size of
      those entries to more than sizeof(pid_t), we had to convert those sizeof
      operations to the more robust sizeof(map->map[0]) idiom, that is future
      proof, i.e. if/when we add more stuff to those entries, that expression
      will produce the new per-entry size.
      
      And besides that, we need to zero out those extra fields, that sometimes
      may not get filled, like when we couldn't care less about the comms,
      since we don't need those, but since we will try freeing it at
      thread_map__delete(), we better fix it.
      
      That is why a thread_map__realloc() was provided.
      
      But that method wasn't used in thread_map__new_by_uid(), fix it.
      
      Reported-by: default avatarIngo Molnar <mingo@kernel.org>
      Fixes: 792402fd ("perf thrad_map: Add comm string into array")
      Fixes: 9d7e8c3a
      
       ("perf tools: Add thread_map__(alloc|realloc) helpers")
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Borislav Petkov <bp@suse.de>
      Cc: David Ahern <dsahern@gmail.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lkml.kernel.org/n/tip-6a0swlm6m8lnu3wpjv284hkb@git.kernel.org
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      08ae217b
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 883a2dfd
      Linus Torvalds authored
      Pull power management and ACPI updates from Rafael Wysocki:
       "These are fixes on top of the previous PM+ACPI pull requests
        (including one fix for a 4.1 regression) and two commits adding
        _CLS-based device enumeration support to the ACPI core and the ATA
        subsystem that waited for the latest ACPICA changes to be merged.
      
        Specifics:
      
         - Fix for an ACPI resources management regression introduced during
           the 4.1 cycle (that unfortunately went into -stable) effectively
           reverting the bad commit along with the recent fixups on top of it
           and using an alternative approach to address the underlying issue
           (Rafael J Wysocki).
      
         - Fix for a memory leak and an incorrect return value in an error
           code path in the ACPI LPSS (Low-Power Subsystem) driver (Rafael J
           Wysocki).
      
         - Fix for a leftover dangling pointer in an error code path in the
           new wakeup IRQ support code (Rafael J Wysocki...
      883a2dfd
    • Linus Torvalds's avatar
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 331c5841
      Linus Torvalds authored
      Pull arch/tile fix from Chris Metcalf:
       "This fix eliminates a "section mismatch" warning caused by the new
        __ex_table checking code in modpost"
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        modpost: work correctly with tile coldtext sections
      331c5841
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 9d993ccb
      Linus Torvalds authored
      Pull module fix from Rusty Russell:
       "Single fix: missing rbtree removal in the module load failure path.
        Easy to trigger with bad params.
      
        Thanks to Peter Zijlstra and Arthur Marsh for going around on this
        one"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        module: Fix load_module() error path
      9d993ccb
    • Chris Metcalf's avatar
      modpost: work correctly with tile coldtext sections · 673c2c34
      Chris Metcalf authored
      
      
      The tilegx and tilepro compilers use .coldtext for their unlikely
      executed text section name, so an __attribute__((cold)) function
      will (when compiled with higher optimization levels) land in
      the .coldtext section.
      
      Modify modpost to add .coldtext to the set of OTHER_TEXT_SECTIONS
      so we don't get warnings about referencing such a section in an
      __ex_table block, and then also modify arch/tile/lib/memcpy_user_64.c
      so that it uses plain ".coldtext" instead of ".coldtext.memcpy".
      The latter naming is a relic of an earlier use of -ffunction-sections,
      which we no longer use by default.
      
      Signed-off-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
      Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      673c2c34
    • Peter Zijlstra's avatar
      module: Fix load_module() error path · 758556bd
      Peter Zijlstra authored
      
      
      The load_module() error path frees a module but forgot to take it out
      of the mod_tree, leaving a dangling entry in the tree, causing havoc.
      
      Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
      Reported-by: default avatarArthur Marsh <arthur.marsh@internode.on.net>
      Tested-by: default avatarArthur Marsh <arthur.marsh@internode.on.net>
      Fixes: 93c2e105
      
       ("module: Optimize __module_address() using a latched RB-tree")
      Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
      Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      758556bd
    • Riku Voipio's avatar
      tools lib: Improve clean target · c867b150
      Riku Voipio authored
      
      
      The clean targets miss some .cmd and .d files.
      
      Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: linux-kbuild@vger.kernel.org
      Link: http://lkml.kernel.org/r/1434631938-12681-1-git-send-email-riku.voipio@linaro.org
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      c867b150
    • Linus Torvalds's avatar
      Fix broken audit tests for exec arg len · 45820c29
      Linus Torvalds authored
      The "fix" in commit 0b08c5e5
      
       ("audit: Fix check of return value of
      strnlen_user()") didn't fix anything, it broke things.  As reported by
      Steven Rostedt:
      
       "Yes, strnlen_user() returns 0 on fault, but if you look at what len is
        set to, than you would notice that on fault len would be -1"
      
      because we just subtracted one from the return value.  So testing
      against 0 doesn't test for a fault condition, it tests against a
      perfectly valid empty string.
      
      Also fix up the usual braindamage wrt using WARN_ON() inside a
      conditional - make it part of the conditional and remove the explicit
      unlikely() (which is already part of the WARN_ON*() logic, exactly so
      that you don't have to write unreadable code.
      
      Reported-and-tested-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Cc: Jan Kara <jack@suse.cz>
      Cc: Paul Moore <pmoore@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      45820c29
  3. Jul 08, 2015
    • Jiri Olsa's avatar
      perf stat: Fix shadow declaration of close · 5fc472a6
      Jiri Olsa authored
      Vinson reported shadow declaration of close introduced
      by the following commit:
      
        106a94a0
      
       perf stat: Introduce read_counters function
      
      Using close_counters name instead.
      
      Reported-by: default avatarVinson Lee <vlee@twopensource.com>
      Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
      Cc: Jiri Olsa <jolsa@kernel.org>
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Fixes: 106a94a0
      
       ("perf stat: Introduce read_counters function")
      Link: http://lkml.kernel.org/r/20150708111731.GA3512@krava.redhat.com
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      5fc472a6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · d6ac4ffc
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "These are late by a week; they should have been merged during the
        merge window, but unfortunately, the ARM kernel build/boot farms were
        indicating random failures, and it wasn't clear whether the cause was
        something in these changes or something during the merge window.
      
        This is a set of merge window fixes with some documentation additions"
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: avoid unwanted GCC memset()/memcpy() optimisations for IO variants
        ARM: pgtable: document mapping types
        ARM: io: convert ioremap*() to functions
        ARM: io: fix ioremap_wt() implementation
        ARM: io: document ARM specific behaviour of ioremap*() implementations
        ARM: fix lockdep unannotated irqs-off warning
        ARM: 8397/1: fix vdsomunge not to depend on glibc specific error.h
        ARM: add helpful message when truncating physical memory
        ARM: add help text for HIGHPTE configuration entry
        ARM: fix DEBUG_SET_MODULE_RONX build dependencies
        ARM: 8396/1: use phys_addr_t in pfn_to_kaddr()
        ARM: 8394/1: update memblock limit after mapping lowmem
        ARM: 8393/1: smp: Fix suspicious RCU usage with ipi tracepoints
      d6ac4ffc
    • Tomas Winkler's avatar
      mei: nfc: fix deadlock on shutdown/suspend path · 4f273959
      Tomas Winkler authored
      In function mei_nfc_host_exit mei_cl_remove_device cannot be called
      under the device mutex as device removing flow invokes the device driver
      remove handler that calls in turn to mei_cl_disable_device which
      naturally acquires the device mutex.
      
      Also remove mei_cl_bus_remove_devices which has the same issue, but is
      never executed as currently the only device on the mei client bus is NFC
      and a new device cannot be easily added till the bus revamp is
      completed.
      
      This fixes regression caused by commit be9b720a
      
       ("mei_phy: move all
      nfc logic from mei driver to nfc")
      
      Prior to this change the nfc driver remove handler called to no-op
      disable function while actual nfc device was disabled directly from the
      mei driver.
      
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Samuel Ortiz <sameo@linux.intel.com>
      Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4f273959
    • Rafael J. Wysocki's avatar
      Merge branch 'acpi-scan' · 8076ca48
      Rafael J. Wysocki authored
      * acpi-scan:
        ata: ahci_platform: Add ACPI _CLS matching
        ACPI / scan: Add support for ACPI _CLS device matching
      8076ca48
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-pnp', 'acpi-soc', 'pm-domains' and 'pm-sleep' · d0aee67f
      Rafael J. Wysocki authored
      * acpi-pnp:
        ACPI / PNP: Reserve ACPI resources at the fs_initcall_sync stage
      
      * acpi-soc:
        ACPI / LPSS: Fix up acpi_lpss_create_device()
      
      * pm-domains:
        PM / Domains: Avoid infinite loops in attach/detach code
      
      * pm-sleep:
        PM / hibernate: clarify resume documentation
      d0aee67f
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-wakeirq' · 3fc7aeeb
      Rafael J. Wysocki authored
      * pm-wakeirq:
        PM / wakeirq: Avoid setting power.wakeirq too hastily
      3fc7aeeb
  4. Jul 07, 2015