David S. Miller 4dc6758d78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Simple cases of overlapping changes in the packet scheduler. Must easier to resolve this time. Which probably means that I screwed it up somehow. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-11-10 10:00:18 +09:00
..
basic	fixdep: trivial: typo fix and correction	2017-08-10 01:01:03 +09:00
coccinelle	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
dtc	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
gcc-plugins	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
gdb	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
genksyms	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
kconfig	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
ksymoops	Fix dead URLs to ftp.kernel.org	2017-03-28 16:16:52 +02:00
mod	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
package	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
selinux	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
tracing	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
.gitignore	Docs: clean up some DocBook loose ends	2017-06-23 14:17:38 -06:00
adjust_autoksyms.sh	kbuild: fix scripts/adjust_autoksyms.sh* for the no modules case	2016-12-11 22:30:10 +01:00
asn1_compiler.c	ASN.1: fix open failure check on headername	2016-04-06 14:06:48 +01:00
bloat-o-meter	scripts/bloat-o-meter: compile .NUMBER regex	2016-12-12 18:55:06 -08:00
bootgraph.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
check_00index.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
check_extable.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
checkincludes.pl	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
checkkconfigsymbols.py	checkkconfigsymbols.py: support Kconfig's 'imply' statement	2017-02-03 11:49:06 +01:00
checkpatch.pl	checkpatch: fix ignoring cover-letter logic	2017-10-03 17:54:26 -07:00
checkstack.pl	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
checksyscalls.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
checkversion.pl	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
cleanfile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
cleanpatch	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
coccicheck	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
config	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
conmakehash.c
const_structs.checkpatch	const_structs.checkpatch: add frequently used from Julia Lawall's list	2016-10-11 15:06:30 -07:00
decode_stacktrace.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
decodecode	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
depmod.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
diffconfig	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
export_report.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
extract_xc3028.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
extract-cert.c	KEYS: Remove unnecessary header #inclusions from extract-cert.c	2015-09-25 16:31:45 +01:00
extract-ikconfig
extract-module-sig.pl	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
extract-sys-certs.pl	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
extract-vmlinux
faddr2line	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
gcc-goto.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
gcc-ld	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
gcc-plugin.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
gcc-version.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
gcc-x86_32-has-stack-protector.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
gcc-x86_64-has-stack-protector.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
gen_initramfs_list.sh	Kbuild misc updates for 4.13	2017-07-07 15:09:09 -07:00
get_dvb_firmware	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
get_maintainer.pl	get_maintainer: Prepare for separate MAINTAINERS files	2017-08-08 11:09:31 -07:00
gfp-translate
headerdep.pl	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
headers_check.pl	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
headers_install.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
headers.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
insert-sys-cert.c	KEYS: Reserve an extra certificate symbol for inserting without recompiling	2016-02-26 15:30:20 +00:00
kallsyms.c	scripts/kallsyms.c: ignore symbol type 'n'	2017-10-13 16:18:32 -07:00
Kbuild.include	kbuild: trivial cleanups on the comments	2017-08-10 00:58:20 +09:00
kernel-doc	kernel-doc parser mishandles declarations split into lines	2017-08-30 16:18:16 -06:00
ld-version.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
leaking_addresses.pl	scripts: add leaking_addresses.pl	2017-11-06 11:46:42 -08:00
Lindent	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
link-vmlinux.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.asm-generic	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.build	Kbuild: don't pass "-C" to preprocessor when processing linker scripts	2017-11-02 14:10:37 -07:00
Makefile.clean	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.dtbinst	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.extrawarn	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.gcc-plugins	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.headersinst	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.help
Makefile.host	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.kasan	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.lib	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.modbuiltin	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.modinst	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.modpost	License cleanup: add SPDX license identifiers to some files	2017-11-02 10:04:46 -07:00
Makefile.modsign	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Makefile.ubsan	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
makelst	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
markup_oops.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
mkcompile_h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mkmakefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mksysmap	mksysmap: Add h8300 local symbol pattern	2015-06-23 13:35:47 +09:00
mkuboot.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
module-common.lds	module: set .init_array alignment to 8	2017-03-13 09:40:28 -07:00
namespace.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
objdiff	scripts: objdiff: Ignore debug info when comparing	2017-03-11 11:13:38 +09:00
parse-maintainers.pl	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
patch-kernel	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
pnmtologo.c
profile2linkerlist.pl	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
prune-kernel	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
recordmcount.c	ftrace: Allow for function tracing to record init functions on boot up	2017-03-24 20:51:49 -04:00
recordmcount.h	recordmcount: Fix endianness handling bug for nop_mcount	2015-11-03 10:45:26 -05:00
recordmcount.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
setlocalversion	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
show_delta
sign-file.c	sign-file: fix build error in sign-file.c with libressl	2017-02-10 12:43:47 +11:00
sortextable.c	powerpc: Build-time sort the exception table	2016-11-14 11:11:51 +11:00
sortextable.h
spelling.txt	scripts/spelling.txt: add more spelling mistakes to spelling.txt	2017-10-03 17:54:23 -07:00
sphinx-pre-install	docs-rst: don't require adjustbox anymore	2017-09-08 10:02:55 -06:00
stackdelta	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
stackusage	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
tags.sh	tags: honor COMPILED_SOURCE with apart output directory	2017-06-06 08:42:34 +09:00
unifdef.c
ver_linux	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
xen-hypercalls.sh	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
xz_wrap.sh