Merge commit '0072a0c14d5b7cb72c611d396f143f5dcd73ebe2' into patchwork

Merge from Upstream after the latest media fixes branch, because we
need one patch that it is there.

* commit '0072a0c14d5b7cb72c611d396f143f5dcd73ebe2': (1108 commits)
  ide: Change to use DEFINE_SHOW_ATTRIBUTE macro
  ide: pmac: add of_node_put()
  drivers/tty: add missing of_node_put()
  drivers/sbus/char: add of_node_put()
  sbus: char: add of_node_put()
  Linux 4.20-rc5
  PCI: Fix incorrect value returned from pcie_get_speed_cap()
  MAINTAINERS: Update linux-mips mailing list address
  ocfs2: fix potential use after free
  mm/khugepaged: fix the xas_create_range() error path
  mm/khugepaged: collapse_shmem() do not crash on Compound
  mm/khugepaged: collapse_shmem() without freezing new_page
  mm/khugepaged: minor reorderings in collapse_shmem()
  mm/khugepaged: collapse_shmem() remember to clear holes
  mm/khugepaged: fix crashes due to misaccounted holes
  mm/khugepaged: collapse_shmem() stop if punched or truncated
  mm/huge_memory: fix lockdep complaint on 32-bit i_size_read()
  mm/huge_memory: splitting set mapping+index before unfreeze
  mm/huge_memory: rename freeze_page() to unmap_page()
  initramfs: clean old path before creating a hardlink
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/platform/vicodec/vicodec-core.c
index 78c6009a53c3441c01de14755f757a74e206edcc,013cdebecbc49b5a899a91fb8455383f2f6df506..2b7daff634257c9e135b4a96da19d1b8da63e3ca
--- 1/drivers/media/platform/vicodec/vicodec-core.c
--- 2/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@@ -301,10 -301,11 +301,11 @@@ restart
  
        if (!ctx->comp_size) {
                state = VB2_BUF_STATE_ERROR;
 -              for (; p < p_out + sz; p++) {
 +              for (; p < p_src + sz; p++) {
                        u32 copy;
  
-                       p = memchr(p, magic[ctx->comp_magic_cnt], sz);
+                       p = memchr(p, magic[ctx->comp_magic_cnt],
 -                                 p_out + sz - p);
++                                 p_src + sz - p);
                        if (!p) {
                                ctx->comp_magic_cnt = 0;
                                break;

diff --cc drivers/staging/media/sunxi/cedrus/cedrus.c
Simple merge