Merge branch 'pdf_fixes_v1' of https://git.linuxtv.org/mchehab/experimental into...

Bring in a set of post-thrashup fixes from Mauro.

diff --cc Documentation/watchdog/hpwdt.rst
Simple merge

diff --cc MAINTAINERS
index 783569e3c4b48752c3555e9bee6fbc87adad5117,5fe6fd59713841b792a7a9c4617905d4f2bc28bb..ff3ae2be274640d8aab9215deaba4a7251e4f387
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12133,11 -12093,10 +12133,11 @@@ F:        Documentation/driver-api/parport*.rs
  
  PARAVIRT_OPS INTERFACE
  M:    Juergen Gross <jgross@suse.com>
 -M:    Alok Kataria <akataria@vmware.com>
 +M:    Thomas Hellstrom <thellstrom@vmware.com>
 +M:    "VMware, Inc." <pv-drivers@vmware.com>
  L:    virtualization@lists.linux-foundation.org
  S:    Supported
- F:    Documentation/virtual/paravirt_ops.txt
+ F:    Documentation/virtual/paravirt_ops.rst
  F:    arch/*/kernel/paravirt*
  F:    arch/*/include/asm/paravirt*.h
  F:    include/linux/hypervisor.h

diff --cc drivers/gpu/drm/drm_modes.c
Simple merge