Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor SPDX change conflict. Signed-off-by: David S. Miller <davem@davemloft.net>
2019-06-22 08:59:24 -04:00
parent e0effb5fbd c356dc4b54
commit 92ad6325cb
5301 changed files with 7194 additions and 26609 deletions
--- a/kernel/bpf/lpm_trie.c
+++ b/kernel/bpf/lpm_trie.c
@@ -1,12 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
 * Longest prefix match list implementation
 *
 * Copyright (c) 2016,2017 Daniel Mack
 * Copyright (c) 2016 David Herrmann
- *
- * This file is subject to the terms and conditions of version 2 of the GNU
- * General Public License.  See the file COPYING in the main directory of the
- * Linux distribution for more details.
 */

 #include <linux/bpf.h>