Merge tag 'v4.19-rc5' into perf/core, to pick up fixes (fb437bc8) · Commits · 戴 / test

Documentation/ABI/stable/sysfs-devices-system-xen_memory

+9 −0

Original line number	Diff line number	Diff line
		@@ -75,3 +75,12 @@ Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Description:
		Amount (in KiB) of low (or normal) memory in the
		balloon.

		What: /sys/devices/system/xen_memory/xen_memory0/scrub_pages
		Date: September 2018
		KernelVersion: 4.20
		Contact: xen-devel@lists.xenproject.org
		Description:
		Control scrubbing pages before returning them to Xen for others domains
		use. Can be set with xen_scrub_pages cmdline
		parameter. Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.

Documentation/admin-guide/kernel-parameters.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -5000,6 +5000,12 @@
		Disables the PV optimizations forcing the HVM guest to
		run as generic HVM guest with no PV drivers.

		xen_scrub_pages= [XEN]
		Boolean option to control scrubbing pages before giving them back
		to Xen, for use by other domains. Can be also changed at runtime
		with /sys/devices/system/xen_memory/xen_memory0/scrub_pages.
		Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.

		xirc2ps_cs= [NET,PCMCIA]
		Format:
		<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

Documentation/device-mapper/dm-raid.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -348,3 +348,7 @@ Version History
		1.13.1 Fix deadlock caused by early md_stop_writes(). Also fix size an
		state races.
		1.13.2 Fix raid redundancy validation and avoid keeping raid set frozen
		1.14.0 Fix reshape race on small devices. Fix stripe adding reshape
		deadlock/potential data corruption. Update superblock when
		specific devices are requested via rebuild. Fix RAID leg
		rebuild errors.

Documentation/devicetree/bindings/net/macb.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ Required properties:
		Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
		the Cadence GEM, or the generic form: "cdns,gem".
		Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.
		Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.
		Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
		Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
		Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

Documentation/filesystems/vfs.txt

+19 −2

Original line number	Diff line number	Diff line
		@@ -848,7 +848,7 @@ struct file_operations
		----------------------

		This describes how the VFS can manipulate an open file. As of kernel
		4.1, the following members are defined:
		4.18, the following members are defined:

		struct file_operations {
		struct module *owner;
		@@ -858,11 +858,11 @@ struct file_operations {
		ssize_t (read_iter) (struct kiocb , struct iov_iter *);
		ssize_t (write_iter) (struct kiocb , struct iov_iter *);
		int (iterate) (struct file , struct dir_context *);
		int (iterate_shared) (struct file , struct dir_context *);
		__poll_t (poll) (struct file , struct poll_table_struct *);
		long (unlocked_ioctl) (struct file , unsigned int, unsigned long);
		long (compat_ioctl) (struct file , unsigned int, unsigned long);
		int (mmap) (struct file , struct vm_area_struct *);
		int (mremap)(struct file , struct vm_area_struct *);
		int (open) (struct inode , struct file *);
		int (flush) (struct file , fl_owner_t id);
		int (release) (struct inode , struct file *);
		@@ -882,6 +882,10 @@ struct file_operations {
		#ifndef CONFIG_MMU
		unsigned (mmap_capabilities)(struct file );
		#endif
		ssize_t (copy_file_range)(struct file , loff_t, struct file *, loff_t, size_t, unsigned int);
		int (clone_file_range)(struct file , loff_t, struct file *, loff_t, u64);
		int (dedupe_file_range)(struct file , loff_t, struct file *, loff_t, u64);
		int (fadvise)(struct file , loff_t, loff_t, int);
		};

		Again, all methods are called without any locks being held, unless
		@@ -899,6 +903,9 @@ otherwise noted.

		iterate: called when the VFS needs to read the directory contents

		iterate_shared: called when the VFS needs to read the directory contents
		when filesystem supports concurrent dir iterators

		poll: called by the VFS when a process wants to check if there is
		activity on this file and (optionally) go to sleep until there
		is activity. Called by the select(2) and poll(2) system calls
		@@ -951,6 +958,16 @@ otherwise noted.

		fallocate: called by the VFS to preallocate blocks or punch a hole.

		copy_file_range: called by the copy_file_range(2) system call.

		clone_file_range: called by the ioctl(2) system call for FICLONERANGE and
		FICLONE commands.

		dedupe_file_range: called by the ioctl(2) system call for FIDEDUPERANGE
		command.

		fadvise: possibly called by the fadvise64() system call.

		Note that the file operations are implemented by the specific
		filesystem in which the inode resides. When opening a device node
		(character or block special) most filesystems will call special

Admin message