David S. Miller 6bb8824732 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-29 15:42:26 -05:00
..
ABI	platform-drivers-x86 for v4.15-1	2017-11-18 10:26:57 -08:00
accounting
acpi
admin-guide	Trimmed second batch of KVM changes for Linux 4.15	2017-11-24 19:44:25 -10:00
aoe
arm
arm64	arm64: Add software workaround for Falkor erratum 1041	2017-12-12 11:45:19 +00:00
auxdisplay
backlight
blackfin
block
blockdev
bpf	bpf, doc: add faq about bpf development process	2017-12-06 14:32:42 -08:00
bus-devices
cdrom
cgroup-v1
cma
connector
console
core-api	genericirq.rst: Remove :c:func:... in code blocks	2017-12-02 08:41:46 -07:00
cpu-freq
cpuidle
cris
crypto
dev-tools	Kbuild misc updates for v4.15	2017-11-17 17:51:33 -08:00
device-mapper
devicetree	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
doc-guide
driver-api	Documentation: fix docs build error after source file removed	2017-12-03 15:11:45 -07:00
driver-model	We have two changes to the core framework this time around. The first being a	2017-11-17 20:04:24 -08:00
early-userspace
EDID
extcon
fault-injection
fb
features
filesystems	ovl: don't follow redirects if redirect_dir=off	2017-12-11 11:28:10 +01:00
firmware_class
fmc
fpga
frv
gpio
gpu
hid
hwmon
i2c
ia64	kbuild: /bin/pwd -> pwd	2017-11-18 11:32:27 +09:00
ide
iio
infiniband
input
ioctl
isdn
kbuild
kdump
kernel-hacking
laptops
leds
lightnvm
livepatch
locking	locking/lockdep: Remove the cross-release locking checks	2017-12-12 12:38:51 +01:00
m68k
md
media	media: docs: add documentation for frontend attach info	2017-11-30 04:19:04 -05:00
memory-devices
metag
mic
mips
misc-devices
mmc
mn10300
mtd
namespaces
netlabel
networking	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2017-12-27 11:15:14 -05:00
nfc
nios2
nvdimm
nvmem
openrisc
parisc
PCI
pcmcia
perf
phy
platform
power
powerpc
pps
process	A few late-arriving docs updates that have no real reason to wait. There's	2017-11-23 21:01:32 -10:00
pti
ptp
rapidio
RCU
s390
scheduler
scsi	scsi: documentation: Fix case of 'scsi_device' struct mention(s)	2017-12-02 08:43:43 -07:00
security
serial
sh
sound
sparc
sphinx
sphinx-static
spi
sysctl	net: Clarify dev_weight documentation for LRO and GRO_HW.	2017-12-20 13:04:01 -05:00
target
thermal
timers
trace
translations	A few late-arriving docs updates that have no real reason to wait. There's	2017-11-23 21:01:32 -10:00
usb
userspace-api
virtual	KVM: s390: mark irq_state.flags as non-usable	2017-12-06 09:18:43 +01:00
vm	Documentation/vm/zswap.txt: update with same-value filled page feature	2017-12-14 16:00:48 -08:00
w1
watchdog
wimax
x86	Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-12-23 11:53:04 -08:00
xtensa
.gitignore
00-INDEX
atomic_bitops.txt
atomic_t.txt
bcache.txt
bt8xxgpio.txt
btmrvl.txt
bus-virt-phys-mapping.txt
cachetlb.txt
cgroup-v2.txt	cgroup: add warning about RT not being supported on cgroup2	2017-12-05 11:47:17 -08:00
Changes
circular-buffers.txt
clearing-warn-once.txt	kernel debug: support resetting WARN*_ONCE	2017-11-17 16:10:00 -08:00
clk.txt
CodingStyle
conf.py
cpu-load.txt
cputopology.txt
crc32.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
digsig.txt
DMA-API-HOWTO.txt
DMA-API.txt
DMA-attributes.txt
DMA-ISA-LPC.txt
docutils.conf
dontdiff
efi-stub.txt
eisa.txt
errseq.rst
flexible-arrays.txt
futex-requeue-pi.txt
gcc-plugins.txt
highuid.txt
hw_random.txt
hwspinlock.txt
index.rst
intel_txt.txt
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ-domain.txt
IRQ.txt
irqflags-tracing.txt
isa.txt
isapnp.txt
kernel-doc-nano-HOWTO.txt
kernel-per-CPU-kthreads.txt
kobject.txt
kprobes.txt
kref.txt
ldm.txt
lockup-watchdogs.txt
logo.gif
logo.txt
lsm.txt
lzo.txt
mailbox.txt
Makefile
memory-barriers.txt
memory-hotplug.txt
men-chameleon-bus.txt
nommu-mmap.txt
ntb.txt
numastat.txt
padata.txt
parport-lowlevel.txt
percpu-rw-semaphore.txt
phy.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt	vsprintf: add printk specifier %px	2017-11-29 12:13:14 +11:00
pwm.txt
rbtree.txt
remoteproc.txt
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt
rpmsg.txt
rtc.txt
SAK.txt
sgi-ioc4.txt
siphash.txt
SM501.txt
smsc_ece1099.txt
static-keys.txt
SubmittingPatches
svga.txt	documentation/svga.txt: update outdated file	2017-11-20 10:45:50 -07:00
switchtec.txt	NTB: switchtec_ntb: Update switchtec documentation with notes for NTB	2017-11-18 20:37:13 -05:00
sync_file.txt
tee.txt
this_cpu_ops.txt
unaligned-memory-access.txt
vfio-mediated-device.txt
vfio.txt
video-output.txt
xillybus.txt
xz.txt
zorro.txt