* 'docs-next' of git://git.lwn.net/linux:
  doc-rst: kernel-doc: fix handling of address_space tags
  Revert "doc/sphinx: Enable keep_warnings"
  doc-rst: kernel-doc directive, fix state machine reporter
  docs: deprecate kernel-doc-nano-HOWTO.txt
  doc/sphinx: Enable keep_warnings
  Documentation: add watermark_scale_factor to the list of vm systcl file
  kernel-doc: Fix up warning output
  docs: Get rid of some kernel-documentation warnings

The RST cpp:function handler is very pedantic: it doesn't allow any
macros like __user on it:

	Documentation/media/kapi/dtv-core.rst:28: WARNING: Error when parsing function declaration.
	If the function has no return type:
	  Error in declarator or parameters and qualifiers
	  Invalid definition: Expecting "(" in parameters_and_qualifiers. [error at 8]
	    ssize_t dvb_ringbuffer_pkt_read_user (struct dvb_ringbuffer * rbuf, size_t idx, int offset, u8 __user * buf, size_t len)
	    --------^
	If the function has a return type:
	  Error in declarator or parameters and qualifiers
	  If pointer to member declarator:
	    Invalid definition: Expected '::' in pointer to member (function). [error at 37]
	      ssize_t dvb_ringbuffer_pkt_read_user (struct dvb_ringbuffer * rbuf, size_t idx, int offset, u8 __user * buf, size_t len)
	      -------------------------------------^
	  If declarator-id:
	    Invalid definition: Expecting "," or ")" in parameters_and_qualifiers, got "*". [error at 102]
	      ssize_t dvb_ringbuffer_pkt_read_user (struct dvb_ringbuffer * rbuf, size_t idx, int offset, u8 __user * buf, size_t len)
	      ------------------------------------------------------------------------------------------------------^

So, we have to remove it from the function prototype.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

This reverts commit 47d6d752.

Commit f42ddca7 (doc-rst: kernel-doc directive, fix state machine
reporter) from Marcus Heiser provides a better fix, so this configuration
change is no longer needed.

Add a reporter replacement that assigns the correct source name and line
number to a system message, as recorded in a ViewList.

[1] http://mid.gmane.org/CAKMK7uFMQ2wOp99t-8v06Om78mi9OvRZWuQsFJD55QA20BB3iw@mail.gmail.comSigned-off-by: NMarkus Heiser <markus.heiser@darmarIT.de>
Tested-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Now that the new Sphinx world order is taking over, the information in
kernel-doc-nano-HOWTO.txt is outmoded.  I hate to remove it altogether,
since it's one of those files that people expect to find.  But we can add a
warning and fix all the other pointers to it.
Reminded-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Unfortunately warnings generated after parsing in sphinx can end up
with entirely bogus files and line numbers as sources. Strangely for
outright errors this is not a problem. Trying to convert warnings to
errors also doesn't fix it.

The only way to get useful output out of sphinx to be able to root
cause the error seems to be enabling keep_warnings, which inserts
a System Message into the actual output. Not pretty at all, but I
don't really want to fix up core rst/sphinx code, and this gets the job
done meanwhile.

Cc: Markus Heiser <markus.heiser@darmarit.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: linux-doc@vger.kernel.org
Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Update and expand the CEC documentation. Especially w.r.t. non-blocking
mode.
Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Sphinx is really evil when an older version finds an extra
attribute for the :toctree: tag: it simply ignores everything
and produce documents without any chapter inside!

As we're now using tags available only on Sphinx 1.4.x, we
need to use some creative ways to add a title before the
table of contents. Do that by using a css class.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

The titles at the media books were misleading, and some books
were not numbered.

Rename the kAPI book to better reflect its contents, be more
consistent on the initial rst file for each book and better
name them.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

I ended by adding twice each media header, because I saw some
missing stuff at the documents. It seems it was my mistake,
as everything seems to be there.

So, remove those extra stuff, to avoid duplicating the
documentation of the functions.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Move the contents of this file to bttv.rst and saa7134.rst.

With that, we can finally remove Documentation/video4linux.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Import the contents of hauppauge-wintv-cx88-ir.txt, after
converted to ReST into cx88.rst file.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

There are some information about missing/wrong documentation at
cx231xx datasheet. Add it to the cx88 chapter.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Finally, adds the content of README.vbi at cx2341x.rst after
its conversion to ReST format.

Now, add information about this chipset and its driver is
inside a single chapter at the media/v4l-drivers book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

The README.hm12 file describes the proprietary format used
by this driver for raw format, called HM12. Add its description
at the document, after converted to ReST.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST format and add to cx2341x.rst file.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Add the contents of fw-upload.txt, after converting it to
ReST format.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert the content to ReST and add it at the cx231xx.rst
file.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Add the contents of fw-dma.txt, converted to ReST, and
drop the old file.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST and add its contents at this file.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert its contents to ReST and add to cx2341x.rst.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert the contents of fw-decoder-registers.txt to ReST and
add it to cx2341x.rst file.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Commit 795ae7a0 ("mm: scale kswapd watermarks in proportion to
memory") properly added the description of the new knob to
Documentation/sysctl/vm.txt, but forgot to add it to the list of files
in /proc/sys/vm. Let's fix that.
Signed-off-by: NJerome Marchand <jmarchan@redhat.com>
Acked-by: NJohannes Weiner <hannes@cmpxchg.org>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

move the contents of fw-decoder-api.txt to cx2341x and
convert it to ReST file, adding it to media/v4l-drivers
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert bttv/Tuners to ReST and add it to the media/v4l-drivers book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST and add it to media/v4l-drivers book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

There were several files under Documentation/video4linux/bttv.

Instead of simply copying them to the rst folder, I opted to
merge into a single document and adjust the headers to
adjust the section levels and fix the cards tables.

There are two exceptions on the merge:

- The Tuners were renamed as a separate document, as they
  describe a separate driver;

- I removed the PROBLEMS section. It describes problems with
  the very first generation of 3D boards (Mistique/S3).
  It sounds very unlikely that someone would still need to
  install a bttv board on such hardware. Also, it is not
  very well written, IMHO.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

While trying to make gpu docs warning free I stumbled over one output
which wasn't following proper compiler error output standards. Fix it
up for more quickfix awesomeness.

Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: linux-doc@vger.kernel.org
Signed-off-by: NDaniel Vetter <daniel.vetter@intel.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

This document were really old. Update it to reflect the current
status of the IR drivers for TV.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

This section is outdated, but let's add it, after converting
to ReST, and then fix it.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST and add to media/v4l-drivers book.

As the sections here (and on other docs) are numbered,
let's also make this book auto-numbered.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST and add to media/v4l-drivers book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST and add to media/v4l-drivers book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST format and add it at media/v4l-drivers book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST and add to media/v4l-drivers book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST and add it to the media/v4l-drivers book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST and add to media/v4l-drivers book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST and add it to media/v4l-drivers book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST and add to the media/v4l-device book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>

Convert it to ReST and add it to the media/v4l-drivers book.
Signed-off-by: NMauro Carvalho Chehab <mchehab@s-opensource.com>