Commit 1b62f19c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v3.18-rc1' into v4l_for_linus 

Linux 3.18-rc1

* tag 'v3.18-rc1': (9167 commits)
  Linux 3.18-rc1
  MAINTAINERS: corrected bcm2835 search
  Net: DSA: Fix checking for get_phy_flags function
  sparc64: Do not define thread fpregs save area as zero-length array.
  sparc64: Fix corrupted thread fault code.
  MAINTAINERS: Become the docs maintainer
  x86,kvm,vmx: Preserve CR4 across VM entry
  ipv6: fix a potential use after free in sit.c
  ipv6: fix a potential use after free in ip6_offload.c
  ipv4: fix a potential use after free in gre_offload.c
  tcp: fix build error if IPv6 is not enabled
  futex: Ensure get_futex_key_refs() always implies a barrier
  bna: fix skb->truesize underestimation
  net: dsa: add includes for ethtool and phy_fixed definitions
  openvswitch: Set flow-key members.
  netrom: use linux/uaccess.h
  dsa: Fix conversion from host device to mii bus
  tipc: fix bug in bundled buffer reception
  ipv6: introduce tcp_v6_iif()
  sfc: add support for skb->xmit_more
  ...
parents a66d05d5 f114040e

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.

Documentation/ABI/stable/sysfs-devices-node

+0 −8
Original line number Diff line number Diff line
@@ -85,14 +85,6 @@ Description: 
		will be compacted. When it completes, memory will be freed

		into blocks which have as many contiguous pages as possible



What:		/sys/devices/system/node/nodeX/scan_unevictable_pages

Date:		October 2008

Contact:	Lee Schermerhorn <lee.schermerhorn@hp.com>

Description:

		When set, it triggers scanning the node's unevictable lists

		and move any pages that have become evictable onto the respective

		zone's inactive list. See mm/vmscan.c



What:		/sys/devices/system/node/nodeX/hugepages/hugepages-<size>/

Date:		December 2009

Contact:	Lee Schermerhorn <lee.schermerhorn@hp.com>

Documentation/ABI/testing/configfs-usb-gadget-uac1

0 → 100644
+12 −0
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/uac1.name

Date:		Sep 2014

KernelVersion:	3.18

Description:

		The attributes:



		audio_buf_size - audio buffer size

		fn_cap - capture pcm device file name

		fn_cntl - control device file name

		fn_play - playback pcm device file name

		req_buf_size - ISO OUT endpoint request buffer size

		req_count - ISO OUT endpoint request count

CRA Git | Maintained and supported by SUSTech CRA and CCSE