tree 83e9cd51fbd74e2dfde809030bf3134569a37c7d
parent 4e311a2fab041c5503c6946e9f1a8fdd61086b5c
parent f4b1bd6d9c2e2818ad1ef2483471c8b9a5c0a01c
author Martin Faltesek <mfaltesek@google.com> 1644180723 -0600
committer Martin Faltesek <mfaltesek@google.com> 1644180724 -0600

CHROMIUM: Merge 'v4.19.227' into chromeos-4.19

Merge of v4.19.227 into chromeos-4.19

Conflicts:
    drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

Changelog:
----------------------------------------------------------------
Greg Kroah-Hartman (1):
      Linux 4.19.227

Jan Kara (1):
      select: Fix indefinitely sleeping task in poll_schedule_timeout()

Martin Faltesek (1):
      Merge remote-tracking branch 'cros/stable-merge/linux/v4.19.227' into merge/chromeos-4.19-v4.19.227

Mathias Krause (1):
      drm/vmwgfx: Fix stale file descriptors on failed usercopy

Nikolay Aleksandrov (1):
      net: bridge: clear bridge's private skb space on xmit

Tvrtko Ursulin (1):
      drm/i915: Flush TLBs before releasing backing store

 Makefile                                |  2 +-
 drivers/gpu/drm/i915/i915_drv.h         |  2 +
 drivers/gpu/drm/i915/i915_gem.c         | 83 +++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_gem_object.h  |  1 +
 drivers/gpu/drm/i915/i915_reg.h         |  6 +++
 drivers/gpu/drm/i915/i915_vma.c         |  4 ++
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h     |  5 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 34 +++++++-------
 drivers/gpu/drm/vmwgfx/vmwgfx_fence.c   |  2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c     |  2 +-
 fs/select.c                             | 63 +++++++++++++------------
 net/bridge/br_device.c                  |  2 +
 12 files changed, 153 insertions(+), 53 deletions(-)

BUG=b:216912957
TEST=Build and test on various affected systems

Change-Id: I00d048d3b88075968f0a7b9a05bdbb5f607debf1
Disallow-Recycled-Builds: test-failures
Signed-off-by: Martin Faltesek <mfaltesek@google.com>