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

Commit d9fd363a authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'master' into for-4.12/post-merge

parents a44f53fa 8f9cedc7

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ Linas Vepstas <linas@austin.ibm.com> 
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Mark Brown <broonie@sirena.org.uk>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

Matthieu CASTET <castet.matthieu@free.fr>

Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>

Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
@@ -171,6 +173,7 @@ Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com> 
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

Documentation/admin-guide/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1725,6 +1725,12 @@ 
			kernel and module base offset ASLR (Address Space

			Layout Randomization).



	kasan_multi_shot

			[KNL] Enforce KASAN (Kernel Address Sanitizer) to print

			report on every invalid memory access. Without this

			parameter KASAN will print report only for the first

			invalid access.



	keepinitrd	[HW,ARM]



	kernelcore=	[KNL,X86,IA-64,PPC]

Documentation/devicetree/bindings/pci/hisilicon-pcie.txt

+8 −2
Original line number Diff line number Diff line
@@ -44,13 +44,19 @@ Hip05 Example (note that Hip06 is the same except compatible): 
	};



HiSilicon Hip06/Hip07 PCIe host bridge DT (almost-ECAM) description.



Some BIOSes place the host controller in a mode where it is ECAM

compliant for all devices other than the root complex. In such cases,

the host controller should be described as below.



The properties and their meanings are identical to those described in

host-generic-pci.txt except as listed below.



Properties of the host controller node that differ from

host-generic-pci.txt:



- compatible     : Must be "hisilicon,pcie-almost-ecam"

- compatible     : Must be "hisilicon,hip06-pcie-ecam", or

		   "hisilicon,hip07-pcie-ecam"



- reg            : Two entries: First the ECAM configuration space for any

		   other bus underneath the root bus. Second, the base
@@ -59,7 +65,7 @@ host-generic-pci.txt: 


Example:

	pcie0: pcie@a0090000 {

		compatible = "hisilicon,pcie-almost-ecam";

		compatible = "hisilicon,hip06-pcie-ecam";

		reg = <0 0xb0000000 0 0x2000000>,  /*  ECAM configuration space */

		      <0 0xa0090000 0 0x10000>; /* host bridge registers */

		bus-range = <0  31>;

Documentation/devicetree/bindings/rng/omap_rng.txt

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ Required properties: 
- reg : Offset and length of the register set for the module

- interrupts : the interrupt number for the RNG module.

		Used for "ti,omap4-rng" and "inside-secure,safexcel-eip76"

- clocks: the trng clock source

- clocks: the trng clock source. Only mandatory for the

  "inside-secure,safexcel-eip76" compatible.



Example:

/* AM335x */

Documentation/filesystems/Locking

+1 −2
Original line number Diff line number Diff line
@@ -58,8 +58,7 @@ prototypes: 
	int (*permission) (struct inode *, int, unsigned int);

	int (*get_acl)(struct inode *, int);

	int (*setattr) (struct dentry *, struct iattr *);

	int (*getattr) (const struct path *, struct dentry *, struct kstat *,

			u32, unsigned int);

	int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);

	ssize_t (*listxattr) (struct dentry *, char *, size_t);

	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);

	void (*update_time)(struct inode *, struct timespec *, int);