David S. Miller f8ddadc4db Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... There were quite a few overlapping sets of changes here. Daniel's bug fix for off-by-ones in the new BPF branch instructions, along with the added allowances for "data_end > ptr + x" forms collided with the metadata additions. Along with those three changes came veritifer test cases, which in their final form I tried to group together properly. If I had just trimmed GIT's conflict tags as-is, this would have split up the meta tests unnecessarily. In the socketmap code, a set of preemption disabling changes overlapped with the rename of bpf_compute_data_end() to bpf_compute_data_pointers(). Changes were made to the mv88e6060.c driver set addr method which got removed in net-next. The hyperv transport socket layer had a locking change in 'net' which overlapped with a change of socket state macro usage in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-22 13:39:14 +01:00
..
basic	fixdep: trivial: typo fix and correction	2017-08-10 01:01:03 +09:00
coccinelle	drm: Introduce drm_property_blob_{get,put}()	2017-02-28 16:16:46 +01:00
dtc	scripts/dtc: dtx_diff - 2nd update of include dts paths to match build	2017-09-20 10:13:05 -05:00
gcc-plugins	Merge branch 'for-next/gcc-plugin/structleak' into for-next/gcc-plugins	2017-08-07 13:29:04 -07:00
gdb	kbuild: use $(abspath ...) instead of $(shell cd ... && /bin/pwd)	2017-09-01 08:50:32 +09:00
genksyms	genksyms: fix gperf removal conversion	2017-09-08 14:32:34 -07:00
kconfig	Remove gperf usage from toolchain	2017-08-19 11:02:53 -07: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-10-22 13:39:14 +01:00
package	kbuild: rpm-pkg: fix version number handling	2017-09-21 00:06:03 +09:00
selinux	selinux: genheaders should fail if too many permissions are defined	2017-07-31 19:03:02 -04:00
tracing
.gitignore	Docs: clean up some DocBook loose ends	2017-06-23 14:17:38 -06:00
adjust_autoksyms.sh
asn1_compiler.c
bloat-o-meter
bootgraph.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
check_00index.sh
check_extable.sh
checkincludes.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09: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	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
checksyscalls.sh	kbuild: speed up checksyscalls.sh	2017-06-10 01:15:36 +09:00
checkversion.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
cleanfile	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
cleanpatch	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
coccicheck
config
conmakehash.c
const_structs.checkpatch
decode_stacktrace.sh
decodecode
depmod.sh
diffconfig
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
extract-ikconfig
extract-module-sig.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
extract-sys-certs.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
extract-vmlinux
faddr2line	scripts: fix faddr2line to work on last symbol	2017-10-12 12:26:52 -07:00
gcc-goto.sh
gcc-ld
gcc-plugin.sh
gcc-version.sh
gcc-x86_32-has-stack-protector.sh
gcc-x86_64-has-stack-protector.sh
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	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
headers_check.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
headers_install.sh
headers.sh
insert-sys-cert.c
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
Lindent	scripts/Lindent: clean up and optimize	2017-02-22 16:41:26 -08:00
link-vmlinux.sh	kbuild: handle libs-y archives separately from built-in.o archives	2017-06-30 09:03:03 +09:00
Makefile	Docs: clean up some DocBook loose ends	2017-06-23 14:17:38 -06:00
Makefile.asm-generic	kbuild: update comments of Makefile.asm-generic	2017-08-25 00:10:05 +09:00
Makefile.build	objtool: Skip unreachable warnings for GCC 4.4 and older	2017-09-28 07:23:02 +02:00
Makefile.clean
Makefile.dtbinst	kbuild: Do not use hyphen in exported variable name	2017-08-21 09:06:00 +09:00
Makefile.extrawarn	Kbuild: enable -Wunused-macros warning for "make W=2"	2017-09-01 08:53:17 +09:00
Makefile.gcc-plugins	gcc-plugins: structleak: add option to init all vars used as byref args	2017-08-07 11:20:57 -07:00
Makefile.headersinst	kbuild: remove wrapper files handling from Makefile.headersinst	2017-07-11 21:33:54 +09:00
Makefile.help
Makefile.host	kbuild: Add __cc-option macro	2017-06-25 12:47:55 +09:00
Makefile.kasan	kasan: turn on -fsanitize-address-use-after-scope	2016-12-12 18:55:09 -08:00
Makefile.lib	remove gperf left-overs from build system	2017-09-09 10:00:15 -07:00
Makefile.modbuiltin
Makefile.modinst
Makefile.modpost
Makefile.modsign
Makefile.ubsan
makelst
markup_oops.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
mkcompile_h	scripts/mkcompile_h: Remove trailing spaces from compiler version	2017-06-19 22:48:15 +09:00
mkmakefile
mksysmap
mkuboot.sh
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	parse-maintainers: Move matching sections from MAINTAINERS	2017-08-08 11:16:14 -07:00
patch-kernel
pnmtologo.c
profile2linkerlist.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
prune-kernel
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.pl	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
setlocalversion
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
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	scripts: Switch to more portable Perl shebang	2017-05-14 11:20:44 +09:00
stackusage
tags.sh	tags: honor COMPILED_SOURCE with apart output directory	2017-06-06 08:42:34 +09:00
unifdef.c
ver_linux	ver_linux: Use /usr/bin/awk instead of /bin/awk	2017-04-08 18:03:42 +02:00
xen-hypercalls.sh
xz_wrap.sh