Commit a0200108 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge Linus' tree to be be to apply submitted patches to newer code than 

current trivial.git base
parents eff264ef fc14f9c1

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
*.gcno

modules.builtin

Module.symvers

*.dwo



#

# Top-level generic files

CREDITS

+7 −0
Original line number Diff line number Diff line
@@ -1381,6 +1381,9 @@ S: 17 rue Danton 
S: F - 94270 Le Kremlin-Bicêtre

S: France



N: Jack Hammer

D: IBM ServeRAID RAID (ips) driver maintenance



N: Greg Hankins

E: gregh@cc.gatech.edu

D: fixed keyboard driver to separate LED and locking status
@@ -1691,6 +1694,10 @@ S: Reading 
S: RG6 2NU

S: United Kingdom



N: Dave Jeffery

E: dhjeffery@gmail.com

D: SCSI hacks and IBM ServeRAID RAID driver maintenance



N: Jakub Jelinek

E: jakub@redhat.com

W: http://sunsite.mff.cuni.cz/~jj

Documentation/.gitignore

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
filesystems/dnotify_test

laptops/dslm

timers/hpet_example

vm/hugepage-mmap

vm/hugepage-shm

vm/map_hugetlb

Documentation/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -287,6 +287,8 @@ local_ops.txt 
	- semantics and behavior of local atomic operations.

lockdep-design.txt

	- documentation on the runtime locking correctness validator.

locking/

	- directory with info about kernel locking primitives

lockstat.txt

	- info on collecting statistics on locks (and contention).

lockup-watchdogs.txt

Documentation/ABI/removed/net_dma

0 → 100644
+8 −0
Original line number Diff line number Diff line 
What:		tcp_dma_copybreak sysctl

Date:		Removed in kernel v3.13

Contact:	Dan Williams <dan.j.williams@intel.com>

Description:

	Formerly the lower limit, in bytes, of the size of socket reads

	that will be offloaded to a DMA copy engine.  Removed due to

	coherency issues of the cpu potentially touching the buffers

	while dma is in flight.