Skip to content

Commit 2a17178

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Files removed in 'net-next' had their license header updated in 'net'. We take the remove from 'net-next'. Signed-off-by: David S. Miller <[email protected]>
2 parents bf53458 + d4c2e9f commit 2a17178

File tree

12,703 files changed

+13121
-311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

12,703 files changed

+13121
-311
lines changed

‎.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Corey Minyard <[email protected]>
4343
Damian Hobson-Garcia <[email protected]>
4444
David Brownell <[email protected]>
4545
David Woodhouse <[email protected]>
46+
Deng-Cheng Zhu <[email protected]> <[email protected]>
4647
Dmitry Eremin-Solenikov <[email protected]>
4748
Domen Puncer <[email protected]>
4849
Douglas Gilbert <[email protected]>
@@ -114,6 +115,7 @@ Mauro Carvalho Chehab <[email protected]> <[email protected]>
114115
Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
115116
Matt Ranostay <[email protected]> <[email protected]>
116117
Matt Ranostay <[email protected]> <[email protected]>
118+
Matt Redfearn <[email protected]> <[email protected]>
117119
Mayuresh Janorkar <[email protected]>
118120
Michael Buesch <[email protected]>
119121
Michel Dänzer <[email protected]>
@@ -127,6 +129,7 @@ Mythri P K <[email protected]>
127129
Nguyen Anh Quynh <[email protected]>
128130
Paolo 'Blaisorblade' Giarrusso <[email protected]>
129131
Patrick Mochel <[email protected]>
132+
Paul Burton <[email protected]> <[email protected]>
130133
Peter A Jonsson <[email protected]>
131134
Peter Oruba <[email protected]>
132135
Peter Oruba <[email protected]>

‎Documentation/ABI/testing/sysfs-class-remoteproc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/class/remoteproc/.../firmware
22
Date: October 2016
3-
Contact: Matt Redfearn <matt.redfearn@imgtec.com>
3+
Contact: Matt Redfearn <matt.redfearn@mips.com>
44
Description: Remote processor firmware
55

66
Reports the name of the firmware currently loaded to the
@@ -11,7 +11,7 @@ Description: Remote processor firmware
1111

1212
What: /sys/class/remoteproc/.../state
1313
Date: October 2016
14-
Contact: Matt Redfearn <matt.redfearn@imgtec.com>
14+
Contact: Matt Redfearn <matt.redfearn@mips.com>
1515
Description: Remote processor state
1616

1717
Reports the state of the remote processor, which will be one of:

‎Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
#
23
# Kbuild for top-level directory of the kernel
34
# This file takes care of the following:

‎Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
#
23
# For a description of the syntax of this configuration file,
34
# see Documentation/kbuild/kconfig-language.txt.

‎MAINTAINERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6740,7 +6740,7 @@ S: Maintained
67406740
F: drivers/usb/atm/ueagle-atm.c
67416741

67426742
IMGTEC ASCII LCD DRIVER
6743-
M: Paul Burton <paul.burton@imgtec.com>
6743+
M: Paul Burton <paul.burton@mips.com>
67446744
S: Maintained
67456745
F: Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
67466746
F: drivers/auxdisplay/img-ascii-lcd.c
@@ -9001,7 +9001,7 @@ F: Documentation/mips/
90019001
F: arch/mips/
90029002

90039003
MIPS BOSTON DEVELOPMENT BOARD
9004-
M: Paul Burton <paul.burton@imgtec.com>
9004+
M: Paul Burton <paul.burton@mips.com>
90059005
L: [email protected]
90069006
S: Maintained
90079007
F: Documentation/devicetree/bindings/clock/img,boston-clock.txt
@@ -9011,7 +9011,7 @@ F: drivers/clk/imgtec/clk-boston.c
90119011
F: include/dt-bindings/clock/boston-clock.h
90129012

90139013
MIPS GENERIC PLATFORM
9014-
M: Paul Burton <paul.burton@imgtec.com>
9014+
M: Paul Burton <paul.burton@mips.com>
90159015
L: [email protected]
90169016
S: Supported
90179017
F: arch/mips/generic/

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
VERSION = 4
23
PATCHLEVEL = 14
34
SUBLEVEL = 0

‎arch/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
#
23
# General architecture dependent options
34
#

‎arch/alpha/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
config ALPHA
23
bool
34
default y

‎arch/alpha/Kconfig.debug

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
menu "Kernel hacking"
23

34
source "lib/Kconfig.debug"

‎arch/alpha/boot/bootloader.lds

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
OUTPUT_FORMAT("elf64-alpha")
23
ENTRY(__start)
34
printk = srm_printk;

0 commit comments

Comments
 (0)