Commit a99da46a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

drivers/net/usb/r8152.c
  be53771c ("r8152: add vendor/device ID pair for Microsoft Devkit")
  ec51fbd1 ("r8152: add USB device driver for config selection")
https://lore.kernel.org/all/20230113113339.658c4723@canb.auug.org.au/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 55b98837 d9fc1511

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ Tony Luck <tony.luck@intel.com> 
TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tudor Ambarus <tudor.ambarus@linaro.org> <tudor.ambarus@microchip.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Documentation/ABI/testing/debugfs-pktcdvd

0 → 100644
+18 −0
Original line number Diff line number Diff line 
What:           /sys/kernel/debug/pktcdvd/pktcdvd[0-7]

Date:           Oct. 2006

KernelVersion:  2.6.20

Contact:        Thomas Maier <balagi@justmail.de>

Description:



The pktcdvd module (packet writing driver) creates

these files in debugfs:



/sys/kernel/debug/pktcdvd/pktcdvd[0-7]/



    ====            ====== ====================================

    info            0444   Lots of driver statistics and infos.

    ====            ====== ====================================



Example::



    cat /sys/kernel/debug/pktcdvd/pktcdvd0/info

Documentation/ABI/testing/sysfs-class-pktcdvd

0 → 100644
+97 −0
Original line number Diff line number Diff line 
sysfs interface

---------------

The pktcdvd module (packet writing driver) creates the following files in the

sysfs: (<devid> is in the format major:minor)



What:		/sys/class/pktcdvd/add

What:		/sys/class/pktcdvd/remove

What:		/sys/class/pktcdvd/device_map

Date:		Oct. 2006

KernelVersion:	2.6.20

Contact:	Thomas Maier <balagi@justmail.de>

Description:



		==========	==============================================

		add		(WO) Write a block device id (major:minor) to

				create a new pktcdvd device and map it to the

				block device.



		remove		(WO) Write the pktcdvd device id (major:minor)

				to remove the pktcdvd device.



		device_map	(RO) Shows the device mapping in format:

				pktcdvd[0-7] <pktdevid> <blkdevid>

		==========	==============================================





What:		/sys/class/pktcdvd/pktcdvd[0-7]/dev

What:		/sys/class/pktcdvd/pktcdvd[0-7]/uevent

Date:		Oct. 2006

KernelVersion:	2.6.20

Contact:	Thomas Maier <balagi@justmail.de>

Description:

		dev:	(RO) Device id



		uevent:	(WO) To send a uevent





What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/packets_started

What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/packets_finished

What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_written

What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_read

What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/kb_read_gather

What:		/sys/class/pktcdvd/pktcdvd[0-7]/stat/reset

Date:		Oct. 2006

KernelVersion:	2.6.20

Contact:	Thomas Maier <balagi@justmail.de>

Description:

		packets_started:	(RO) Number of started packets.



		packets_finished:	(RO) Number of finished packets.



		kb_written:		(RO) kBytes written.



		kb_read:		(RO) kBytes read.



		kb_read_gather:		(RO) kBytes read to fill write packets.



		reset:			(WO) Write any value to it to reset

					pktcdvd device statistic values, like

					bytes read/written.





What:		/sys/class/pktcdvd/pktcdvd[0-7]/write_queue/size

What:		/sys/class/pktcdvd/pktcdvd[0-7]/write_queue/congestion_off

What:		/sys/class/pktcdvd/pktcdvd[0-7]/write_queue/congestion_on

Date:		Oct. 2006

KernelVersion:	2.6.20

Contact:	Thomas Maier <balagi@justmail.de>

Description:

		==============	================================================

		size		(RO) Contains the size of the bio write queue.



		congestion_off	(RW) If bio write queue size is below this mark,

				accept new bio requests from the block layer.



		congestion_on	(RW) If bio write queue size is higher as this

				mark, do no longer accept bio write requests

				from the block layer and wait till the pktcdvd

				device has processed enough bio's so that bio

				write queue size is below congestion off mark.

				A value of <= 0 disables congestion control.

		==============	================================================





Example:

--------

To use the pktcdvd sysfs interface directly, you can do::



    # create a new pktcdvd device mapped to /dev/hdc

    echo "22:0" >/sys/class/pktcdvd/add

    cat /sys/class/pktcdvd/device_map

    # assuming device pktcdvd0 was created, look at stat's

    cat /sys/class/pktcdvd/pktcdvd0/stat/kb_written

    # print the device id of the mapped block device

    fgrep pktcdvd0 /sys/class/pktcdvd/device_map

    # remove device, using pktcdvd0 device id   253:0

    echo "253:0" >/sys/class/pktcdvd/remove

Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-aes.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Atmel Advanced Encryption Standard (AES) HW cryptographic accelerator



maintainers:

  - Tudor Ambarus <tudor.ambarus@microchip.com>

  - Tudor Ambarus <tudor.ambarus@linaro.org>



properties:

  compatible:

Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-sha.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Atmel Secure Hash Algorithm (SHA) HW cryptographic accelerator



maintainers:

  - Tudor Ambarus <tudor.ambarus@microchip.com>

  - Tudor Ambarus <tudor.ambarus@linaro.org>



properties:

  compatible: