forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
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/davem/net
Couple conflicts resolved here: 1) In the MACB driver, a bug fix to properly initialize the RX tail pointer properly overlapped with some changes to support variable sized rings. 2) In XGBE we had a "CONFIG_PM" --> "CONFIG_PM_SLEEP" fix overlapping with a reorganization of the driver to support ACPI, OF, as well as PCI variants of the chip. 3) In 'net' we had several probe error path bug fixes to the stmmac driver, meanwhile a lot of this code was cleaned up and reorganized in 'net-next'. 4) The cls_flower classifier obtained a helper function in 'net-next' called __fl_delete() and this overlapped with Daniel Borkamann's bug fix to use RCU for object destruction in 'net'. It also overlapped with Jiri's change to guard the rhashtable_remove_fast() call with a check against tc_skip_sw(). 5) In mlx4, a revert bug fix in 'net' overlapped with some unrelated changes in 'net-next'. 6) In geneve, a stale header pointer after pskb_expand_head() bug fix in 'net' overlapped with a large reorganization of the same code in 'net-next'. Since the 'net-next' code no longer had the bug in question, there was nothing to do other than to simply take the 'net-next' hunks. Signed-off-by: David S. Miller <[email protected]>
- Loading branch information
Showing
191 changed files
with
1,411 additions
and
609 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 |
---|---|---|
|
@@ -9,7 +9,7 @@ | |
Linus | ||
---------- | ||
|
||
M: Matt Mackal | ||
N: Matt Mackal | ||
E: [email protected] | ||
D: SLOB slab allocator | ||
|
||
|
@@ -1910,7 +1910,7 @@ S: Ra'annana, Israel | |
|
||
N: Andi Kleen | ||
E: [email protected] | ||
U: http://www.halobates.de | ||
W: http://www.halobates.de | ||
D: network, x86, NUMA, various hacks | ||
S: Schwalbenstr. 96 | ||
S: 85551 Ottobrunn | ||
|
@@ -2089,8 +2089,8 @@ D: ST Microelectronics SPEAr13xx PCI host bridge driver | |
D: Synopsys Designware PCI host bridge driver | ||
|
||
N: Gabor Kuti | ||
M: [email protected] | ||
M: [email protected] | ||
E: [email protected] | ||
E: [email protected] | ||
D: Original author of software suspend | ||
|
||
N: Jaroslav Kysela | ||
|
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 |
---|---|---|
|
@@ -9260,11 +9260,12 @@ S: Maintained | |
F: drivers/pci/host/*layerscape* | ||
|
||
PCI DRIVER FOR IMX6 | ||
M: Richard Zhu <Richard.Zhu@freescale.com> | ||
M: Richard Zhu <hongxing.zhu@nxp.com> | ||
M: Lucas Stach <[email protected]> | ||
L: [email protected] | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
F: Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt | ||
F: drivers/pci/host/*imx6* | ||
|
||
PCI DRIVER FOR TI KEYSTONE | ||
|
@@ -9323,17 +9324,11 @@ F: drivers/pci/host/pci-exynos.c | |
|
||
PCI DRIVER FOR SYNOPSIS DESIGNWARE | ||
M: Jingoo Han <[email protected]> | ||
M: Pratyush Anand <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/pci/host/*designware* | ||
|
||
PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE | ||
M: Jose Abreu <[email protected]> | ||
M: Joao Pinto <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: Documentation/devicetree/bindings/pci/designware-pcie.txt | ||
F: drivers/pci/host/pcie-designware-plat.c | ||
F: drivers/pci/host/*designware* | ||
|
||
PCI DRIVER FOR GENERIC OF HOSTS | ||
M: Will Deacon <[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
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
File renamed without changes.
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.