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

Commit 84b1e36a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v4.11-rc6' into perf/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 11e445e9 39da7c50

.mailmap

+1 −0
Original line number Original line Diff line number Diff line
@@ -171,6 +171,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@virtuozzo.com>

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

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

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

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

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

Yusuke Goda <goda.yusuke@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

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

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

Gustavo Padovan <padovan@profusion.mobi>
 
Gustavo Padovan <padovan@profusion.mobi>

Documentation/admin-guide/kernel-parameters.txt

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

			kernel and module base offset ASLR (Address Space

			Layout Randomization).

			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]

	keepinitrd	[HW,ARM]





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

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

Documentation/devicetree/bindings/rng/omap_rng.txt

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

- reg : Offset and length of the register set for the module

- interrupts : the interrupt number for the RNG module.

- interrupts : the interrupt number for the RNG module.

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

		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:

Example:

/* AM335x */

/* AM335x */

Documentation/filesystems/Locking

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

	int (*permission) (struct inode *, int, unsigned int);

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

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

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

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

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

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

			u32, unsigned int);

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

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

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

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

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

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

Documentation/filesystems/porting

+6 −0
Original line number Original line Diff line number Diff line
@@ -600,3 +600,9 @@ in your dentry operations instead. 
[recommended]

[recommended]

	->readlink is optional for symlinks.  Don't set, unless filesystem needs

	->readlink is optional for symlinks.  Don't set, unless filesystem needs

	to fake something for readlink(2).

	to fake something for readlink(2).

--

[mandatory]

	->getattr() is now passed a struct path rather than a vfsmount and

	dentry separately, and it now has request_mask and query_flags arguments

	to specify the fields and sync type requested by statx.  Filesystems not

	supporting any statx-specific features may ignore the new arguments.