Commit 6fb845f0 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'v5.0-rc6' into for-5.1/block 

Pull in 5.0-rc6 to avoid a dumb merge conflict with fs/iomap.c.
This is needed since io_uring is now based on the block branch,
to avoid a conflict between the multi-page bvecs and the bits
of io_uring that touch the core block parts.

* tag 'v5.0-rc6': (525 commits)
  Linux 5.0-rc6
  x86/mm: Make set_pmd_at() paravirt aware
  MAINTAINERS: Update the ocores i2c bus driver maintainer, etc
  blk-mq: remove duplicated definition of blk_mq_freeze_queue
  Blk-iolatency: warn on negative inflight IO counter
  blk-iolatency: fix IO hang due to negative inflight counter
  MAINTAINERS: unify reference to xen-devel list
  x86/mm/cpa: Fix set_mce_nospec()
  futex: Handle early deadlock return correctly
  futex: Fix barrier comment
  net: dsa: b53: Fix for failure when irq is not defined in dt
  blktrace: Show requests without sector
  mips: cm: reprime error cause
  mips: loongson64: remove unreachable(), fix loongson_poweroff().
  sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach()
  geneve: should not call rt6_lookup() when ipv6 was disabled
  KVM: nVMX: unconditionally cancel preemption timer in free_nested (CVE-2019-7221)
  KVM: x86: work around leak of uninitialized stack contents (CVE-2019-7222)
  kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974)
  signal: Better detection of synchronous signals
  ...
parents 56d18f62 d1393711

Documentation/ABI/stable/sysfs-driver-mlxreg-io

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ 
							cpld3_version



Date:		November 2018

KernelVersion:	4.21

KernelVersion:	5.0

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files show with which CPLD versions have been burned

		on LED board.
@@ -35,7 +35,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ 
							jtag_enable



Date:		November 2018

KernelVersion:	4.21

KernelVersion:	5.0

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files enable and disable the access to the JTAG domain.

		By default access to the JTAG domain is disabled.
@@ -105,7 +105,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ 
						reset_voltmon_upgrade_fail



Date:		November 2018

KernelVersion:	4.21

KernelVersion:	5.0

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files show the system reset cause, as following: ComEx

		power fail, reset from ComEx, system platform reset, reset

Documentation/admin-guide/kernel-parameters.txt

+3 −4
Original line number Diff line number Diff line
@@ -1696,12 +1696,11 @@ 
			By default, super page will be supported if Intel IOMMU

			has the capability. With this option, super page will

			not be supported.

		sm_off [Default Off]

			By default, scalable mode will be supported if the

		sm_on [Default Off]

			By default, scalable mode will be disabled even if the

			hardware advertises that it has support for the scalable

			mode translation. With this option set, scalable mode

			will not be used even on hardware which claims to support

			it.

			will be used on hardware which claims to support it.

		tboot_noforce [Default Off]

			Do not force the Intel IOMMU enabled under tboot.

			By default, tboot will force Intel IOMMU on, which

Documentation/devicetree/bindings/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -17,7 +17,11 @@ extra-y += $(DT_TMP_SCHEMA) 
quiet_cmd_mk_schema = SCHEMA  $@

      cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(filter-out FORCE, $^)



DT_DOCS = $(shell cd $(srctree)/$(src) && find * -name '*.yaml')

DT_DOCS = $(shell \

	cd $(srctree)/$(src) && \

	find * \( -name '*.yaml' ! -name $(DT_TMP_SCHEMA) \) \

	)



DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))



extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))

Documentation/devicetree/bindings/serio/olpc,ap-sp.txt

+0 −4
Original line number Diff line number Diff line
@@ -4,14 +4,10 @@ Required properties: 
- compatible : "olpc,ap-sp"

- reg : base address and length of SoC's WTM registers

- interrupts : SP-AP interrupt

- clocks : phandle + clock-specifier for the clock that drives the WTM

- clock-names:  should be "sp"



Example:

	ap-sp@d4290000 {

		compatible = "olpc,ap-sp";

		reg = <0xd4290000 0x1000>;

		interrupts = <40>;

		clocks = <&soc_clocks MMP2_CLK_SP>;

		clock-names = "sp";

	}

Documentation/sysctl/fs.txt

+16 −10
Original line number Diff line number Diff line
@@ -56,26 +56,32 @@ of any kernel data structures. 


dentry-state:



From linux/fs/dentry.c:

From linux/include/linux/dcache.h:

--------------------------------------------------------------

struct {

struct dentry_stat_t dentry_stat {

        int nr_dentry;

        int nr_unused;

        int age_limit;         /* age in seconds */

        int want_pages;        /* pages requested by system */

        int dummy[2];

} dentry_stat = {0, 0, 45, 0,};

        int nr_negative;       /* # of unused negative dentries */

        int dummy;             /* Reserved for future use */

};

--------------------------------------------------------------



Dentries are dynamically allocated and deallocated, and

nr_dentry seems to be 0 all the time. Hence it's safe to

assume that only nr_unused, age_limit and want_pages are

used. Nr_unused seems to be exactly what its name says.

Dentries are dynamically allocated and deallocated.



nr_dentry shows the total number of dentries allocated (active

+ unused). nr_unused shows the number of dentries that are not

actively used, but are saved in the LRU list for future reuse.



Age_limit is the age in seconds after which dcache entries

can be reclaimed when memory is short and want_pages is

nonzero when shrink_dcache_pages() has been called and the

dcache isn't pruned yet.



nr_negative shows the number of unused dentries that are also

negative dentries which do not mapped to actual files.



==============================================================



dquot-max & dquot-nr:

CRA Git | Maintained and supported by SUSTech CRA and CCSE