Commit b4b12b0d authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



The phylink conflict was between a bug fix by Russell King
to make sure we have a consistent PHY interface mode, and
a change in net-next to pull some code in phylink_resolve()
into the helper functions phylink_mac_link_{up,down}()

On the dp83867 side it's mostly overlapping changes, with
the 'net' side removing a condition that was supposed to
trigger for RGMII but because of how it was coded never
actually could trigger.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c9bb6165 036e3431

Documentation/ABI/testing/sysfs-bus-mdio

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
What:		/sys/bus/mdio_bus/devices/.../phy_id

Date:		November 2012

KernelVersion:	3.8

Contact:	netdev@vger.kernel.org

Description:

		This attribute contains the 32-bit PHY Identifier as reported

		by the device during bus enumeration, encoded in hexadecimal.

		This ID is used to match the device with the appropriate

		driver.



What:		/sys/bus/mdio_bus/devices/.../phy_interface

Date:		February 2014

KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		This attribute contains the PHY interface as configured by the

		Ethernet driver during bus enumeration, encoded in string.

		This interface mode is used to configure the Ethernet MAC with the

		appropriate mode for its data lines to the PHY hardware.



What:		/sys/bus/mdio_bus/devices/.../phy_has_fixups

Date:		February 2014

KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		This attribute contains the boolean value whether a given PHY

		device has had any "fixup" workaround running on it, encoded as

		a boolean. This information is provided to help troubleshooting

		PHY configurations.

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

+13 −6
Original line number Diff line number Diff line
@@ -11,24 +11,31 @@ Date: February 2014 
KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		Boolean value indicating whether the PHY device has

		any fixups registered against it (phy_register_fixup)

		This attribute contains the boolean value whether a given PHY

		device has had any "fixup" workaround running on it, encoded as

		a boolean. This information is provided to help troubleshooting

		PHY configurations.



What:		/sys/class/mdio_bus/<bus>/<device>/phy_id

Date:		November 2012

KernelVersion:	3.8

Contact:	netdev@vger.kernel.org

Description:

		32-bit hexadecimal value corresponding to the PHY device's OUI,

		model and revision number.

		This attribute contains the 32-bit PHY Identifier as reported

		by the device during bus enumeration, encoded in hexadecimal.

		This ID is used to match the device with the appropriate

		driver.



What:		/sys/class/mdio_bus/<bus>/<device>/phy_interface

Date:		February 2014

KernelVersion:	3.15

Contact:	netdev@vger.kernel.org

Description:

		String value indicating the PHY interface, possible

		values are:.

		This attribute contains the PHY interface as configured by the

		Ethernet driver during bus enumeration, encoded in string.

		This interface mode is used to configure the Ethernet MAC with the

		appropriate mode for its data lines to the PHY hardware.

		Possible values are:

		<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,

		rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii

		xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,

Documentation/admin-guide/mm/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ the Linux memory management. 
   ksm

   memory-hotplug

   numa_memory_policy

   numaperf

   pagemap

   soft-dirty

   transhuge

Documentation/admin-guide/mm/numaperf.rst

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ characteristics. Some memory may share the same node as a CPU, and others 
are provided as memory only nodes. While memory only nodes do not provide

CPUs, they may still be local to one or more compute nodes relative to

other nodes. The following diagram shows one such example of two compute

nodes with local memory and a memory only node for each of compute node:

nodes with local memory and a memory only node for each of compute node::



 +------------------+     +------------------+

 | Compute Node 0   +-----+ Compute Node 1   |

Documentation/arm64/silicon-errata.txt

+5 −4
Original line number Diff line number Diff line
@@ -58,13 +58,14 @@ stable kernels. 
| ARM            | Cortex-A72      | #853709         | N/A                         |

| ARM            | Cortex-A73      | #858921         | ARM64_ERRATUM_858921        |

| ARM            | Cortex-A55      | #1024718        | ARM64_ERRATUM_1024718       |

| ARM            | Cortex-A76      | #1188873        | ARM64_ERRATUM_1188873       |

| ARM            | Cortex-A76      | #1188873,1418040| ARM64_ERRATUM_1418040       |

| ARM            | Cortex-A76      | #1165522        | ARM64_ERRATUM_1165522       |

| ARM            | Cortex-A76      | #1286807        | ARM64_ERRATUM_1286807       |

| ARM            | Neoverse-N1     | #1188873        | ARM64_ERRATUM_1188873       |

| ARM            | MMU-500         | #841119,#826419 | N/A                         |

| ARM            | Cortex-A76      | #1463225        | ARM64_ERRATUM_1463225       |

| ARM            | Neoverse-N1     | #1188873,1418040| ARM64_ERRATUM_1418040       |

| ARM            | MMU-500         | #841119,826419  | N/A                         |

|                |                 |                 |                             |

| Cavium         | ThunderX ITS    | #22375, #24313  | CAVIUM_ERRATUM_22375        |

| Cavium         | ThunderX ITS    | #22375,24313    | CAVIUM_ERRATUM_22375        |

| Cavium         | ThunderX ITS    | #23144          | CAVIUM_ERRATUM_23144        |

| Cavium         | ThunderX GICv3  | #23154          | CAVIUM_ERRATUM_23154        |

| Cavium         | ThunderX Core   | #27456          | CAVIUM_ERRATUM_27456        |

CRA Git | Maintained and supported by SUSTech CRA and CCSE