forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
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
Two trivial overlapping changes conflicts in MPLS and mlx5. Signed-off-by: David S. Miller <[email protected]>
- Loading branch information
Showing
485 changed files
with
4,555 additions
and
2,689 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
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 |
---|---|---|
|
@@ -976,6 +976,7 @@ M: Russell King <[email protected]> | |
L: [email protected] (moderated for non-subscribers) | ||
W: http://www.armlinux.org.uk/ | ||
S: Maintained | ||
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git | ||
F: arch/arm/ | ||
|
||
ARM SUB-ARCHITECTURES | ||
|
@@ -1153,6 +1154,7 @@ ARM/CLKDEV SUPPORT | |
M: Russell King <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev | ||
F: arch/arm/include/asm/clkdev.h | ||
F: drivers/clk/clkdev.c | ||
|
||
|
@@ -1688,6 +1690,7 @@ M: Krzysztof Kozlowski <[email protected]> | |
R: Javier Martinez Canillas <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
L: [email protected] (moderated for non-subscribers) | ||
Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/ | ||
S: Maintained | ||
F: arch/arm/boot/dts/s3c* | ||
F: arch/arm/boot/dts/s5p* | ||
|
@@ -3570,7 +3573,7 @@ F: drivers/infiniband/hw/cxgb3/ | |
F: include/uapi/rdma/cxgb3-abi.h | ||
|
||
CXGB4 ETHERNET DRIVER (CXGB4) | ||
M: Hariprasad S <hariprasad@chelsio.com> | ||
M: Ganesh Goudar <ganeshgr@chelsio.com> | ||
L: [email protected] | ||
W: http://www.chelsio.com | ||
S: Supported | ||
|
@@ -4103,12 +4106,18 @@ F: drivers/gpu/drm/bridge/ | |
|
||
DRM DRIVER FOR BOCHS VIRTUAL GPU | ||
M: Gerd Hoffmann <[email protected]> | ||
S: Odd Fixes | ||
L: [email protected] | ||
T: git git://git.kraxel.org/linux drm-qemu | ||
S: Maintained | ||
F: drivers/gpu/drm/bochs/ | ||
|
||
DRM DRIVER FOR QEMU'S CIRRUS DEVICE | ||
M: Dave Airlie <[email protected]> | ||
S: Odd Fixes | ||
M: Gerd Hoffmann <[email protected]> | ||
L: [email protected] | ||
T: git git://git.kraxel.org/linux drm-qemu | ||
S: Obsolete | ||
W: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/ | ||
F: drivers/gpu/drm/cirrus/ | ||
|
||
RADEON and AMDGPU DRM DRIVERS | ||
|
@@ -4150,7 +4159,7 @@ F: Documentation/gpu/i915.rst | |
INTEL GVT-g DRIVERS (Intel GPU Virtualization) | ||
M: Zhenyu Wang <[email protected]> | ||
M: Zhi Wang <[email protected]> | ||
L: igvt-g-dev@lists.01.org | ||
L: intel-gvt-dev@lists.freedesktop.org | ||
L: [email protected] | ||
W: https://01.org/igvt-g | ||
T: git https://github.com/01org/gvt-linux.git | ||
|
@@ -4301,7 +4310,10 @@ F: Documentation/devicetree/bindings/display/renesas,du.txt | |
|
||
DRM DRIVER FOR QXL VIRTUAL GPU | ||
M: Dave Airlie <[email protected]> | ||
S: Odd Fixes | ||
M: Gerd Hoffmann <[email protected]> | ||
L: [email protected] | ||
T: git git://git.kraxel.org/linux drm-qemu | ||
S: Maintained | ||
F: drivers/gpu/drm/qxl/ | ||
F: include/uapi/drm/qxl_drm.h | ||
|
||
|
@@ -7703,8 +7715,10 @@ F: drivers/net/dsa/mv88e6xxx/ | |
F: Documentation/devicetree/bindings/net/dsa/marvell.txt | ||
|
||
MARVELL ARMADA DRM SUPPORT | ||
M: Russell King <rmk+kernel@armlinux.org.uk> | ||
M: Russell King <linux@armlinux.org.uk> | ||
S: Maintained | ||
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-devel | ||
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-fixes | ||
F: drivers/gpu/drm/armada/ | ||
F: include/uapi/drm/armada_drm.h | ||
F: Documentation/devicetree/bindings/display/armada/ | ||
|
@@ -8909,8 +8923,10 @@ S: Supported | |
F: drivers/nfc/nxp-nci | ||
|
||
NXP TDA998X DRM DRIVER | ||
M: Russell King <rmk+kernel@armlinux.org.uk> | ||
M: Russell King <linux@armlinux.org.uk> | ||
S: Supported | ||
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel | ||
T: git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes | ||
F: drivers/gpu/drm/i2c/tda998x_drv.c | ||
F: include/drm/i2c/tda998x.h | ||
|
||
|
@@ -13105,6 +13121,7 @@ M: David Airlie <[email protected]> | |
M: Gerd Hoffmann <[email protected]> | ||
L: [email protected] | ||
L: [email protected] | ||
T: git git://git.kraxel.org/linux drm-qemu | ||
S: Maintained | ||
F: drivers/gpu/drm/virtio/ | ||
F: include/uapi/linux/virtio_gpu.h | ||
|
@@ -13456,6 +13473,7 @@ F: arch/x86/ | |
|
||
X86 PLATFORM DRIVERS | ||
M: Darren Hart <[email protected]> | ||
M: Andy Shevchenko <[email protected]> | ||
L: [email protected] | ||
T: git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git | ||
S: Maintained | ||
|
@@ -13627,6 +13645,7 @@ F: drivers/net/hamradio/z8530.h | |
|
||
ZBUD COMPRESSED PAGE ALLOCATOR | ||
M: Seth Jennings <[email protected]> | ||
M: Dan Streetman <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: mm/zbud.c | ||
|
@@ -13682,6 +13701,7 @@ F: Documentation/vm/zsmalloc.txt | |
|
||
ZSWAP COMPRESSED SWAP CACHING | ||
M: Seth Jennings <[email protected]> | ||
M: Dan Streetman <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: mm/zswap.c | ||
|
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
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.