Signed-off-by: NNicholas Mc Guire <der.herr@hofr.at>
[jc: cleaned up some spurious blank lines]
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Bring in the big SubmittingPatches thrashup.

Conflicts:
	Documentation/SubmittingPatches

Some of the source code embedded in mei-client-bus.txt was indented
using spaces. This properly indents it with tabs and also removes a
single space that was placed in front of a closing curly brace.
Reviewed-by: NJeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: NJulian Brost <linux-kernel@0x4a42.net>
Signed-off-by: NFabian Hofmann <fabian.hofmann@fau.de>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Properly indent a list in mei.txt in the same way as another list in
that file.
Reviewed-by: NJeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: NJulian Brost <linux-kernel@0x4a42.net>
Signed-off-by: NFabian Hofmann <fabian.hofmann@fau.de>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Add a space before opening and after closing parentheses where
appropriate.
Reviewed-by: NJeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: NJulian Brost <linux-kernel@0x4a42.net>
Signed-off-by: NFabian Hofmann <fabian.hofmann@fau.de>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Make the heading underlines fit the length of the heading, remove colons
at the end of headings and consistently place an empty line after each
heading and two empty lines before each that is preceded by a paragraph.
Reviewed-by: NJeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: NJulian Brost <linux-kernel@0x4a42.net>
Signed-off-by: NFabian Hofmann <fabian.hofmann@fau.de>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

This patch fix multiple words such as "the the" and "which which"
in Documentation/devicetree.
Signed-off-by: NMasanari Iida <standby24x7@gmail.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

This patch fix a spelling typo in Documentation/sysctl/vm.txt
Signed-off-by: NMasanari Iida <standby24x7@gmail.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Signed-off-by: NDaniel Wagner <daniel.wagner@bmw-carit.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Don't build the blackfin gptimers-example module when BFIN_GPTIMERS
is not enabled. Allow the build when BFIN_GPTIMERS is =y or =m.

I believe that this patch fixes these build errors, but I don't
have a build environment to test this.

ERROR: "disable_gptimers" [Documentation/blackfin/gptimers-example.ko] undefined!
ERROR: "enable_gptimers" [Documentation/blackfin/gptimers-example.ko] undefined!
ERROR: "set_gptimer_config" [Documentation/blackfin/gptimers-example.ko] undefined!
ERROR: "clear_gptimer_intr" [Documentation/blackfin/gptimers-example.ko] undefined!
ERROR: "get_gptimer_period" [Documentation/blackfin/gptimers-example.ko] undefined!
ERROR: "get_gptimer_pwidth" [Documentation/blackfin/gptimers-example.ko] undefined!
ERROR: "get_gptimer_intr" [Documentation/blackfin/gptimers-example.ko] undefined!
Reported-by: NFenggaung Wu <fengguang.wu@intel.com>
Signed-off-by: NRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Suggest to developers who use emacs that they turn on the
instantaneous trailing-whitespace warning feature.
Signed-off-by: NAlison Chaiken <alison_chaiken@mentor.com>
[jc: untabified to match its surroundings]
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Use find + xargs to compress the generated manpages. Without this patch,
the build can fail with

    gzip -f Documentation/DocBook/man/*.9
    /bin/bash: /usr/bin/gzip: Argument list too long

This happened with qemu user mode emulation on aarch64.
Signed-off-by: NMichal Marek <mmarek@suse.cz>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

As explained in this file:

"GPIOs mappings are defined in the consumer device's node, in a property named
<function>-gpios"

So fix the example to match the convention.
Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
Acked-by: NAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

The Developers Certificate of Origin has a mixture of tabs and white
spaces which is annoying to view if your editor explicitly views white
space characters.

Also remove any trailing white spaces found in the file.
Signed-off-by: NStefan Beller <sbeller@google.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Update descriptions of seq_path() and seq_path_root():
starting with commit v3.2-rc4-1-g02125a82, seq_path_root() no longer
changes the value of root;
starting with commit v3.2-rc7-104-g8c9379e9, some arguments of seq_path()
and seq_path_root() are const.
Signed-off-by: NDmitry V. Levin <ldv@altlinux.org>
Acked-by: NRob Landley <rob@landley.net>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

The official spelling of GNU is GNU and not Gnu.
Bug 89551 https://bugzilla.kernel.org/show_bug.cgi?id=89551Signed-off-by: NKevin Law <kevin@stealsyour.pw>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Improve the wording by changing it from "is provide the" to
"is to give the".
Signed-off-by: NJeremiah Mahler <jmmahler@gmail.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

- client.txt was moved by f36d2e67 (dmaengine: Move the current doc to a
  folder of its own)
- dmatmest.txt was moved by 935cdb56 (dmanegine: move dmatest.txt to
  dmaengine folder)
- provider.txt was added by c4d2ae96 (Documentation: dmaengine: Add a
  documentation for the dma controller API).

Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: dmaengine@vger.kernel.org
Cc: linux-doc@vger.kernel.org
Signed-off-by: NHenrik Austad <henrik@austad.us>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

unified-hierarchy.txt was added by 65731578 (cgroup: add documentation
about unified hierarchy)

Cc: Tejun Heo <tj@kernel.org>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: cgroups@vger.kernel.org
Cc: linux-doc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: NHenrik Austad <henrik@austad.us>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Added:
- arm/Makefile was added by adb19fb6 (add makefiles for more targets)
- arm/CCN.txt was added by a33b0daa (ARM CCN PMU driver)

Removed:
- arm/Sharp-LH was removed by 82e6923e (ARM: lh7a40x: remove
  unmaintained platform support)

Not updated:
Documentation/arm/msm/ is missing 00-INDEX (1 files)
Documentation/arm/Samsung-S3C24XX/ is missing 00-INDEX (12 files)
Documentation/arm/nwfpe/ is missing 00-INDEX (4 files)
Documentation/arm/OMAP/ is missing 00-INDEX (2 files)
Documentation/arm/sunxi/ is missing 00-INDEX (2 files)
Documentation/arm/SPEAr/ is missing 00-INDEX (1 files)
Documentation/arm/Marvell/ is missing 00-INDEX (1 files)
Documentation/arm/SA1100/ is missing 00-INDEX (18 files)
Documentation/arm/pxa/ is missing 00-INDEX (1 files)
Documentation/arm/sti/ is missing 00-INDEX (4 files)
Documentation/arm/SH-Mobile/ is missing 00-INDEX (4 files)
Documentation/arm/VFP/ is missing 00-INDEX (1 files)
Documentation/arm/Samsung/ is missing 00-INDEX (3 files)

Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Jiri Kosina <trivial@kernel.org>
Cc: linux-doc@vger.kernel.org (open list:DOCUMENTATION)
Cc: linux-kernel@vger.kernel.org (open list)
Signed-off-by: NHenrik Austad <henrik@austad.us>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

- altera_tse.txt was added by 04add4ab (Add Altera Ethernet (TSE)
  Documentation)
- cdc_mbim.txt was added by a563babe (cdc_mbim: add driver
  documentation)
- dctcp.txt was added by e3118e83 (tcp: add DCTCP congestion control
  algorithm)

CC: Jonathan Corbet <corbet@lwn.net>
CC: "David S. Miller" <davem@davemloft.net>
CC: linux-doc@vger.kernel.org
CC: linux-kernel@vger.kernel.org
Signed-off-by: NHenrik Austad <henrik@austad.us>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Added files
- hsi.txt was added by 3a8ab8af (HSI: Add some general description for
  the HSI subsystem)
- lzo.txt was added by d98a0526 (lzo: document part of the encoding)
- xillybus.txt was added by 7051924f (xillybus: Move out of staging)
- mailbox.txt was added by 15320fbc (add documentation for mailbox
  framework)

Moved files
- xommit 214e0aed (Move locking related docs into Documentation/locking/):
  * lockdep-design.txt
  * lockstat.txt
  * mutex-design.txt
  * rt-mutex-design.txt
  * rt-mutex.txt
  * spinlocks.txt
  * ww-mutex-design.txt
- kselftest.txt was moved by 3c415707 (kselftest: Move the docs to the
  Documentation dir)

CC: Davidlohr Bueso <davidlohr@hp.com>
CC: Willy Tarreau <w@1wt.eu>
CC: Randy Dunlap <rdunlap@infradead.org>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Sebastian Reichel <sre@kernel.org>
CC: Eli Billauer <eli.billauer@gmail.com>
CC: Jonathan Corbet <corbet@lwn.net>
CC: Jiri Kosina <trivial@kernel.org>
CC: linux-doc@vger.kernel.org
CC: linux-kernel@vger.kernel.org
Cc: Tim Bird <tim.bird@sonymobile.com>
Cc: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: NHenrik Austad <henrik@austad.us>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Pull KVM fixes from Paolo Bonzini:
 "The important fixes are for two bugs introduced by the merge window.

  On top of this, add a couple of WARN_ONs and stop spamming dmesg on
  pretty much every boot of a virtual machine"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: warn on more invariant breakage
  kvm: fix sorting of memslots with base_gfn == 0
  kvm: x86: drop severity of "generation wraparound" message
  kvm: x86: vmx: reorder some msr writing

Pull vfs fix from Al Viro:
 "An embarrassing bug in lustre patches from this cycle ;-/"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [regression] braino in "lustre: use is_root_inode()"

Modifying a non-existent slot is not allowed.  Also check that the
first loop doesn't move a deleted slot beyond the used part of
the mslots array.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>

Before commit 0e60b079 (kvm: change memslot sorting rule from size
to GFN, 2014-12-01), the memslots' sorting key was npages, meaning
that a valid memslot couldn't have its sorting key equal to zero.
On the other hand, a valid memslot can have base_gfn == 0, and invalid
memslots are identified by base_gfn == npages == 0.

Because of this, commit 0e60b079 broke the invariant that invalid
memslots are at the end of the mslots array.  When a memslot with
base_gfn == 0 was created, any invalid memslot before it were left
in place.

This can be fixed by changing the insertion to use a ">=" comparison
instead of "<=", but some care is needed to avoid breaking the case
of deleting a memslot; see the comment in update_memslots.

Thanks to Tiejun Chen for posting an initial patch for this bug.
Reported-by: NJamie Heilman <jamie@audible.transient.net>
Reported-by: NAndy Lutomirski <luto@amacapital.net>
Tested-by: NJamie Heilman <jamie@audible.transient.net>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>

Pull sound fixes from Takashi Iwai:
 "Just a couple of fixes for the new Intel Skylake HD-audio support"

* tag 'sound-3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda_intel: apply the Seperate stream_tag for Skylake
  ALSA: hda_controller: Separate stream_tag for input and output streams.

Since most virtual machines raise this message once, it is a bit annoying.
Make it KERN_DEBUG severity.

Cc: stable@vger.kernel.org
Fixes: 7a2e8aafSigned-off-by: NPaolo Bonzini <pbonzini@redhat.com>

The commit 34a1cd60, "x86: vmx: move some vmx setting from
vmx_init() to hardware_setup()", tried to refactor some codes
specific to vmx hardware setting into hardware_setup(), but some
msr writing should depend on our previous setting condition like
enable_apicv, enable_ept and so on.
Reported-by: NJamie Heilman <jamie@audible.transient.net>
Tested-by: NJamie Heilman <jamie@audible.transient.net>
Signed-off-by: NTiejun Chen <tiejun.chen@intel.com>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>

In one of the places (ll_md_blocking_ast()) we had open-coded
!is_root_inode(inode) and replaced it with is_root_inode(inode).
See the last chunk of f76c23:
-                   inode != inode->i_sb->s_root->d_inode)
+                   is_root_inode(inode))
should've been
+                   !is_root_inode(inode))
obviously...
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>

Pull parisc build fix from Helge Deller:
 "This unbreaks the kernel compilation on parisc with gcc-4.9"

* 'parisc-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: fix out-of-register compiler error in ldcw inline assembler function

The __ldcw macro has a problem when its argument needs to be reloaded from
memory. The output memory operand and the input register operand both need to
be reloaded using a register in class R1_REGS when generating 64-bit code.
This fails because there's only a single register in the class. Instead, use a
memory clobber. This also makes the __ldcw macro a compiler memory barrier.
Signed-off-by: NJohn David Anglin <dave.anglin@bell.net>
Cc: <stable@vger.kernel.org>        [3.13+]
Signed-off-by: NHelge Deller <deller@gmx.de>

The total stream number of Skylake's input and output stream
exceeds 15, which will cause some streams do not work because
of the overflow on SDxCTL.STRM field if using the legacy
stream tag allocation method.

This patch uses the new stream tag allocation method by add
the flag AZX_DCAPS_SEPARATE_STREAM_TAG for Skylake platform.
Signed-off-by: NLibin Yang <libin.yang@intel.com>
Reviewed-by: NVinod Koul <vinod.koul@intel.com>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Implemented separate stream_tag assignment for input and output streams.
According to hda specification stream tag must be unique throughout the
input streams group, however an output stream might use a stream tag
which is already in use by an input stream. This change is necessary
to support HW which provides a total of more than 15 stream DMA engines
which with legacy implementation causes an overflow on SDxCTL.STRM
field (and the whole SDxCTL register) and as a result usage of
Reserved value 0 in the SDxCTL.STRM field which confuses HDA controller.
Signed-off-by: NRafal Redzimski <rafal.f.redzimski@intel.com>
Signed-off-by: NJayachandran B <jayachandran.b@intel.com>
Signed-off-by: NLibin Yang <libin.yang@intel.com>
Reviewed-by: NVinod Koul <vinod.koul@intel.com>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>

Pull drm fixes from Dave Airlie:
 "Xmas fixes pull:

  core:
      one atomic fix, revert the WARN_ON dumb buffers patch.

  agp:
      fixup Dave J.

  nouveau:
      fix 3.18 regression for old userspace

  tegra fixes:
      vblank and iommu fixes

  amdkfd:
      fix bugs shown by testing with userspace, init apertures once

  msm:
      hdmi fixes and cleanup

  i915:
      misc fixes

  There is also a link ordering fix that I've asked to be cc'ed to you,
  putting iommu before gpu, it fixes an issue with amdkfd when things
  are all in the kernel, but I didn't like sending it via my tree
  without discussion.

  I'll probably be a bit on/off for a few weeks with pulls now, due to
  holidays and LCA, so don't be surprised if stuff gets a bit backed up,
  and things end up a bit large due to lag"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (28 commits)
  Revert "drm/gem: Warn on illegal use of the dumb buffer interface v2"
  agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags
  nouveau: bring back legacy mmap handler
  drm/msm/hdmi: rework HDMI IRQ handler
  drm/msm/hdmi: enable regulators before clocks to avoid warnings
  drm/msm/mdp5: update irqs on crtc<->encoder link change
  drm/msm: block incoming update on pending updates
  drm/atomic: fix potential null ptr on plane enable
  drm/msm: Deletion of unnecessary checks before the function call "release_firmware"
  drm/msm: Deletion of unnecessary checks before two function calls
  drm/tegra: dc: Select root window for event dispatch
  drm/tegra: gem: Use the proper size for GEM objects
  drm/tegra: gem: Flush buffer objects upon allocation
  drm/tegra: dc: Fix a potential race on page-flip completion
  drm/tegra: dc: Consistently use the same pipe
  drm/irq: Add drm_crtc_vblank_count()
  drm/irq: Add drm_crtc_handle_vblank()
  drm/irq: Add drm_crtc_send_vblank_event()
  drm/i915: Disable PSMI sleep messages on all rings around context switches
  drm/i915: Force the CS stall for invalidate flushes
  ...

Pull ipmi driver bugfixes from Corey Minyard:
 "Fix two bugs:

  One that lockdep turned up, I didn't go far enough with cleanup of
  attributes for IPMI.  This has been there a long time; my previous fix
  of this didn't fix all the attributes.

  One fix for some arches that need an explicit linux/ctype.h for
  isspace()"

* tag 'for-linus-2' of git://git.code.sf.net/p/openipmi/linux-ipmi:
  ipmi: Fix compile issue with isspace()
  ipmi: Finish cleanup of BMC attributes

This reverts commit 355a7018.

This had some bad side effects under normal operation, and should
have been dropped earlier.
Signed-off-by: NDave Airlie <airlied@redhat.com>