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

Commit 90b45399 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.2-rc6 into staging-next



We want the fixes and this resolves a merge issue as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents e39956c0 4b972a01
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,7 @@ Greg Kroah-Hartman <greg@echidna.(none)>
Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman <greg@kroah.com>
Greg Kroah-Hartman <greg@kroah.com>
Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.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>
Henk Vergonet <Henk.Vergonet@gmail.com>
Henrik Kretzschmar <henne@nachtwindheim.de>
Henrik Kretzschmar <henne@nachtwindheim.de>
Henrik Rydberg <rydberg@bitmath.org>
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@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>
Will Deacon <will@kernel.org> <will.deacon@arm.com>
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.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>
+11 −11
Original line number Original line Diff line number Diff line
What:		/sys/bus/siox/devices/siox-X/active
What:		/sys/bus/siox/devices/siox-X/active
KernelVersion:	4.16
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:
Description:
		On reading represents the current state of the bus. If it
		On reading represents the current state of the bus. If it
		contains a "0" the bus is stopped and connected devices are
		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
What:		/sys/bus/siox/devices/siox-X/device_add
KernelVersion:	4.16
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:
Description:
		Write-only file. Write
		Write-only file. Write


@@ -27,13 +27,13 @@ Description:


What:		/sys/bus/siox/devices/siox-X/device_remove
What:		/sys/bus/siox/devices/siox-X/device_remove
KernelVersion:	4.16
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:
Description:
		Write-only file. A single write removes the last device in the siox chain.
		Write-only file. A single write removes the last device in the siox chain.


What:		/sys/bus/siox/devices/siox-X/poll_interval_ns
What:		/sys/bus/siox/devices/siox-X/poll_interval_ns
KernelVersion:	4.16
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:
Description:
		Defines the interval between two poll cycles in nano seconds.
		Defines the interval between two poll cycles in nano seconds.
		Note this is rounded to jiffies on writing. On reading the current value
		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
What:		/sys/bus/siox/devices/siox-X-Y/connected
KernelVersion:	4.16
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:
Description:
		Read-only value. "0" means the Yth device on siox bus X isn't "connected" i.e.
		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.
		communication with it is not ensured. "1" signals a working connection.


What:		/sys/bus/siox/devices/siox-X-Y/inbytes
What:		/sys/bus/siox/devices/siox-X-Y/inbytes
KernelVersion:	4.16
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:
Description:
		Read-only value reporting the inbytes value provided to siox-X/device_add
		Read-only value reporting the inbytes value provided to siox-X/device_add


What:		/sys/bus/siox/devices/siox-X-Y/status_errors
What:		/sys/bus/siox/devices/siox-X-Y/status_errors
KernelVersion:	4.16
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:
Description:
		Counts the number of time intervals when the read status byte doesn't yield the
		Counts the number of time intervals when the read status byte doesn't yield the
		expected value.
		expected value.


What:		/sys/bus/siox/devices/siox-X-Y/type
What:		/sys/bus/siox/devices/siox-X-Y/type
KernelVersion:	4.16
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:
Description:
		Read-only value reporting the type value provided to siox-X/device_add.
		Read-only value reporting the type value provided to siox-X/device_add.


What:		/sys/bus/siox/devices/siox-X-Y/watchdog
What:		/sys/bus/siox/devices/siox-X-Y/watchdog
KernelVersion:	4.16
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:
Description:
		Read-only value reporting if the watchdog of the siox device is
		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
		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
What:		/sys/bus/siox/devices/siox-X-Y/watchdog_errors
KernelVersion:	4.16
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:
Description:
		Read-only value reporting the number to time intervals when the
		Read-only value reporting the number to time intervals when the
		watchdog was active.
		watchdog was active.


What:		/sys/bus/siox/devices/siox-X-Y/outbytes
What:		/sys/bus/siox/devices/siox-X-Y/outbytes
KernelVersion:	4.16
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:
Description:
		Read-only value reporting the outbytes value provided to siox-X/device_add.
		Read-only value reporting the outbytes value provided to siox-X/device_add.
+2 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ Contact: Bjørn Mork <bjorn@mork.no>
Description:
Description:
		Unsigned integer.
		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
		based network device, supported by recent Qualcomm based
		modems.
		modems.


@@ -46,5 +46,5 @@ Contact: Bjørn Mork <bjorn@mork.no>
Description:
Description:
		Unsigned integer.
		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.
		created qmap mux based network device.
+16 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,18 @@ model features for SVE is included in Appendix A.
  is to connect to a target process first and then attempt a
  is to connect to a target process first and then attempt a
  ptrace(PTRACE_GETREGSET, pid, NT_ARM_SVE, &iov).
  ptrace(PTRACE_GETREGSET, pid, NT_ARM_SVE, &iov).


* Whenever SVE scalable register values (Zn, Pn, FFR) are exchanged in memory
  between userspace and the kernel, the register value is encoded in memory in
  an endianness-invariant layout, with bits [(8 * i + 7) : (8 * i)] encoded at
  byte offset i from the start of the memory representation.  This affects for
  example the signal frame (struct sve_context) and ptrace interface
  (struct user_sve_header) and associated data.

  Beware that on big-endian systems this results in a different byte order than
  for the FPSIMD V-registers, which are stored as single host-endian 128-bit
  values, with bits [(127 - 8 * i) : (120 - 8 * i)] of the register encoded at
  byte offset i.  (struct fpsimd_context, struct user_fpsimd_state).



2.  Vector length terminology
2.  Vector length terminology
-----------------------------
-----------------------------
@@ -124,6 +136,10 @@ the SVE instruction set architecture.
  size and layout.  Macros SVE_SIG_* are defined [1] to facilitate access to
  size and layout.  Macros SVE_SIG_* are defined [1] to facilitate access to
  the members.
  the members.


* Each scalable register (Zn, Pn, FFR) is stored in an endianness-invariant
  layout, with bits [(8 * i + 7) : (8 * i)] stored at byte offset i from the
  start of the register's representation in memory.

* If the SVE context is too big to fit in sigcontext.__reserved[], then extra
* If the SVE context is too big to fit in sigcontext.__reserved[], then extra
  space is allocated on the stack, an extra_context record is written in
  space is allocated on the stack, an extra_context record is written in
  __reserved[] referencing this space.  sve_context is then written in the
  __reserved[] referencing this space.  sve_context is then written in the
+8 −10
Original line number Original line Diff line number Diff line
@@ -13,11 +13,9 @@ you can do so by typing:


# mount none /sys -t sysfs
# mount none /sys -t sysfs


As of the Linux 2.6.10 kernel, it is now possible to change the
It is possible to change the IO scheduler for a given block device on
IO scheduler for a given block device on the fly (thus making it possible,
the fly to select one of mq-deadline, none, bfq, or kyber schedulers -
for instance, to set the CFQ scheduler for the system default, but
which can improve that device's throughput.
set a specific device to use the deadline or noop schedulers - which
can improve that device's throughput).


To set a specific scheduler, simply do this:
To set a specific scheduler, simply do this:


@@ -30,8 +28,8 @@ The list of defined schedulers can be found by simply doing
a "cat /sys/block/DEV/queue/scheduler" - the list of valid names
a "cat /sys/block/DEV/queue/scheduler" - the list of valid names
will be displayed, with the currently selected scheduler in brackets:
will be displayed, with the currently selected scheduler in brackets:


# cat /sys/block/hda/queue/scheduler
# cat /sys/block/sda/queue/scheduler
noop deadline [cfq]
[mq-deadline] kyber bfq none
# echo deadline > /sys/block/hda/queue/scheduler
# echo none >/sys/block/sda/queue/scheduler
# cat /sys/block/hda/queue/scheduler
# cat /sys/block/sda/queue/scheduler
noop [deadline] cfq
[none] mq-deadline kyber bfq
Loading