Merge branch 'devel-stable' into for-linus

Conflicts:
	drivers/perf/arm_pmu.c

diff --cc arch/arm/Kconfig
index 3458828562873280ab3bbd4c5b5619f9475d032f,74fe545af38a0fc20c9594fc0618c416be1a0f8f..45e635b879431fa95f0477d838076ec20e09ed48
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1703,28 -1701,9 +1704,24 @@@ config HIGHPT
          consumed by page tables.  Setting this option will allow
          user-space 2nd level page tables to reside in high memory.
  
 +config CPU_SW_DOMAIN_PAN
 +      bool "Enable use of CPU domains to implement privileged no-access"
 +      depends on MMU && !ARM_LPAE
 +      default y
 +      help
 +        Increase kernel security by ensuring that normal kernel accesses
 +        are unable to access userspace addresses.  This can help prevent
 +        use-after-free bugs becoming an exploitable privilege escalation
 +        by ensuring that magic values (such as LIST_POISON) will always
 +        fault when dereferenced.
 +
 +        CPUs with low-vector mappings use a best-efforts implementation.
 +        Their lower 1MB needs to remain accessible for the vectors, but
 +        the remainder of userspace will become appropriately inaccessible.
 +
  config HW_PERF_EVENTS
-       bool "Enable hardware performance counter support for perf events"
-       depends on PERF_EVENTS
-       default y
-       help
-         Enable hardware performance counter support for perf events. If
-         disabled, perf events will use software events only.
+       def_bool y
+       depends on ARM_PMU
  
  config SYS_SUPPORTS_HUGETLBFS
         def_bool y

diff --cc arch/arm/kernel/setup.c
Simple merge