Merge branch 'master' into aufs3.x-rcN/10static
Merge branch 'aufs3.x-rcN/10static' into aufs3.x-rcN/11proc_map
Merge branch 'aufs3.x-rcN/11proc_map' into aufs3.x-rcN/18public
aufs: tiny, remove a space

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
ck: revert time accounting "fix" that produced time anomalies with 'ps'

Reported in, http://techpatterns.com/forums/about2228.html
drm: Only evict the blocks required to create the requested hole

Avoid clobbering adjacent blocks if they happen to expire earlier and
amalgamate together to form the requested hole.

In passing this fixes a regression from
commit ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Fri Feb 18 17:59:12 2011 +0100

    drm: mm: track free areas implicitly

which swaps the end address for size (with a potential overflow) and
effectively causes the eviction code to clobber almost all earlier
buffers above the evictee.

v2: Check the original hole not the adjusted as the coloring may confuse
us when later searching for the overlapping nodes. Also make sure that
we do apply the range restriction and color adjustment in the same
order for both scanning, searching and insertion.

v3: Send the version that was actually tested.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>

s/__drm/drm/ to make it compile. --heftig
watchdog: Fix disable/enable regression

Commit 8d4516904b39 ("watchdog: Fix CPU hotplug regression") causes an
oops or hard lockup when doing

 echo 0 > /proc/sys/kernel/nmi_watchdog
 echo 1 > /proc/sys/kernel/nmi_watchdog

and the kernel is booted with nmi_watchdog=1 (default)

Running laptop-mode-tools and disconnecting/connecting AC power will
cause this to trigger, making it a common failure scenario on laptops.

Instead of bailing out of watchdog_disable() when !watchdog_enabled we
can initialize the hrtimer regardless of watchdog_enabled status.  This
makes it safe to call watchdog_disable() in the nmi_watchdog=0 case,
without the negative effect on the enabled => disabled => enabled case.

All these tests pass with this patch:
- nmi_watchdog=1
  echo 0 > /proc/sys/kernel/nmi_watchdog
  echo 1 > /proc/sys/kernel/nmi_watchdog

- nmi_watchdog=0
  echo 0 > /sys/devices/system/cpu/cpu1/online

- nmi_watchdog=0
  echo mem > /sys/power/state

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=51661

Cc: <stable@vger.kernel.org> # v3.7
Cc: Norbert Warmuth <nwarmuth@t-online.de>
Cc: Joseph Salisbury <joseph.salisbury@canonical.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Merge branch '3.7/misc' into 3.7/master
Revert "ck: revert time accounting "fix" that produced time anomalies with 'ps'"

Did not fix ps issues.

This reverts commit d4ea811726fd0aaa88311bcbe5b8cec5cd06c794.
Merge branch '3.7/zen-tune' into 3.7/master
UKSM-0.1.2.2 for linux-3.7
Merge branch '3.7/uksm' into 3.7/master
Add LZ4 compression method to btrfs, see git://repo.or.cz/linux-2.6/btrfs-unstable.git dev/compression/lz4
Merge branch '3.7/btrfs-lz4' into 3.7/master
ALSA: hda - Move runtime PM check to runtime_idle callback

The runtime_idle callback is the right place to check the suspend
capability, but currently we do it wrongly in the runtime_suspend
callback.  This leads to a kernel error message like:
pci_pm_runtime_suspend(): azx_runtime_suspend+0x0/0x50 [snd_hda_intel] returns -11
and the runtime PM core would even repeat the attempts.

Reported-by: Borislav Petkov <bp@alien8.de>
Cc: <stable@vger.kernel.org> [v3.7]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Merge branch '3.7/misc' into 3.7/master
Merge tag 'v3.7' of /src/linux/linux into aufs3.7/10static
version 3.7

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Merge branch 'aufs3.0/00base' into aufs3.1/00base
Merge branch 'aufs3.1/00base' into aufs3.2/00base