From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Jun 2020 01:18:50 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: v5.10.7~2339
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b1a62749946ee1956a480ba31e7d4929aa561d30;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'akpm' (patches from Andrew)

Pull updates from Andrew Morton:
 "A few fixes and stragglers.

  Subsystems affected by this patch series: mm/memory-failure, ocfs2,
  lib/lzo, misc"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  amdgpu: a NULL ->mm does not mean a thread is a kthread
  lib/lzo: fix ambiguous encoding bug in lzo-rle
  ocfs2: fix build failure when TCP/IP is disabled
  mm/memory-failure: send SIGBUS(BUS_MCEERR_AR) only to current thread
  mm/memory-failure: prioritize prctl(PR_MCE_KILL) over vm.memory_failure_early_kill
---

b1a62749946ee1956a480ba31e7d4929aa561d30