David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -04:00
..
ABI	Merge branch 'speck-v20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-05-21 11:23:26 -07:00
accelerators
accounting
acpi
admin-guide	Merge branch 'speck-v20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-05-21 11:23:26 -07:00
aoe
arm	MTD changes:	2018-04-06 12:15:41 -07:00
arm64	ARM:	2018-04-09 11:42:31 -07:00
auxdisplay
backlight
block
blockdev
bpf	bpf, doc: howto use/run the BPF selftests	2018-05-14 23:02:58 -07:00
bus-devices
cdrom
cgroup-v1	page cache: use xa_lock	2018-04-11 10:28:39 -07:00
cma
connector
console
core-api	textsearch: fix kernel-doc warnings and add kernel-api section	2018-04-16 18:53:13 -04:00
cpu-freq	cpufreq: Drop cpufreq_table_validate_and_show()	2018-04-10 08:40:45 +02:00
cpuidle	cpuidle: Add definition of residency to sysfs documentation	2018-04-09 13:44:37 +02:00
crypto	crypto: doc - clarify hash callbacks state machine	2018-03-31 01:33:02 +08:00
dev-tools	There's been a fair amount of activity in Documentation/ this time around:	2018-04-03 13:35:51 -07:00
device-mapper	dm thin: update Documentation to clarify when "read_only" is valid	2018-05-10 11:18:49 -04:00
devicetree	net: dsa: qca8k: Add QCA8334 binding documentation	2018-05-23 15:45:55 -04:00
doc-guide	MAINTAINERS & files: Canonize the e-mails I use at files	2018-05-04 06:21:06 -04:00
driver-api	Driver core fixes for 4.17-rc3	2018-04-27 10:12:20 -07:00
driver-model
early-userspace
EDID
extcon
fault-injection
fb
features	arch: remove obsolete architecture ports	2018-04-02 20:20:12 -07:00
filesystems	ipconfig: Write NTP server IPs to /proc/net/ipconfig/ntp_servers	2018-04-24 13:40:42 -04:00
firmware_class
fmc
fpga
gpio
gpu
hid
hwmon
i2c	Documentation/i2c: adopt kernel commenting style in examples	2018-04-18 10:09:44 +02:00
ia64
ide
iio
infiniband
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2018-04-05 13:21:57 -07:00
ioctl	staging: irda: remove remaining remants of irda code removal	2018-04-16 11:26:49 +02:00
isdn
kbuild	Kconfig updates for v4.17	2018-04-03 16:28:01 -07:00
kdump
kernel-hacking
laptops
leds
lightnvm
livepatch	livepatch: Allow to call a custom callback when freeing shadow variables	2018-04-17 13:42:48 +02:00
locking
m68k
maintainer
md
media	MAINTAINERS & files: Canonize the e-mails I use at files	2018-05-04 06:21:06 -04:00
memory-devices
mic
mips
misc-devices
mmc
mtd
namespaces
netlabel
networking	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -04:00
nfc
nios2
nvdimm
nvmem
openrisc
parisc
PCI
pcmcia
perf
phy
platform
power	firmware: Fix firmware documentation for recent file renames	2018-04-23 13:03:26 +02:00
powerpc
pps
process	staging: irda: remove remaining remants of irda code removal	2018-04-16 11:26:49 +02:00
pti
ptp
rapidio
RCU
s390
scheduler
scsi
security
serial
sh
sound
sparc
sphinx	MAINTAINERS & files: Canonize the e-mails I use at files	2018-05-04 06:21:06 -04:00
sphinx-static
spi
sysctl	bpf, x86_32: add eBPF JIT compiler for ia32	2018-05-03 18:15:25 +02:00
target
thermal	thermal: Add cooling device's statistics in sysfs	2018-04-02 21:49:01 +08:00
timers
trace	Revert: Unify CLOCK_MONOTONIC and CLOCK_BOOTTIME	2018-04-26 14:53:32 +02:00
translations	MAINTAINERS & files: Canonize the e-mails I use at files	2018-05-04 06:21:06 -04:00
usb
userspace-api	Documentation/spec_ctrl: Do some minor cleanups	2018-05-09 21:41:38 +02:00
virtual	kvm: rename KVM_HINTS_DEDICATED to KVM_HINTS_REALTIME	2018-05-17 19:12:13 +02:00
vm	page cache: use xa_lock	2018-04-11 10:28:39 -07:00
w1
watchdog
wimax
x86	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-04-15 16:12:35 -07: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
Changes
circular-buffers.txt
clearing-warn-once.txt
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
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-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
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
speculation.txt
static-keys.txt
SubmittingPatches
svga.txt
switchtec.txt
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