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/tools/lib/bitmap.c
+++ b/tools/lib/bitmap.c
@@ -1,9 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
 * From lib/bitmap.c
 * Helper functions for bitmap.h.
- *
- * This source code is licensed under the GNU General Public License,
- * Version 2.  See the file COPYING for more details.
 */
 #include <linux/bitmap.h>