Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b63b6bf authored by Dan Williams's avatar Dan Williams
Browse files

Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm

parents e07ecd76 55f5560d

Documentation/devicetree/bindings/gpio/gpio-mpc8xxx.txt

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ Required properties: 
      0 = active high

      1 = active low



Optional properties:

- little-endian : GPIO registers are used as little endian. If not

                  present registers are used as big endian by default.



Example:



gpio0: gpio@1100 {

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -2975,6 +2975,7 @@ F: kernel/cpuset.c 
CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)

M:	Johannes Weiner <hannes@cmpxchg.org>

M:	Michal Hocko <mhocko@kernel.org>

M:	Vladimir Davydov <vdavydov@virtuozzo.com>

L:	cgroups@vger.kernel.org

L:	linux-mm@kvack.org

S:	Maintained
@@ -8286,7 +8287,7 @@ F: include/linux/delayacct.h 
F:	kernel/delayacct.c



PERFORMANCE EVENTS SUBSYSTEM

M:	Peter Zijlstra <a.p.zijlstra@chello.nl>

M:	Peter Zijlstra <peterz@infradead.org>

M:	Ingo Molnar <mingo@redhat.com>

M:	Arnaldo Carvalho de Melo <acme@kernel.org>

L:	linux-kernel@vger.kernel.org

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Blurry Fish Butt



# *DOCUMENTATION*

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config ARM 
	bool

	default y

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAVE_CUSTOM_GPIO_H

arch/arm/Kconfig.debug

+0 −14
Original line number Diff line number Diff line
@@ -15,20 +15,6 @@ config ARM_PTDUMP 
	  kernel.

	  If in doubt, say "N"



config STRICT_DEVMEM

	bool "Filter access to /dev/mem"

	depends on MMU

	---help---

	  If this option is disabled, you allow userspace (root) access to all

	  of memory, including kernel and userspace memory. Accidental

	  access to this is obviously disastrous, but specific access can

	  be used by people debugging the kernel.



	  If this option is switched on, the /dev/mem file only allows

	  userspace access to memory mapped peripherals.



          If in doubt, say Y.



# RMK wants arm kernels compiled with frame pointers or stack unwinding.

# If you know what you are doing and are willing to live without stack

# traces, you can get a slightly smaller kernel by setting this option to