forked from openbmc/linux
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
net/batman-adv/hard-interface.c commit 690bb6f ("batman-adv: Request iflink once in batadv-on-batadv check") commit 6ee3c39 ("batman-adv: Demote batadv-on-batadv skip error message") https://lore.kernel.org/all/[email protected]/ net/smc/af_smc.c commit 4d08b7b ("net/smc: Fix cleanup when register ULP fails") commit 462791b ("net/smc: add sysctl interface for SMC") https://lore.kernel.org/all/[email protected]/ Signed-off-by: Jakub Kicinski <[email protected]>
- Loading branch information
Showing
289 changed files
with
2,549 additions
and
1,126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -333,6 +333,9 @@ Rémi Denis-Courmont <[email protected]> | |
Ricardo Ribalda <[email protected]> <[email protected]> | ||
Ricardo Ribalda <[email protected]> Ricardo Ribalda Delgado <[email protected]> | ||
Ricardo Ribalda <[email protected]> <[email protected]> | ||
Roman Gushchin <[email protected]> <[email protected]> | ||
Roman Gushchin <[email protected]> <[email protected]> | ||
Roman Gushchin <[email protected]> <[email protected]> | ||
Ross Zwisler <[email protected]> <[email protected]> | ||
Rudolf Marek <[email protected]> | ||
Rui Saraiva <[email protected]> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -895,6 +895,12 @@ S: 3000 FORE Drive | |
S: Warrendale, Pennsylvania 15086 | ||
S: USA | ||
|
||
N: Ludovic Desroches | ||
E: [email protected] | ||
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: [email protected] | ||
W: http://luxik.cdi.cz/~devik/qos/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,8 @@ title: Atmel AT91 device tree bindings. | |
|
||
maintainers: | ||
- Alexandre Belloni <[email protected]> | ||
- Ludovic Desroches <[email protected]> | ||
- Claudiu Beznea <[email protected]> | ||
- Nicolas Ferre <[email protected]> | ||
|
||
description: | | ||
Boards with a SoC of the Atmel AT91 or SMART family shall have the following | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2254,7 +2254,7 @@ F: drivers/phy/mediatek/ | |
ARM/Microchip (AT91) SoC support | ||
M: Nicolas Ferre <[email protected]> | ||
M: Alexandre Belloni <[email protected]> | ||
M: Ludovic Desroches <ludovic.desroches@microchip.com> | ||
M: Claudiu Beznea <claudiu.beznea@microchip.com> | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Supported | ||
W: http://www.linux4sam.org | ||
|
@@ -4915,7 +4915,8 @@ F: kernel/cgroup/cpuset.c | |
CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG) | ||
M: Johannes Weiner <[email protected]> | ||
M: Michal Hocko <[email protected]> | ||
M: Vladimir Davydov <[email protected]> | ||
M: Roman Gushchin <[email protected]> | ||
M: Shakeel Butt <[email protected]> | ||
L: [email protected] | ||
L: [email protected] | ||
S: Maintained | ||
|
@@ -7745,8 +7746,7 @@ M: Qiang Zhao <[email protected]> | |
L: [email protected] | ||
S: Maintained | ||
F: drivers/soc/fsl/qe/ | ||
F: include/soc/fsl/*qe*.h | ||
F: include/soc/fsl/*ucc*.h | ||
F: include/soc/fsl/qe/ | ||
|
||
FREESCALE QUICC ENGINE UCC ETHERNET DRIVER | ||
M: Li Yang <[email protected]> | ||
|
@@ -7777,6 +7777,7 @@ F: Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml | |
F: Documentation/devicetree/bindings/soc/fsl/ | ||
F: drivers/soc/fsl/ | ||
F: include/linux/fsl/ | ||
F: include/soc/fsl/ | ||
|
||
FREESCALE SOC FS_ENET DRIVER | ||
M: Pantelis Antoniou <[email protected]> | ||
|
@@ -13706,15 +13707,15 @@ F: scripts/nsdeps | |
NTB AMD DRIVER | ||
M: Sanjay R Mehta <[email protected]> | ||
M: Shyam Sundar S K <[email protected]> | ||
L: linux-ntb@googlegroups.com | ||
L: ntb@lists.linux.dev | ||
S: Supported | ||
F: drivers/ntb/hw/amd/ | ||
|
||
NTB DRIVER CORE | ||
M: Jon Mason <[email protected]> | ||
M: Dave Jiang <[email protected]> | ||
M: Allen Hubbe <[email protected]> | ||
L: linux-ntb@googlegroups.com | ||
L: ntb@lists.linux.dev | ||
S: Supported | ||
W: https://github.com/jonmason/ntb/wiki | ||
T: git git://github.com/jonmason/ntb.git | ||
|
@@ -13726,13 +13727,13 @@ F: tools/testing/selftests/ntb/ | |
|
||
NTB IDT DRIVER | ||
M: Serge Semin <[email protected]> | ||
L: linux-ntb@googlegroups.com | ||
L: ntb@lists.linux.dev | ||
S: Supported | ||
F: drivers/ntb/hw/idt/ | ||
|
||
NTB INTEL DRIVER | ||
M: Dave Jiang <[email protected]> | ||
L: linux-ntb@googlegroups.com | ||
L: ntb@lists.linux.dev | ||
S: Supported | ||
W: https://github.com/davejiang/linux/wiki | ||
T: git https://github.com/davejiang/linux.git | ||
|
@@ -15575,6 +15576,7 @@ M: Iurii Zaikin <[email protected]> | |
L: [email protected] | ||
L: [email protected] | ||
S: Maintained | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl-next | ||
F: fs/proc/proc_sysctl.c | ||
F: include/linux/sysctl.h | ||
F: kernel/sysctl-test.c | ||
|
@@ -17767,8 +17769,10 @@ M: David Rientjes <[email protected]> | |
M: Joonsoo Kim <[email protected]> | ||
M: Andrew Morton <[email protected]> | ||
M: Vlastimil Babka <[email protected]> | ||
R: Roman Gushchin <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git | ||
F: include/linux/sl?b*.h | ||
F: mm/sl?b* | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.