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

Commit 87a8d032 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v4.10-rc7' into efi/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 696204fa d5adbfcd

Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ Properties: 
  Second cell specifies the irq distribution mode to cores

     0=Round Robin; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3



  The second cell in interrupts property is deprecated and may be ignored by

  the kernel.



  intc accessed via the special ARC AUX register interface, hence "reg" property

  is not specified.

Documentation/devicetree/bindings/net/mediatek-net.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ have dual GMAC each represented by a child node.. 
* Ethernet controller node



Required properties:

- compatible: Should be "mediatek,mt7623-eth"

- compatible: Should be "mediatek,mt2701-eth"

- reg: Address and length of the register set for the device

- interrupts: Should contain the three frame engines interrupts in numeric

	order. These are fe_int0, fe_int1 and fe_int2.

Documentation/devicetree/bindings/net/phy.txt

+3 −2
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ Optional Properties: 
  specifications. If neither of these are specified, the default is to

  assume clause 22.



  If the phy's identifier is known then the list may contain an entry

  of the form: "ethernet-phy-idAAAA.BBBB" where

  If the PHY reports an incorrect ID (or none at all) then the

  "compatible" list may contain an entry with the correct PHY ID in the

  form: "ethernet-phy-idAAAA.BBBB" where

     AAAA - The value of the 16 bit Phy Identifier 1 register as

            4 hex digits. This is the chip vendor OUI bits 3:18

     BBBB - The value of the 16 bit Phy Identifier 2 register as

Documentation/power/states.txt

+1 −3
Original line number Diff line number Diff line
@@ -35,9 +35,7 @@ only one way to cause the system to go into the Suspend-To-RAM state (write 
The default suspend mode (ie. the one to be used without writing anything into

/sys/power/mem_sleep) is either "deep" (if Suspend-To-RAM is supported) or

"s2idle", but it can be overridden by the value of the "mem_sleep_default"

parameter in the kernel command line.  On some ACPI-based systems, depending on

the information in the FADT, the default may be "s2idle" even if Suspend-To-RAM

is supported.

parameter in the kernel command line.



The properties of all of the sleep states are described below.

MAINTAINERS

+3 −4
Original line number Diff line number Diff line
@@ -3567,7 +3567,7 @@ F: drivers/infiniband/hw/cxgb3/ 
F:	include/uapi/rdma/cxgb3-abi.h



CXGB4 ETHERNET DRIVER (CXGB4)

M:	Hariprasad S <hariprasad@chelsio.com>

M:	Ganesh Goudar <ganeshgr@chelsio.com>

L:	netdev@vger.kernel.org

W:	http://www.chelsio.com

S:	Supported
@@ -4153,7 +4153,7 @@ F: Documentation/gpu/i915.rst 
INTEL GVT-g DRIVERS (Intel GPU Virtualization)

M:      Zhenyu Wang <zhenyuw@linux.intel.com>

M:      Zhi Wang <zhi.a.wang@intel.com>

L:      igvt-g-dev@lists.01.org

L:      intel-gvt-dev@lists.freedesktop.org

L:      intel-gfx@lists.freedesktop.org

W:      https://01.org/igvt-g

T:      git https://github.com/01org/gvt-linux.git
@@ -10195,7 +10195,6 @@ F: drivers/media/tuners/qt1010* 
QUALCOMM ATHEROS ATH9K WIRELESS DRIVER

M:	QCA ath9k Development <ath9k-devel@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org

L:	ath9k-devel@lists.ath9k.org

W:	http://wireless.kernel.org/en/users/Drivers/ath9k

S:	Supported

F:	drivers/net/wireless/ath/ath9k/
@@ -13066,7 +13065,7 @@ F: drivers/input/serio/userio.c 
F:	include/uapi/linux/userio.h



VIRTIO CONSOLE DRIVER

M:	Amit Shah <amit.shah@redhat.com>

M:	Amit Shah <amit@kernel.org>

L:	virtualization@lists.linux-foundation.org

S:	Maintained

F:	drivers/char/virtio_console.c