David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Several conflicts here. NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now. Parallel additions to net/pkt_cls.h and net/sch_generic.h A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next. The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-30 21:09:24 +09:00
..
ABI	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
accounting
acpi
admin-guide	net: Add support for networking over Thunderbolt cable	2017-10-02 11:24:42 -07:00
aoe
arm
arm64	arm64: Expose DC CVAP to userspace	2017-08-09 11:00:35 +01:00
auxdisplay
backlight
blackfin
block	doc, block, bfq: better describe how to properly configure bfq	2017-08-31 13:55:26 -06:00
blockdev	SCSI misc on 20170907	2017-09-07 21:11:05 -07:00
bus-devices
cdrom
cgroup-v1
cma
connector
console
core-api	doc: Fix RCU's docbook options	2017-10-19 22:26:11 -04:00
cpu-freq	cpufreq: docs: Drop intel-pstate.txt from index.txt	2017-09-28 02:08:43 +02:00
cpuidle
cris
crypto
dev-tools
device-mapper	dm raid: fix incorrect status output at the end of a "recover" process	2017-10-05 16:21:30 -04:00
devicetree	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
dmaengine	Merge branch 'topic/dmatest' into for-linus	2017-09-06 21:55:10 +05:30
doc-guide	sphinx.rst: Allow Sphinx version 1.6 at the docs	2017-08-26 15:50:27 -06:00
driver-api	Merge remote-tracking branch 'net-next/master' into mac80211-next	2017-10-06 11:46:55 +02:00
driver-model	driver core: remove DRIVER_ATTR	2017-09-19 09:20:33 +02:00
early-userspace
EDID
extcon
fault-injection
fb	fbcon: remove restriction on margin color	2017-09-04 16:00:49 +02:00
features	docs/features: parisc implements tracehook	2017-08-07 14:18:40 -06:00
filesystems	Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs	2017-10-06 08:52:53 -07:00
firmware_class
fmc
fpga
frv
gpio	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2017-09-07 13:39:21 -07:00
gpu	Merge tag 'drm-intel-next-2017-08-18' of git://anongit.freedesktop.org/git/drm-intel into drm-next	2017-08-22 10:03:07 +10:00
hid
hwmon	hwmon: (pmbus/lm25066) Add support for TI LM5066I	2017-08-30 06:31:13 -07:00
i2c	i2c: i801: Add support for Intel Cedar Fork	2017-10-05 14:44:56 +02:00
ia64
ide
iio
infiniband	Documentation: Hardware tag matching	2017-08-29 08:30:21 -04:00
input	Documentation:input: fix typo	2017-08-30 15:18:24 -06:00
ioctl
isdn
kbuild	kbuild doc: a bundle of fixes on makefiles.txt	2017-10-24 10:12:00 +09:00
kdump
kernel-hacking
laptops	platform/x86: thinkpad_acpi: Fix warning about deprecated hwmon_device_register	2017-08-18 15:57:24 -07:00
leds
lightnvm
livepatch
locking	Merge branch 'linus' into locking/core, to fix up conflicts	2017-09-04 11:01:18 +02:00
m68k
md
media	media: add qcom_camss.rst to v4l-drivers rst file	2017-09-05 07:28:25 -04:00
memory-devices
metag
mic
mips
misc-devices
mmc
mn10300
mtd
namespaces
netlabel
networking	ipvlan: implement VEPA mode	2017-10-29 18:39:57 +09:00
nfc
nios2
nvdimm
nvmem	NVMEM documentation fix: A minor typo	2017-08-24 13:31:58 -06:00
parisc
PCI
pcmcia
perf
phy
platform
power	Merge branch 'pm-sleep'	2017-09-04 00:06:02 +02:00
powerpc
pps	drivers/pps: aesthetic tweaks to PPS-related content	2017-09-08 18:26:51 -07:00
process	Documentation: Add a file explaining the Linux kernel license enforcement policy	2017-10-16 11:14:43 +02:00
pti
ptp
rapidio
RCU	doc: Set down RCU's scheduling-clock-interrupt needs	2017-08-17 07:31:14 -07:00
s390
scheduler
scsi
security	docs: ReSTify table of contents in core.rst	2017-08-30 15:27:58 -06:00
serial
sh
sound
sparc
sphinx	Documentation/sphinx: fix kernel-doc decode for non-utf-8 locale	2017-08-31 13:36:28 -06:00
sphinx-static
spi
sysctl	Major additions:	2017-09-22 16:16:41 -10:00
target
thermal
timers
trace	stm class: Document the stm_ftrace	2017-08-25 17:58:34 +03:00
translations	kokr/memory-barriers.txt: Apply atomic_t.txt change	2017-09-08 10:10:53 -06:00
usb
userspace-api	seccomp: Implement SECCOMP_RET_KILL_PROCESS action	2017-08-14 13:46:50 -07:00
virtual	KVM/ARM Changes for v4.14	2017-09-07 18:22:04 +02:00
vm	hmm: heterogeneous memory management documentation	2017-09-08 18:26:45 -07:00
w1
watchdog	watchdog: Revert "iTCO_wdt: all versions count down twice"	2017-09-09 17:41:24 +02:00
wimax
x86	Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-09-04 13:56:37 -07:00
xtensa
.gitignore
00-INDEX
atomic_bitops.txt	Documentation/locking/atomic: Add documents for new atomic_t APIs	2017-08-10 12:29:00 +02:00
atomic_t.txt	Documentation/locking/atomic: Finish the document...	2017-08-25 11:06:33 +02:00
bcache.txt
bt8xxgpio.txt
btmrvl.txt
bus-virt-phys-mapping.txt
cachetlb.txt
cgroup-v2.txt	cgroup: add cgroup.stat interface with basic hierarchy stats	2017-08-02 12:05:20 -07:00
Changes
circular-buffers.txt
clk.txt
CodingStyle
conf.py	docs-rst: don't require adjustbox anymore	2017-09-08 10:02:55 -06:00
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-coherent: remove the DMA_MEMORY_MAP and DMA_MEMORY_IO flags	2017-09-01 11:59:17 +02:00
DMA-attributes.txt
DMA-ISA-LPC.txt
docutils.conf
dontdiff	Remove gperf usage from toolchain	2017-08-19 11:02:53 -07:00
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	doc: Makefile: if sphinx is not found, run a check script	2017-08-24 13:18:30 -06:00
memory-barriers.txt	Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-09-04 11:52:29 -07:00
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	printk-formats.txt: Add examples for %pF and %pS usage	2017-08-24 18:49:52 +02:00
pwm.txt
rbtree.txt	rbtree: cache leftmost node internally	2017-09-08 18:26:48 -07:00
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	jump_label: Provide hotplug context variants	2017-08-10 12:28:59 +02:00
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