Commit a8fa94e0 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'master' into driver-core-next-test-merge-rc2 

da9846ae ("kernfs: make kernfs_deactivate() honor KERNFS_LOCKDEP
flag") in driver-core-linus conflicts with kernfs_drain() updates in
driver-core-next.  The former just adds the missing KERNFS_LOCKDEP
checks which are already handled by kernfs_lockdep() checks in
driver-core-next.  The conflict can be resolved by taking code from
driver-core-next.

Conflicts:
	fs/kernfs/dir.c
parents 9561a896 b28a960c

Documentation/devicetree/bindings/interrupt-controller/lsi,zevio-intc.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
TI-NSPIRE interrupt controller



Required properties:

- compatible: Compatible property value should be "lsi,zevio-intc".



- reg: Physical base address of the controller and length of memory mapped

	region.



- interrupt-controller : Identifies the node as an interrupt controller



Example:



interrupt-controller {

	compatible = "lsi,zevio-intc";

	interrupt-controller;

	reg = <0xDC000000 0x1000>;

	#interrupt-cells = <1>;

};

Documentation/dvb/contributors.txt

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ Peter Beutner <p.beutner@gmx.net> 
Wilson Michaels <wilsonmichaels@earthlink.net>

  for the lgdt330x frontend driver, and various bugfixes



Michael Krufky <mkrufky@m1k.net>

Michael Krufky <mkrufky@linuxtv.org>

  for maintaining v4l/dvb inter-tree dependencies



Taylor Jacob <rtjacob@earthlink.net>

Documentation/kernel-parameters.txt

+4 −4
Original line number Diff line number Diff line
@@ -1726,16 +1726,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			option description.



	memmap=nn[KMG]@ss[KMG]

			[KNL] Force usage of a specific region of memory

			Region of memory to be used, from ss to ss+nn.

			[KNL] Force usage of a specific region of memory.

			Region of memory to be used is from ss to ss+nn.



	memmap=nn[KMG]#ss[KMG]

			[KNL,ACPI] Mark specific memory as ACPI data.

			Region of memory to be used, from ss to ss+nn.

			Region of memory to be marked is from ss to ss+nn.



	memmap=nn[KMG]$ss[KMG]

			[KNL,ACPI] Mark specific memory as reserved.

			Region of memory to be used, from ss to ss+nn.

			Region of memory to be reserved is from ss to ss+nn.

			Example: Exclude memory from 0x18690000-0x1869ffff

			         memmap=64K$0x18690000

			         or

Makefile

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

PATCHLEVEL = 14

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Shuffling Zombie Juror



# *DOCUMENTATION*

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ config ARM64 
	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_HW_BREAKPOINT if PERF_EVENTS

	select HAVE_MEMBLOCK

	select HAVE_PATA_PLATFORM

	select HAVE_PERF_EVENTS

	select IRQ_DOMAIN

	select MODULES_USE_ELF_RELA

CRA Git | Maintained and supported by SUSTech CRA and CCSE