Commit 502cc061 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/phy/phy_device.c
  2560db6e ("net: phy: Fix missing of_node_put() for leds")
  1dce520a ("net: phy: Use for_each_available_child_of_node_scoped()")
https://lore.kernel.org/20240904115823.74333648@canb.auug.org.au



Adjacent changes:

drivers/net/ethernet/xilinx/xilinx_axienet.h
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
  858430db ("net: xilinx: axienet: Fix race in axienet_stop")
  76abb5d6 ("net: xilinx: axienet: Add statistics support")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e10034e3 d759ee24

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ Amit Nischal <quic_anischal@quicinc.com> <anischal@codeaurora.org> 
Andi Kleen <ak@linux.intel.com> <ak@suse.de>

Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>

Andreas Herrmann <aherrman@de.ibm.com>

Andreas Hindborg <a.hindborg@kernel.org> <a.hindborg@samsung.com>

Andrej Shadura <andrew.shadura@collabora.co.uk>

Andrej Shadura <andrew@shadura.me> <andrew@beldisplaytech.com>

Andrew Morton <akpm@linux-foundation.org>
@@ -269,6 +270,7 @@ James Ketrenos <jketreno@io.(none)> 
Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>

Jan Kuliga <jtkuliga.kdev@gmail.com> <jankul@alatek.krakow.pl>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
@@ -354,6 +356,8 @@ Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org> 
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>

Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Documentation/ABI/testing/sysfs-timecard

+18 −13
Original line number Diff line number Diff line
@@ -258,24 +258,29 @@ Description: (RW) When retrieving the PHC with the PTP SYS_OFFSET_EXTENDED 
		the estimated point where the FPGA latches the PHC time.  This

		value may be changed by writing an unsigned integer.



What:		/sys/class/timecard/ocpN/ttyGNSS

What:		/sys/class/timecard/ocpN/ttyGNSS2

Date:		September 2021

What:		/sys/class/timecard/ocpN/tty

Date:		August 2024

Contact:	Vadim Fedorenko <vadim.fedorenko@linux.dev>

Description:	(RO) Directory containing the sysfs nodes for TTY attributes



What:		/sys/class/timecard/ocpN/tty/ttyGNSS

What:		/sys/class/timecard/ocpN/tty/ttyGNSS2

Date:		August 2024

Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>

Description:	These optional attributes link to the TTY serial ports

		associated with the GNSS devices.

Description:	(RO) These optional attributes contain names of the TTY serial

		ports associated with the GNSS devices.



What:		/sys/class/timecard/ocpN/ttyMAC

Date:		September 2021

What:		/sys/class/timecard/ocpN/tty/ttyMAC

Date:		August 2024

Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>

Description:	This optional attribute links to the TTY serial port

		associated with the Miniature Atomic Clock.

Description:	(RO) This optional attribute contains name of the TTY serial

		port associated with the Miniature Atomic Clock.



What:		/sys/class/timecard/ocpN/ttyNMEA

Date:		September 2021

What:		/sys/class/timecard/ocpN/tty/ttyNMEA

Date:		August 2024

Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>

Description:	This optional attribute links to the TTY serial port

		which outputs the PHC time in NMEA ZDA format.

Description:	(RO) This optional attribute contains name of the TTY serial

		port which outputs the PHC time in NMEA ZDA format.



What:		/sys/class/timecard/ocpN/utc_tai_offset

Date:		September 2021

Documentation/admin-guide/cgroup-v2.rst

+4 −3
Original line number Diff line number Diff line
@@ -1717,9 +1717,10 @@ The following nested keys are defined. 
	entries fault back in or are written out to disk.



  memory.zswap.writeback

	A read-write single value file. The default value is "1". The

	initial value of the root cgroup is 1, and when a new cgroup is

	created, it inherits the current value of its parent.

	A read-write single value file. The default value is "1".

	Note that this setting is hierarchical, i.e. the writeback would be

	implicitly disabled for child cgroups if the upper hierarchy

	does so.



	When this is set to 0, all swapping attempts to swapping devices

	are disabled. This included both zswap writebacks, and swapping due

Documentation/devicetree/bindings/usb/microchip,usb2514.yaml

+8 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ maintainers: 
  - Fabio Estevam <festevam@gmail.com>



allOf:

  - $ref: usb-hcd.yaml#

  - $ref: usb-device.yaml#



properties:

  compatible:
@@ -36,6 +36,13 @@ required: 
  - compatible

  - reg



patternProperties:

  "^.*@[0-9a-f]{1,2}$":

    description: The hard wired USB devices

    type: object

    $ref: /schemas/usb/usb-device.yaml

    additionalProperties: true



unevaluatedProperties: false



examples:

Documentation/process/maintainer-netdev.rst

+16 −0
Original line number Diff line number Diff line
@@ -375,6 +375,22 @@ When working in existing code which uses nonstandard formatting make 
your code follow the most recent guidelines, so that eventually all code

in the domain of netdev is in the preferred format.



Using device-managed and cleanup.h constructs

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



Netdev remains skeptical about promises of all "auto-cleanup" APIs,

including even ``devm_`` helpers, historically. They are not the preferred

style of implementation, merely an acceptable one.



Use of ``guard()`` is discouraged within any function longer than 20 lines,

``scoped_guard()`` is considered more readable. Using normal lock/unlock is

still (weakly) preferred.



Low level cleanup constructs (such as ``__free()``) can be used when building

APIs and helpers, especially scoped iterators. However, direct use of

``__free()`` within networking core and drivers is discouraged.

Similar guidance applies to declaring variables mid-function.



Resending after review

~~~~~~~~~~~~~~~~~~~~~~