Commit 5be1f9d8 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'v5.2-rc6' into for-5.3/block 

Merge 5.2-rc6 into for-5.3/block, so we get the same page merge leak
fix. Otherwise we end up having conflicts with future patches between
for-5.3/block and master that touch this area. In particular, it makes
the bio_full() fix hard to backport to stable.

* tag 'v5.2-rc6': (482 commits)
  Linux 5.2-rc6
  Revert "iommu/vt-d: Fix lock inversion between iommu->lock and device_domain_lock"
  Bluetooth: Fix regression with minimum encryption key size alignment
  tcp: refine memory limit test in tcp_fragment()
  x86/vdso: Prevent segfaults due to hoisted vclock reads
  SUNRPC: Fix a credential refcount leak
  Revert "SUNRPC: Declare RPC timers as TIMER_DEFERRABLE"
  net :sunrpc :clnt :Fix xps refcount imbalance on the error path
  NFS4: Only set creation opendata if O_CREAT
  ARM: 8867/1: vdso: pass --be8 to linker if necessary
  KVM: nVMX: reorganize initial steps of vmx_set_nested_state
  KVM: PPC: Book3S HV: Invalidate ERAT when flushing guest TLB entries
  habanalabs: use u64_to_user_ptr() for reading user pointers
  nfsd: replace Jeff by Chuck as nfsd co-maintainer
  inet: clear num_timeout reqsk_alloc()
  PCI/P2PDMA: Ignore root complex whitelist when an IOMMU is present
  net: mvpp2: debugfs: Add pmap to fs dump
  ipv6: Default fib6_type to RTN_UNICAST when not set
  net: hns3: Fix inconsistent indenting
  net/af_iucv: always register net_device notifier
  ...
parents ff91064e 4b972a01

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ Greg Kroah-Hartman <greg@echidna.(none)> 
Greg Kroah-Hartman <gregkh@suse.de>

Greg Kroah-Hartman <greg@kroah.com>

Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Henk Vergonet <Henk.Vergonet@gmail.com>

Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>
@@ -238,6 +239,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>

Will Deacon <will@kernel.org> <will.deacon@arm.com>

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

Yusuke Goda <goda.yusuke@renesas.com>

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

Documentation/ABI/testing/sysfs-bus-siox

+11 −11
Original line number Diff line number Diff line 
What:		/sys/bus/siox/devices/siox-X/active

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		On reading represents the current state of the bus. If it

		contains a "0" the bus is stopped and connected devices are
@@ -12,7 +12,7 @@ Description: 


What:		/sys/bus/siox/devices/siox-X/device_add

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Write-only file. Write
@@ -27,13 +27,13 @@ Description: 


What:		/sys/bus/siox/devices/siox-X/device_remove

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Write-only file. A single write removes the last device in the siox chain.



What:		/sys/bus/siox/devices/siox-X/poll_interval_ns

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Defines the interval between two poll cycles in nano seconds.

		Note this is rounded to jiffies on writing. On reading the current value
@@ -41,33 +41,33 @@ Description: 


What:		/sys/bus/siox/devices/siox-X-Y/connected

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value. "0" means the Yth device on siox bus X isn't "connected" i.e.

		communication with it is not ensured. "1" signals a working connection.



What:		/sys/bus/siox/devices/siox-X-Y/inbytes

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the inbytes value provided to siox-X/device_add



What:		/sys/bus/siox/devices/siox-X-Y/status_errors

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Counts the number of time intervals when the read status byte doesn't yield the

		expected value.



What:		/sys/bus/siox/devices/siox-X-Y/type

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the type value provided to siox-X/device_add.



What:		/sys/bus/siox/devices/siox-X-Y/watchdog

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting if the watchdog of the siox device is

		active. "0" means the watchdog is not active and the device is expected to
@@ -75,13 +75,13 @@ Description: 


What:		/sys/bus/siox/devices/siox-X-Y/watchdog_errors

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the number to time intervals when the

		watchdog was active.



What:		/sys/bus/siox/devices/siox-X-Y/outbytes

KernelVersion:	4.16

Contact:	Gavin Schenk <g.schenk@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Contact:	Thorsten Scherer <t.scherer@eckelmann.de>, Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Description:

		Read-only value reporting the outbytes value provided to siox-X/device_add.

Documentation/ABI/testing/sysfs-class-net-qmi

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Contact: Bjørn Mork <bjorn@mork.no> 
Description:

		Unsigned integer.



		Write a number ranging from 1 to 127 to add a qmap mux

		Write a number ranging from 1 to 254 to add a qmap mux

		based network device, supported by recent Qualcomm based

		modems.
@@ -46,5 +46,5 @@ Contact: Bjørn Mork <bjorn@mork.no> 
Description:

		Unsigned integer.



		Write a number ranging from 1 to 127 to delete a previously

		Write a number ranging from 1 to 254 to delete a previously

		created qmap mux based network device.

Documentation/cgroup-v1/hugetlb.txt

+13 −9
Original line number Diff line number Diff line
@@ -32,14 +32,18 @@ Brief summary of control files 
 hugetlb.<hugepagesize>.usage_in_bytes     # show current usage for "hugepagesize" hugetlb

 hugetlb.<hugepagesize>.failcnt		   # show the number of allocation failure due to HugeTLB limit



For a system supporting two hugepage size (16M and 16G) the control

For a system supporting three hugepage sizes (64k, 32M and 1G), the control

files include:



hugetlb.16GB.limit_in_bytes

hugetlb.16GB.max_usage_in_bytes

hugetlb.16GB.usage_in_bytes

hugetlb.16GB.failcnt

hugetlb.16MB.limit_in_bytes

hugetlb.16MB.max_usage_in_bytes

hugetlb.16MB.usage_in_bytes

hugetlb.16MB.failcnt
 
hugetlb.1GB.limit_in_bytes

hugetlb.1GB.max_usage_in_bytes

hugetlb.1GB.usage_in_bytes

hugetlb.1GB.failcnt

hugetlb.64KB.limit_in_bytes

hugetlb.64KB.max_usage_in_bytes

hugetlb.64KB.usage_in_bytes

hugetlb.64KB.failcnt

hugetlb.32MB.limit_in_bytes

hugetlb.32MB.max_usage_in_bytes

hugetlb.32MB.usage_in_bytes

hugetlb.32MB.failcnt

Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
 - compatible: Should be one of the following:

   - "microchip,mcp2510" for MCP2510.

   - "microchip,mcp2515" for MCP2515.

   - "microchip,mcp25625" for MCP25625.

 - reg: SPI chip select.

 - clocks: The clock feeding the CAN controller.

 - interrupts: Should contain IRQ line for the CAN controller.

CRA Git | Maintained and supported by SUSTech CRA and CCSE