Commit 2a171788 authored by David S. Miller's avatar David S. Miller

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: 's avatarDavid S. Miller <davem@davemloft.net>
parents bf534588 d4c2e9fc

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

...@@ -43,6 +43,7 @@ Corey Minyard <minyard@acm.org> ...@@ -43,6 +43,7 @@ Corey Minyard <minyard@acm.org>
Damian Hobson-Garcia <dhobsong@igel.co.jp> Damian Hobson-Garcia <dhobsong@igel.co.jp>
David Brownell <david-b@pacbell.net> David Brownell <david-b@pacbell.net>
David Woodhouse <dwmw2@shinybook.infradead.org> David Woodhouse <dwmw2@shinybook.infradead.org>
Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Domen Puncer <domen@coderock.org> Domen Puncer <domen@coderock.org>
Douglas Gilbert <dougg@torque.net> Douglas Gilbert <dougg@torque.net>
...@@ -114,6 +115,7 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com> ...@@ -114,6 +115,7 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com> Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com> Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting> Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
Mayuresh Janorkar <mayur@ti.com> Mayuresh Janorkar <mayur@ti.com>
Michael Buesch <m@bues.ch> Michael Buesch <m@bues.ch>
Michel Dänzer <michel@tungstengraphics.com> Michel Dänzer <michel@tungstengraphics.com>
...@@ -127,6 +129,7 @@ Mythri P K <mythripk@ti.com> ...@@ -127,6 +129,7 @@ Mythri P K <mythripk@ti.com>
Nguyen Anh Quynh <aquynh@gmail.com> Nguyen Anh Quynh <aquynh@gmail.com>
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Patrick Mochel <mochel@digitalimplant.org> Patrick Mochel <mochel@digitalimplant.org>
Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
Peter A Jonsson <pj@ludd.ltu.se> Peter A Jonsson <pj@ludd.ltu.se>
Peter Oruba <peter@oruba.de> Peter Oruba <peter@oruba.de>
Peter Oruba <peter.oruba@amd.com> Peter Oruba <peter.oruba@amd.com>
......
What: /sys/class/remoteproc/.../firmware What: /sys/class/remoteproc/.../firmware
Date: October 2016 Date: October 2016
Contact: Matt Redfearn <matt.redfearn@imgtec.com> Contact: Matt Redfearn <matt.redfearn@mips.com>
Description: Remote processor firmware Description: Remote processor firmware
Reports the name of the firmware currently loaded to the Reports the name of the firmware currently loaded to the
...@@ -11,7 +11,7 @@ Description: Remote processor firmware ...@@ -11,7 +11,7 @@ Description: Remote processor firmware
What: /sys/class/remoteproc/.../state What: /sys/class/remoteproc/.../state
Date: October 2016 Date: October 2016
Contact: Matt Redfearn <matt.redfearn@imgtec.com> Contact: Matt Redfearn <matt.redfearn@mips.com>
Description: Remote processor state Description: Remote processor state
Reports the state of the remote processor, which will be one of: Reports the state of the remote processor, which will be one of:
......
# SPDX-License-Identifier: GPL-2.0
# #
# Kbuild for top-level directory of the kernel # Kbuild for top-level directory of the kernel
# This file takes care of the following: # This file takes care of the following:
......
# SPDX-License-Identifier: GPL-2.0
# #
# For a description of the syntax of this configuration file, # For a description of the syntax of this configuration file,
# see Documentation/kbuild/kconfig-language.txt. # see Documentation/kbuild/kconfig-language.txt.
......
...@@ -6740,7 +6740,7 @@ S: Maintained ...@@ -6740,7 +6740,7 @@ S: Maintained
F: drivers/usb/atm/ueagle-atm.c F: drivers/usb/atm/ueagle-atm.c
IMGTEC ASCII LCD DRIVER IMGTEC ASCII LCD DRIVER
M: Paul Burton <paul.burton@imgtec.com> M: Paul Burton <paul.burton@mips.com>
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt F: Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
F: drivers/auxdisplay/img-ascii-lcd.c F: drivers/auxdisplay/img-ascii-lcd.c
...@@ -9001,7 +9001,7 @@ F: Documentation/mips/ ...@@ -9001,7 +9001,7 @@ F: Documentation/mips/
F: arch/mips/ F: arch/mips/
MIPS BOSTON DEVELOPMENT BOARD MIPS BOSTON DEVELOPMENT BOARD
M: Paul Burton <paul.burton@imgtec.com> M: Paul Burton <paul.burton@mips.com>
L: linux-mips@linux-mips.org L: linux-mips@linux-mips.org
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/clock/img,boston-clock.txt F: Documentation/devicetree/bindings/clock/img,boston-clock.txt
...@@ -9011,7 +9011,7 @@ F: drivers/clk/imgtec/clk-boston.c ...@@ -9011,7 +9011,7 @@ F: drivers/clk/imgtec/clk-boston.c
F: include/dt-bindings/clock/boston-clock.h F: include/dt-bindings/clock/boston-clock.h
MIPS GENERIC PLATFORM MIPS GENERIC PLATFORM
M: Paul Burton <paul.burton@imgtec.com> M: Paul Burton <paul.burton@mips.com>
L: linux-mips@linux-mips.org L: linux-mips@linux-mips.org
S: Supported S: Supported
F: arch/mips/generic/ F: arch/mips/generic/
......
# SPDX-License-Identifier: GPL-2.0
VERSION = 4 VERSION = 4
PATCHLEVEL = 14 PATCHLEVEL = 14
SUBLEVEL = 0 SUBLEVEL = 0
......
# SPDX-License-Identifier: GPL-2.0
# #
# General architecture dependent options # General architecture dependent options
# #
......
# SPDX-License-Identifier: GPL-2.0
config ALPHA config ALPHA
bool bool
default y default y
......
# SPDX-License-Identifier: GPL-2.0
menu "Kernel hacking" menu "Kernel hacking"
source "lib/Kconfig.debug" source "lib/Kconfig.debug"
......
/* SPDX-License-Identifier: GPL-2.0 */
OUTPUT_FORMAT("elf64-alpha") OUTPUT_FORMAT("elf64-alpha")
ENTRY(__start) ENTRY(__start)
printk = srm_printk; printk = srm_printk;
......
// SPDX-License-Identifier: GPL-2.0
/* /*
* arch/alpha/boot/bootp.c * arch/alpha/boot/bootp.c
* *
......
// SPDX-License-Identifier: GPL-2.0
/* /*
* arch/alpha/boot/bootpz.c * arch/alpha/boot/bootpz.c
* *
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* arch/alpha/boot/head.S * arch/alpha/boot/head.S
* *
......
// SPDX-License-Identifier: GPL-2.0
/* /*
* arch/alpha/boot/main.c * arch/alpha/boot/main.c
* *
......
// SPDX-License-Identifier: GPL-2.0
/* /*
* misc.c * misc.c
* *
......
// SPDX-License-Identifier: GPL-2.0
/* This utility makes a bootblock suitable for the SRM console/miniloader */ /* This utility makes a bootblock suitable for the SRM console/miniloader */
/* Usage: /* Usage:
......
// SPDX-License-Identifier: GPL-2.0
/* /*
* arch/alpha/boot/tools/objstrip.c * arch/alpha/boot/tools/objstrip.c
* *
......
# SPDX-License-Identifier: GPL-2.0
generic-y += clkdev.h generic-y += clkdev.h
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __ALPHA_A_OUT_H__ #ifndef __ALPHA_A_OUT_H__
#define __ALPHA_A_OUT_H__ #define __ALPHA_A_OUT_H__
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef AGP_H #ifndef AGP_H
#define AGP_H 1 #define AGP_H 1
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ALPHA_AGP_BACKEND_H #ifndef _ALPHA_AGP_BACKEND_H
#define _ALPHA_AGP_BACKEND_H 1 #define _ALPHA_AGP_BACKEND_H 1
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ALPHA_ATOMIC_H #ifndef _ALPHA_ATOMIC_H
#define _ALPHA_ATOMIC_H #define _ALPHA_ATOMIC_H
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __BARRIER_H #ifndef __BARRIER_H
#define __BARRIER_H #define __BARRIER_H
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ALPHA_BITOPS_H #ifndef _ALPHA_BITOPS_H
#define _ALPHA_BITOPS_H #define _ALPHA_BITOPS_H
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ALPHA_BUG_H #ifndef _ALPHA_BUG_H
#define _ALPHA_BUG_H #define _ALPHA_BUG_H
......
/* SPDX-License-Identifier: GPL-2.0 */
/* /*
* include/asm-alpha/cache.h * include/asm-alpha/cache.h
*/ */
......
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ALPHA_CACHEFLUSH_H #ifndef _ALPHA_CACHEFLUSH_H
#define _ALPHA_CACHEFLUSH_H #define _ALPHA_CACHEFLUSH_H