1. 28 Feb, 2017 40 commits
    • Linus Torvalds's avatar
      Merge tag 'nfsd-4.11' of git://linux-nfs.org/~bfields/linux · 8313064c
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "The nfsd update this round is mainly a lot of miscellaneous cleanups
        and bugfixes.
      
        A couple changes could theoretically break working setups on upgrade.
        I don't expect complaints in practice, but they seem worth calling out
        just in case:
      
         - NFS security labels are now off by default; a new security_label
           export flag reenables it per export. But, having them on by default
           is a disaster, as it generally only makes sense if all your clients
           and servers have similar enough selinux policies. Thanks to Jason
           Tibbitts for pointing this out.
      
         - NFSv4/UDP support is off. It was never really supported, and the
           spec explicitly forbids it. We only ever left it on out of
           laziness; thanks to Jeff Layton for finally fixing that"
      
      * tag 'nfsd-4.11' of git://linux-nfs.org/~bfields/linux: (34 commits)
        nfsd: Fix display of the version string
        nfsd: fix configuration of supported minor versions
        sunrpc: don't register UDP port with rpcbind when version needs congestion control
        nfs/nfsd/sunrpc: enforce transport requirements for NFSv4
        sunrpc: flag transports as having congestion control
        sunrpc: turn bitfield flags in svc_version into bools
        nfsd: remove superfluous KERN_INFO
        nfsd: special case truncates some more
        nfsd: minor nfsd_setattr cleanup
        NFSD: Reserve adequate space for LOCKT operation
        NFSD: Get response size before operation for all RPCs
        nfsd/callback: Drop a useless data copy when comparing sessionid
        nfsd/callback: skip the callback tag
        nfsd/callback: Cleanup callback cred on shutdown
        nfsd/idmap: return nfserr_inval for 0-length names
        SUNRPC/Cache: Always treat the invalid cache as unexpired
        SUNRPC: Drop all entries from cache_detail when cache_purge()
        svcrdma: Poll CQs in "workqueue" mode
        svcrdma: Combine list fields in struct svc_rdma_op_ctxt
        svcrdma: Remove unused sc_dto_q field
        ...
      8313064c
    • Linus Torvalds's avatar
      Merge tag 'ceph-for-4.11-rc1' of git://github.com/ceph/ceph-client · b2deee2d
      Linus Torvalds authored
      Pull ceph updates from Ilya Dryomov:
       "This time around we have:
      
         - support for rbd data-pool feature, which enables rbd images on
           erasure-coded pools (myself). CEPH_PG_MAX_SIZE has been bumped to
           allow erasure-coded profiles with k+m up to 32.
      
         - a patch for ceph_d_revalidate() performance regression introduced
           in 4.9, along with some cleanups in the area (Jeff Layton)
      
         - a set of fixes for unsafe ->d_parent accesses in CephFS (Jeff
           Layton)
      
         - buffered reads are now processed in rsize windows instead of rasize
           windows (Andreas Gerstmayr). The new default for rsize mount option
           is 64M.
      
         - ack vs commit distinction is gone, greatly simplifying ->fsync()
           and MOSDOpReply handling code (myself)
      
        ... also a few filesystem bug fixes from Zheng, a CRUSH sync up (CRUSH
        computations are still serialized though) and several minor fixes and
        cleanups all over"
      
      * tag 'ceph-for-4.11-rc1' of git://github.com/ceph/ceph-client: (52 commits)
        libceph, rbd, ceph: WRITE | ONDISK -> WRITE
        libceph: get rid of ack vs commit
        ceph: remove special ack vs commit behavior
        ceph: tidy some white space in get_nonsnap_parent()
        crush: fix dprintk compilation
        crush: do is_out test only if we do not collide
        ceph: remove req from unsafe list when unregistering it
        rbd: constify device_type structure
        rbd: kill obj_request->object_name and rbd_segment_name_cache
        rbd: store and use obj_request->object_no
        rbd: RBD_V{1,2}_DATA_FORMAT macros
        rbd: factor out __rbd_osd_req_create()
        rbd: set offset and length outside of rbd_obj_request_create()
        rbd: support for data-pool feature
        rbd: introduce rbd_init_layout()
        rbd: use rbd_obj_bytes() more
        rbd: remove now unused rbd_obj_request_wait() and helpers
        rbd: switch rbd_obj_method_sync() to ceph_osdc_call()
        libceph: pass reply buffer length through ceph_osdc_call()
        rbd: do away with obj_request in rbd_obj_read_sync()
        ...
      b2deee2d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm · d4f4cf77
      Linus Torvalds authored
      Pull ARM updates from Russell King:
      
       - nommu updates from Afzal Mohammed cleaning up the vectors support
      
       - allow DMA memory "mapping" for nommu Benjamin Gaignard
      
       - fixing a correctness issue with R_ARM_PREL31 relocations in the
         module linker
      
       - add strlen() prototype for the decompressor
      
       - support for DEBUG_VIRTUAL from Florian Fainelli
      
       - adjusting memory bounds after memory reservations have been
         registered
      
       - unipher cache handling updates from Masahiro Yamada
      
       - initrd and Thumb Kconfig cleanups
      
      * 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (23 commits)
        ARM: mm: round the initrd reservation to page boundaries
        ARM: mm: clean up initrd initialisation
        ARM: mm: move initrd init code out of arm_memblock_init()
        ARM: 8655/1: improve NOMMU definition of pgprot_*()
        ARM: 8654/1: decompressor: add strlen prototype
        ARM: 8652/1: cache-uniphier: clean up active way setup code
        ARM: 8651/1: cache-uniphier: include <linux/errno.h> instead of <linux/types.h>
        ARM: 8650/1: module: handle negative R_ARM_PREL31 addends correctly
        ARM: 8649/2: nommu: remove Hivecs configuration is asm
        ARM: 8648/2: nommu: display vectors base
        ARM: 8647/2: nommu: dynamic exception base address setting
        ARM: 8646/1: mmu: decouple VECTORS_BASE from Kconfig
        ARM: 8644/1: Reduce "CPU: shutdown" message to debug level
        ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol
        ARM: 8640/1: Add support for CONFIG_DEBUG_VIRTUAL
        ARM: 8639/1: Define KERNEL_START and KERNEL_END
        ARM: 8638/1: mtd: lart: Rename partition defines to be prefixed with PART_
        ARM: 8637/1: Adjust memory boundaries after reservations
        ARM: 8636/1: Cleanup sanity_check_meminfo
        ARM: add CPU_THUMB_CAPABLE to indicate possible Thumb support
        ...
      d4f4cf77
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f89db789
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "Two documentation updates, plus a debugging annotation fix"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/crash: Update the stale comment in reserve_crashkernel()
        x86/irq, trace: Add __irq_entry annotation to x86's platform IRQ handlers
        Documentation, x86, resctrl: Recommend locking for resctrlfs
      f89db789
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 65314ed0
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Two rq-clock warnings related fixes, plus a cgroups related crash fix"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/cgroup: Move sched_online_group() back into css_online() to fix crash
        sched/fair: Update rq clock before changing a task's CPU affinity
        sched/core: Fix update_rq_clock() splat on hotplug (and suspend/resume)
      65314ed0
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3f26b0c8
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Misc fixes on the kernel and tooling side - nothing in particular
        stands out"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
        perf/core: Fix the perf_cpu_time_max_percent check
        perf/core: Fix perf_event_enable_on_exec() timekeeping (again)
        perf/core: Remove confusing comment and move put_ctx()
        perf record: Honor --quiet option properly
        perf annotate: Add -q/--quiet option
        perf diff: Add -q/--quiet option
        perf report: Add -q/--quiet option
        perf utils: Check verbose flag properly
        perf utils: Add perf_quiet_option()
        perf record: Add -a as default target
        perf stat: Add -a as default target
        perf tools: Fail on using multiple bits long terms without value
        perf tools: Move new_term arguments into struct parse_events_term template
        perf build: Add special fixdep cleaning rule
        perf tools: Replace _SC_NPROCESSORS_CONF with max_present_cpu in cpu_topology_map
        perf header: Make build_cpu_topology skip offline/absent CPUs
        perf cpumap: Add cpu__max_present_cpu()
        perf session: Fix DEBUG=1 build with clang
        tools lib traceevent: It's preempt not prempt
        perf python: Filter out -specs=/a/b/c from the python binding cc options
        ...
      3f26b0c8
    • Linus Torvalds's avatar
      Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 74efe07b
      Linus Torvalds authored
      Pull locking fixes from Ingo Molnar:
       "The main change is the uninlining of large refcount_t APIs, plus a
        header dependency fix.
      
        Note that the uninlining allowed us to enable the underflow/overflow
        warnings unconditionally and remove the debug Kconfig switch: this
        might trigger new warnings in buggy code and turn
        crashes/use-after-free bugs into less harmful memory leaks"
      
      * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        locking/refcounts: Add missing kernel.h header to have UINT_MAX defined
        locking/refcounts: Out-of-line everything
      74efe07b
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e72e58fa
      Linus Torvalds authored
      Pull objtool fixes from Ingo Molnar:
       "A handful of objtool fixes related to unreachable code, plus a build
        fix for out of tree modules"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        objtool: Enclose contents of unreachable() macro in a block
        objtool: Prevent GCC from merging annotate_unreachable()
        objtool: Improve detection of BUG() and other dead ends
        objtool: Fix CONFIG_STACK_VALIDATION=y warning for out-of-tree modules
      e72e58fa
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide · 74e3f63c
      Linus Torvalds authored
      Pull IDE updates from David Miller:
       "Just one actual change here this time around, adding some init data
        annotations. The other change was bogus and got reverted"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
        ide: palm_bk3710: add __initdata to palm_bk3710_port_info
        Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)"
        ide: Fix interface autodetection in legacy IDE driver (trial #2)
      74e3f63c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c2eca00f
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Don't save TIPC header values before the header has been validated,
          from Jon Paul Maloy.
      
       2) Fix memory leak in RDS, from Zhu Yanjun.
      
       3) We miss to initialize the UID in the flow key in some paths, from
          Julian Anastasov.
      
       4) Fix latent TOS masking bug in the routing cache removal from years
          ago, also from Julian.
      
       5) We forget to set the sockaddr port in sctp_copy_local_addr_list(),
          fix from Xin Long.
      
       6) Missing module ref count drop in packet scheduler actions, from
          Roman Mashak.
      
       7) Fix RCU annotations in rht_bucket_nested, from Herbert Xu.
      
       8) Fix use after free which happens because L2TP's ipv4 support returns
          non-zero values from it's backlog_rcv function which ipv4 interprets
          as protocol values. Fix from Paul Hüber.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (35 commits)
        qed: Don't use attention PTT for configuring BW
        qed: Fix race with multiple VFs
        l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv
        xfrm: provide correct dst in xfrm_neigh_lookup
        rhashtable: Fix RCU dereference annotation in rht_bucket_nested
        rhashtable: Fix use before NULL check in bucket_table_free
        net sched actions: do not overwrite status of action creation.
        rxrpc: Kernel calls get stuck in recvmsg
        net sched actions: decrement module reference count after table flush.
        lib: Allow compile-testing of parman
        ipv6: check sk sk_type and protocol early in ip_mroute_set/getsockopt
        sctp: set sin_port for addr param when checking duplicate address
        net/mlx4_en: fix overflow in mlx4_en_init_timestamp()
        netfilter: nft_set_bitmap: incorrect bitmap size
        net: s2io: fix typo argumnet argument
        net: vxge: fix typo argumnet argument
        netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.
        ipv4: mask tos for input route
        ipv4: add missing initialization for flowi4_uid
        lib: fix spelling mistake: "actualy" -> "actually"
        ...
      c2eca00f
    • Russell King's avatar
      Merge branches 'fixes' and 'misc'; commit 'kuser^{/add CPU_THUMB_CAPABLE to... · 17a870be
      Russell King authored
      Merge branches 'fixes' and 'misc'; commit 'kuser^{/add CPU_THUMB_CAPABLE to indicate}' into for-linus
      17a870be
    • Russell King's avatar
      ARM: mm: round the initrd reservation to page boundaries · cdcc5fa0
      Russell King authored
      
      
      Round the initrd memblock reservation to page boundaries to prevent
      other data sharing the initrd pages.  This prevents an allocation
      possibly overlapping with the initrd, which would later get trampled
      on in free_initrd_mem().
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      cdcc5fa0
    • Russell King's avatar
      ARM: mm: clean up initrd initialisation · 68b32f36
      Russell King authored
      
      
      Rather than repeatedly testing phys_initrd_size to see if the initrd
      is still enabled, return from the new function to avoid executing the
      remaining initialisation.
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      68b32f36
    • Russell King's avatar
      ARM: mm: move initrd init code out of arm_memblock_init() · 39286248
      Russell King authored
      
      
      Move the ARM initrd initialisation code out of arm_memblock_init() into
      its own function, so it can be cleaned up.
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      39286248
    • Arnd Bergmann's avatar
      ARM: 8655/1: improve NOMMU definition of pgprot_*() · e2fce0a2
      Arnd Bergmann authored
      
      
      The tegra DRM driver produces a harmless warning when built for NOMMU:
      
      drivers/gpu/drm/tegra/gem.c: In function 'tegra_drm_mmap':
      drivers/gpu/drm/tegra/gem.c:508:12: unused variable 'prot'
      
      This is because pgprot_writecombine() on ARM returns a constant and
      ignores its argument. The version in asm-generic doesn't have that
      problem, so let's use that one instead. We don't actually care
      about the value on NOMMU, and this is consistent with what some
      other architectures do.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarThierry Reding <treding@nvidia.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      e2fce0a2
    • Arnd Bergmann's avatar
      ARM: 8654/1: decompressor: add strlen prototype · 7b96ddd0
      Arnd Bergmann authored
      
      
      The decompress.c file contains a declaration for strstr() so we can
      include some compression library code.
      
      With the updated LZ4 implementation, we run into the same problem again
      for strlen():
      
      In file included from ../include/linux/rcupdate.h:40:0,
                       from ../include/linux/srcu.h:33,
                       from ../include/linux/notifier.h:15,
                       from ../include/linux/memory_hotplug.h:6,
                       from ../include/linux/mmzone.h:749,
                       from ../include/linux/gfp.h:5,
                       from ../include/linux/kmod.h:22,
                       from ../include/linux/module.h:13,
                       from ../arch/arm/boot/compressed/../../../../lib/lz4/lz4_decompress.c:39,
                       from ../arch/arm/boot/compressed/../../../../lib/decompress_unlz4.c:13,
                       from ../arch/arm/boot/compressed/decompress.c:55:
      include/linux/cpumask.h: In function 'cpumask_parse':
      include/linux/cpumask.h:592:53: error: implicit declaration of function 'strlen';did you mean 'strstr'? [-Werror=implicit-function-declaration]
      
      This adds another declaration to work around the new problem.
      
      Fixes: ce83d9ab80d6 ("lib: update LZ4 compressor module")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      7b96ddd0
    • Masahiro Yamada's avatar
      ARM: 8652/1: cache-uniphier: clean up active way setup code · 06369a1e
      Masahiro Yamada authored
      
      
      Now, the active way setup function is called with a fixed value zero
      for the second argument.  The code can be simpler.
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      06369a1e
    • Masahiro Yamada's avatar
      ARM: 8651/1: cache-uniphier: include <linux/errno.h> instead of <linux/types.h> · 1c63d4c5
      Masahiro Yamada authored
      
      
      Nothing in this header file depends on <linux/types.h>.
      Rather, <linux/errno.h> should be included for -ENODEV.
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      1c63d4c5
    • Ard Biesheuvel's avatar
      ARM: 8650/1: module: handle negative R_ARM_PREL31 addends correctly · 050d18d1
      Ard Biesheuvel authored
      
      
      According to the spec 'ELF for the ARM Architecture' (IHI 0044E),
      addends for R_ARM_PREL31 relocations are 31-bit signed quantities,
      so we need to sign extend the value to 32 bits before it can be used
      as an offset in the calculation of the relocated value.
      
      We have not been bitten by this because these relocations are usually
      emitted against the start of a section, which means the addends never
      assume negative values in practice. But it is a bug nonetheless, so fix
      it.
      Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      050d18d1
    • Afzal Mohammed's avatar
      ARM: 8649/2: nommu: remove Hivecs configuration is asm · ad475117
      Afzal Mohammed authored
      
      
      Now that exception based address is handled dynamically for
      processors with CP15, remove Hivecs configuration in assembly.
      Signed-off-by: default avatarafzal mohammed <afzal.mohd.ma@gmail.com>
      Tested-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      ad475117
    • Afzal Mohammed's avatar
      ARM: 8648/2: nommu: display vectors base · 58c16709
      Afzal Mohammed authored
      
      
      VECTORS_BASE displays the exception base address. Now on no-MMU as
      the exception base address is dynamically estimated, define
      VECTORS_BASE to the variable holding it.
      
      As it is the case, limit VECTORS_BASE constant definition to MMU.
      Suggested-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Signed-off-by: default avatarafzal mohammed <afzal.mohd.ma@gmail.com>
      Tested-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      58c16709
    • Afzal Mohammed's avatar
      ARM: 8647/2: nommu: dynamic exception base address setting · f8300a0b
      Afzal Mohammed authored
      
      
      No-MMU dynamic exception base address configuration on CP15
      processors. In the case of low vectors, decision based on whether
      security extensions are enabled & whether remap vectors to RAM
      CONFIG option is selected.
      
      For no-MMU without CP15, current default value of 0x0 is retained.
      Signed-off-by: default avatarafzal mohammed <afzal.mohd.ma@gmail.com>
      Tested-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      f8300a0b
    • Afzal Mohammed's avatar
      ARM: 8646/1: mmu: decouple VECTORS_BASE from Kconfig · d2ca5f24
      Afzal Mohammed authored
      
      
      For MMU configurations, VECTORS_BASE is always 0xffff0000, a macro
      definition will suffice.
      
      For no-MMU, exception base address is dynamically determined in
      subsequent patches. To preserve bisectability, now make the
      macro applicable for no-MMU scenario too.
      
      Thanks to 0-DAY kernel test infrastructure that found the
      bisectability issue. This macro will be restricted to MMU case upon
      dynamically determining exception base address for no-MMU.
      
      Once exception address is handled dynamically for no-MMU,
      VECTORS_BASE can be removed from Kconfig.
      Signed-off-by: default avatarafzal mohammed <afzal.mohd.ma@gmail.com>
      Tested-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      d2ca5f24
    • Florian Fainelli's avatar
      ARM: 8644/1: Reduce "CPU: shutdown" message to debug level · 035e7875
      Florian Fainelli authored
      Similar to c68b0274
      
       ("ARM: reduce "Booted secondary processor"
      message to debug level"), demote the "CPU: shutdown" pr_notice() into a
      pr_debug().
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      035e7875
    • Florian Fainelli's avatar
      ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol · 64fc2a94
      Florian Fainelli authored
      
      
      All low-level PM/SMP code using virt_to_phys() should actually use
      __pa_symbol() against kernel symbols. Update code where relevant to move
      away from virt_to_phys().
      Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Reviewed-by: default avatarLaura Abbott <labbott@redhat.com>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      64fc2a94
    • Florian Fainelli's avatar
      ARM: 8640/1: Add support for CONFIG_DEBUG_VIRTUAL · e377cd82
      Florian Fainelli authored
      
      
      x86 has an option: CONFIG_DEBUG_VIRTUAL to do additional checks on
      virt_to_phys calls. The goal is to catch users who are calling
      virt_to_phys on non-linear addresses immediately. This includes caller
      using __virt_to_phys() on image addresses instead of __pa_symbol(). This
      is a generally useful debug feature to spot bad code (particulary in
      drivers).
      Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Acked-by: default avatarLaura Abbott <labbott@redhat.com>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      e377cd82
    • Russell King's avatar
      Merge branch 'devel-stable' into misc · 399f157a
      Russell King authored
      399f157a
    • Florian Fainelli's avatar
      ARM: 8639/1: Define KERNEL_START and KERNEL_END · a09975bf
      Florian Fainelli authored
      
      
      In preparation for adding CONFIG_DEBUG_VIRTUAL support, define a set of
      common constants: KERNEL_START and KERNEL_END which abstract
      CONFIG_XIP_KERNEL vs. !CONFIG_XIP_KERNEL. Update the code where
      relevant.
      Acked-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      a09975bf
    • Florian Fainelli's avatar
      ARM: 8638/1: mtd: lart: Rename partition defines to be prefixed with PART_ · 4e23612b
      Florian Fainelli authored
      
      
      In preparation for defining KERNEL_START on ARM, rename KERNEL_START to
      PART_KERNEL_START, and to be consistent, do this for all
      partition-related constants.
      Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      4e23612b
    • Laura Abbott's avatar
      ARM: 8637/1: Adjust memory boundaries after reservations · 98562656
      Laura Abbott authored
      
      
      adjust_lowmem_bounds is responsible for setting up the boundary for
      lowmem/highmem. This needs to be setup before memblock reservations can
      occur. At the time memblock reservations can occur, memory can also be
      removed from the system. The lowmem/highmem boundary and end of memory
      may be affected by this but it is currently not recalculated. On some
      systems this may be harmless, on others this may result in incorrect
      ranges being passed to the main memory allocator. Correct this by
      recalculating the lowmem/highmem boundary after all reservations have
      been made.
      Tested-by: default avatarMagnus Lilja <lilja.magnus@gmail.com>
      Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      98562656
    • Laura Abbott's avatar
      ARM: 8636/1: Cleanup sanity_check_meminfo · 374d446d
      Laura Abbott authored
      
      
      The logic for sanity_check_meminfo has become difficult to
      follow. Clean up the code so it's more obvious what the code
      is actually trying to do. Additionally, meminfo is now removed
      so rename the function to better describe its purpose.
      Tested-by: default avatarMagnus Lilja <lilja.magnus@gmail.com>
      Reviewed-by: default avatarNicolas Pitre <nico@linaro.org>
      Signed-off-by: default avatarLaura Abbott <lauraa@codeaurora.org>
      Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      374d446d
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 86292b33
      Linus Torvalds authored
      Merge yet more updates from Andrew Morton:
      
       - a few MM remainders
      
       - misc things
      
       - autofs updates
      
       - signals
      
       - affs updates
      
       - ipc
      
       - nilfs2
      
       - spelling.txt updates
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (78 commits)
        mm, x86: fix HIGHMEM64 && PARAVIRT build config for native_pud_clear()
        mm: add arch-independent testcases for RODATA
        hfs: atomically read inode size
        mm: clarify mm_struct.mm_{users,count} documentation
        mm: use mmget_not_zero() helper
        mm: add new mmget() helper
        mm: add new mmgrab() helper
        checkpatch: warn when formats use %Z and suggest %z
        lib/vsprintf.c: remove %Z support
        scripts/spelling.txt: add some typo-words
        scripts/spelling.txt: add "followings" pattern and fix typo instances
        scripts/spelling.txt: add "therfore" pattern and fix typo instances
        scripts/spelling.txt: add "overwriten" pattern and fix typo instances
        scripts/spelling.txt: add "overwritting" pattern and fix typo instances
        scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
        scripts/spelling.txt: add "disassocation" pattern and fix typo instances
        scripts/spelling.txt: add "omited" pattern and fix typo instances
        scripts/spelling.txt: add "explictely" pattern and fix typo instances
        scripts/spelling.txt: add "applys" pattern and fix typo instances
        scripts/spelling.txt: add "configuartion" pattern and fix typo instances
        ...
      86292b33
    • Linus Torvalds's avatar
      Merge tag 'ktest-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest · 1ac884f1
      Linus Torvalds authored
      Pull ktest updates from Steven Rostedt:
       "These are various fixes that I have made and never got around to
        pushing. I've been asked to get the upstream repo back up-to-date"
      
      * tag 'ktest-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest:
        ktest: Add variable run_command_status to save status of commands executed
        ktest.pl: Powercycle the box on reboot if no connection can be made
        ktest: Add timeout to ssh command
        ktest: Fix child exit code processing
        ktest: Have POST_TEST run after the test has totally completed
      1ac884f1
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 08e32dcc
      Linus Torvalds authored
      Pull m68nommu update from Greg Ungerer:
       "Only a single change, to update the amcore board defconfig"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68k/defconfig: amcore board defconfig tuning
      08e32dcc
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 3f5595e3
      Linus Torvalds authored
      Pull more s390 updates from Martin Schwidefsky:
       "Next to the usual bug fixes (including the TASK_SIZE fix), there is
        one larger crypto item. It allows to use protected keys with the
        in-kernel crypto API
      
        The protected key support has two parts, the pkey user space API to
        convert key formats and the paes crypto module that uses a protected
        key instead of a standard AES key"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390: TASK_SIZE for kernel threads
        s390/crypt: Add protected key AES module
        s390/dasd: fix spelling mistake: "supportet" -> "supported"
        s390/pkey: Introduce pkey kernel module
        s390/zcrypt: export additional symbols
        s390/zcrypt: Rework CONFIG_ZCRYPT Kconfig text.
        s390/zcrypt: Cleanup leftover module code.
        s390/nmi: purge tlbs after control register validation
        s390/nmi: fix order of register validation
        s390/crypto: Add PCKMO inline function
        s390/zcrypt: Enable request count reset for cards and queues.
        s390/mm: use _SEGMENT_ENTRY_EMPTY in the code
        s390/chsc: Add exception handler for CHSC instruction
        s390: opt into HAVE_COPY_THREAD_TLS
        s390: restore address space when returning to user space
        s390: rename CIF_ASCE to CIF_ASCE_PRIMARY
      3f5595e3
    • Josh Poimboeuf's avatar
      objtool: Enclose contents of unreachable() macro in a block · 4e4636cf
      Josh Poimboeuf authored
      Guenter Roeck reported a boot failure in mips64.  It was bisected to the
      following commit:
      
        d1091c7f
      
       ("objtool: Improve detection of BUG() and other dead ends")
      
      The unreachable() macro was formerly only composed of a single
      statement.  The above commit added a second statement, but neglected to
      enclose the statements in a block.
      Suggested-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Fixes: d1091c7f ("objtool: Improve detection of BUG() and other dead ends")
      Link: http://lkml.kernel.org/r/20170228042116.glmwmwiohcix7o4a@treble
      
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      4e4636cf
    • Linus Torvalds's avatar
      Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 12dfdfed
      Linus Torvalds authored
      Pull workqueue update from Tejun Heo:
       "Just one patch to silence clang's warnings"
      
      * 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: avoid clang warning
      12dfdfed
    • Linus Torvalds's avatar
      Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · f7878dc3
      Linus Torvalds authored
      Pull cgroup updates from Tejun Heo:
       "Several noteworthy changes.
      
         - Parav's rdma controller is finally merged. It is very straight
           forward and can limit the abosolute numbers of common rdma
           constructs used by different cgroups.
      
         - kernel/cgroup.c got too chubby and disorganized. Created
           kernel/cgroup/ subdirectory and moved all cgroup related files
           under kernel/ there and reorganized the core code. This hurts for
           backporting patches but was long overdue.
      
         - cgroup v2 process listing reimplemented so that it no longer
           depends on allocating a buffer large enough to cache the entire
           result to sort and uniq the output. v2 has always mangled the sort
           order to ensure that users don't depend on the sorted output, so
           this shouldn't surprise anybody. This makes the pid listing
           functions use the same iterators that are used internally, which
           have to have the same iterating capabilities anyway.
      
         - perf cgroup filtering now works automatically on cgroup v2. This
           patch was posted a long time ago but somehow fell through the
           cracks.
      
         - misc fixes asnd documentation updates"
      
      * 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (27 commits)
        kernfs: fix locking around kernfs_ops->release() callback
        cgroup: drop the matching uid requirement on migration for cgroup v2
        cgroup, perf_event: make perf_event controller work on cgroup2 hierarchy
        cgroup: misc cleanups
        cgroup: call subsys->*attach() only for subsystems which are actually affected by migration
        cgroup: track migration context in cgroup_mgctx
        cgroup: cosmetic update to cgroup_taskset_add()
        rdmacg: Fixed uninitialized current resource usage
        cgroup: Add missing cgroup-v2 PID controller documentation.
        rdmacg: Added documentation for rdmacg
        IB/core: added support to use rdma cgroup controller
        rdmacg: Added rdma cgroup controller
        cgroup: fix a comment typo
        cgroup: fix RCU related sparse warnings
        cgroup: move namespace code to kernel/cgroup/namespace.c
        cgroup: rename functions for consistency
        cgroup: move v1 mount functions to kernel/cgroup/cgroup-v1.c
        cgroup: separate out cgroup1_kf_syscall_ops
        cgroup: refactor mount path and clearly distinguish v1 and v2 paths
        cgroup: move cgroup v1 specific code to kernel/cgroup/cgroup-v1.c
        ...
      f7878dc3
    • Linus Torvalds's avatar
      Merge branch 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · fb15a782
      Linus Torvalds authored
      Pull percpu update from Tejun Heo:
       "This contains just one minor cleanup patch which gets rid of an
        unnecessary irqsave/restore in the cpu dead callback"
      
      * 'for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu_counter: percpu_counter_hotcpu_callback() cleanup
      fb15a782
    • Linus Torvalds's avatar
      Merge tag 'rtc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 5782fd14
      Linus Torvalds authored
      Pull RTC updates from Alexandre Belloni:
       "Subsystem:
         - constify rtc_class_ops structures
      
       New driver:
         - STM32
      
       Drivers:
         - armada38x: fix errata, Armada 7K/8K support
         - ds3232: fix wakeup support
         - gemini: DT support
         - m48t86: huge cleanup and platform_data removal
         - mcp795: alarm support
         - sun6i: proper oscillator handling
         - tegra: proper clock handling
         - tps65910: calibration support"
      
      * tag 'rtc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (44 commits)
        rtc: ds3232: Call device_init_wakeup before device_register
        rtc: pcf2127: bulk read only date and time registers.
        rtc: armada38x: Add support for Armada 7K/8K
        rtc: armada38x: Prepare driver to manage different versions
        rtc: ds3232: Add regmap max_register definition.
        rtc: ds3232: Cleanup whitespace around register and bit definitions.
        rtc: m48t86: remove unused platform_data
        ARM: Orion5x: ts78xx: allow rtc-m48t86 to manage it's own resources
        ARM: Orion5x: ts78xx: remove RTC detection
        ARM: ep93xx: ts72xx: allow rtc-m48t86 to manage its own resources
        rtc: m48t86: verify that the RTC is actually present
        rtc: m48t86: add NVRAM support
        rtc: m48t86: allow driver to manage its resources
        rtc: m48t86: shorten register name defines
        bindings: rtc: correct wrong reference in required properties
        rtc: sun6i: Fix return value check in sun6i_rtc_clk_init()
        rtc: sun6i: extend test coverage
        rtc: sun6i: Fix compatibility with old DT binding
        rtc: snvs: add a missing write sync
        rtc: bq32000: add support to enable disable the trickle charge FET bypass
        ...
      5782fd14