Commit 80901bff authored Mar 03, 2022 by Jakub Kicinski

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

net/batman-adv/hard-interface.c
  commit 690bb6fb ("batman-adv: Request iflink once in batadv-on-batadv check")
  commit 6ee3c393 ("batman-adv: Demote batadv-on-batadv skip error message")
https://lore.kernel.org/all/20220302163049.101957-1-sw@simonwunderlich.de/

net/smc/af_smc.c
  commit 4d08b7b5 ("net/smc: Fix cleanup when register ULP fails")
  commit 462791bb ("net/smc: add sysctl interface for SMC")
https://lore.kernel.org/all/20220302112209.355def40@canb.auug.org.au/



Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents 25bf4df4 b949c21f

.mailmap

+3 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,9 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
		Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
		Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
		Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
		Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>
		Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
		Rudolf Marek <R.Marek@sh.cvut.cz>
		Rui Saraiva <rmps@joel.ist.utl.pt>

CREDITS

+6 −0

Original line number	Diff line number	Diff line
		@@ -895,6 +895,12 @@ S: 3000 FORE Drive
		S: Warrendale, Pennsylvania 15086
		S: USA

		N: Ludovic Desroches
		E: ludovic.desroches@microchip.com
		D: Maintainer for ARM/Microchip (AT91) SoC support
		D: Author of ADC, pinctrl, XDMA and SDHCI drivers for this platform
		S: France

		N: Martin Devera
		E: devik@cdi.cz
		W: http://luxik.cdi.cz/~devik/qos/

Documentation/core-api/dma-attributes.rst

+8 −0

Original line number	Diff line number	Diff line
		@@ -130,3 +130,11 @@ accesses to DMA buffers in both privileged "supervisor" and unprivileged
		subsystem that the buffer is fully accessible at the elevated privilege
		level (and ideally inaccessible or at least read-only at the
		lesser-privileged levels).

		DMA_ATTR_OVERWRITE
		------------------

		This is a hint to the DMA-mapping subsystem that the device is expected to
		overwrite the entire mapped size, thus the caller does not require any of the
		previous buffer contents to be preserved. This allows bounce-buffering
		implementations to optimise DMA_FROM_DEVICE transfers.

Documentation/cpu-freq/cpu-drivers.rst

+3 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,9 @@ And optionally
		.resume - A pointer to a per-policy resume function which is called
		with interrupts disabled and _before_ the governor is started again.

		.ready - A pointer to a per-policy ready function which is called after
		the policy is fully initialized.

		.attr - A pointer to a NULL-terminated list of "struct freq_attr" which
		allow to export values to sysfs.

Documentation/devicetree/bindings/arm/atmel-at91.yaml

+2 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,8 @@ title: Atmel AT91 device tree bindings.

		maintainers:
		- Alexandre Belloni <alexandre.belloni@bootlin.com>
		- Ludovic Desroches <ludovic.desroches@microchip.com>
		- Claudiu Beznea <claudiu.beznea@microchip.com>
		- Nicolas Ferre <nicolas.ferre@microchip.com>

		description: \|
		Boards with a SoC of the Atmel AT91 or SMART family shall have the following