David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The UDP offload conflict is dealt with by simply taking what is in net-next where we have removed all of the UFO handling code entirely. The TCP conflict was a case of local variables in a function being removed from both net and net-next. In netvsc we had an assignment right next to where a missing set of u64 stats sync object inits were added. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-08-09 16:28:45 -07:00
..
accounting	…
arch	tools/include: Sync kernel ABI headers with tooling headers	2017-05-24 09:00:21 +02:00
build	bpf, s390: fix build for libbpf and selftest suite	2017-08-04 11:18:01 -07:00
cgroup	…
firewire	…
gpio	gpio-hammer: fix make consumer_label suitable to work on gpio-nails	2017-01-26 16:29:09 +01:00
hv	netvsc: remove bonding setup script	2017-08-02 16:55:33 -07:00
iio	iio: tools: generic_buffer: increase trigger length	2017-05-07 16:08:04 +01:00
include	selftests: bpf: add a test for XDP redirect	2017-08-08 18:12:50 -07:00
kvm/kvm_stat	tools/kvm_stat: add '-f help' to get the available event list	2017-07-26 19:04:53 +02:00
laptop	…
leds	tools/leds: Add led_hw_brightness_mon program	2017-02-14 22:20:23 +01:00
lguest	Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-05-01 20:51:12 -07:00
lib	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-09 16:28:45 -07:00
net	tools: bpf_jit_disasm: Handle large images.	2017-06-14 15:03:22 -04:00
nfsd	…
objtool	objtool: Fix sibling call detection logic	2017-07-08 10:29:48 +02:00
pci	tools: PCI: Add sample test script to invoke pcitest	2017-04-28 10:23:20 -05:00
pcmcia	…
perf	Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-07-21 11:12:48 -07:00
power	ACPI updates for v4.13-rc1	2017-07-04 14:16:49 -07:00
scripts	kbuild: simplify silent build (-s) detection	2017-06-06 09:01:12 +09:00
spi	spi: spidev_test: add option to continuously transfer data	2017-03-21 18:44:40 +00:00
testing	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-08-09 16:28:45 -07:00
thermal/tmon	…
time	…
usb	usb: changes for v4.13 merge window	2017-06-20 11:39:34 +08:00
virtio	tools/virtio: fix spelling mistake: "wakeus" -> "wakeups"	2017-05-09 16:43:24 +03:00
vm	tools/vm: add missing Makefile rules	2017-02-22 16:41:26 -08:00
Makefile	tools: Add install make target for liblockdep	2017-06-05 09:28:08 +02:00