From patchwork Tue Jul 20 17:01:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 1507675 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=NiCKbnrv; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GTlP00V3pz9sWq; Wed, 21 Jul 2021 03:01:38 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m5t7c-0004mE-4e; Tue, 20 Jul 2021 17:01:32 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1m5t7Z-0004m0-Ra for kernel-team@lists.ubuntu.com; Tue, 20 Jul 2021 17:01:29 +0000 Received: from ascalon (3.general.kamal.us.vpn [10.172.68.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id AEDAE401B9 for ; Tue, 20 Jul 2021 17:01:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626800489; bh=I3ixoMBMwkNQyTT6ACFOSCXrFYgGdzTw0TU7fpe+u+U=; h=From:To:Subject:Date:Message-Id:MIME-Version:Content-Type; b=NiCKbnrvUk6bWGljys1VeemmQxzbUGEz+DWgpBlzG2kAzvaSuwiwXS0u64dwrBkqX G0zDkQTWcVtXX+qT2gGlWRV0SDpTPfDXo3YF3+tKU9gRXI05aEBy9CmyN57tA/9YGe qX1pBKzpJgwy9c7tBj/8RcYcfYp3x3hiRcC5O7Pn80x38X5UR4QSyd1dXTducWsjyu HTkdB967rYl5/csDGE9JLtTGVyEqT4a8nvKNEiqXsp+166wWqey2QfhbERJ/JCRTjx 4QIPkCD6L/Q6DFWgJKaR/49citrppw5RREy8Ey/XRFxxjLaAt9GWlZNf2gLXG3ip1m u6oVt6FHkmheQ== Received: from kamal by ascalon with local (Exim 4.90_1) (envelope-from ) id 1m5t7W-0006L5-5b for kernel-team@lists.ubuntu.com; Tue, 20 Jul 2021 10:01:26 -0700 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PULL] Bionic upstream stable patchset 2021-07-20 Date: Tue, 20 Jul 2021 10:01:23 -0700 Message-Id: <20210720170123.24243-1-kamal@canonical.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" This pull request (30 commits) includes the following Bionic stable patchsets: Bionic update: upstream stable patchset 2021-07-20 Ported from the following upstream stable releases: v4.14.239, v4.19.197 https://bugs.launchpad.net/bugs/1936960 -Kamal --- The following changes since commit f77cfcfff2afb16d78a8830cc259f8d51f938b78: UBUNTU: upstream stable to v4.14.238, v4.19.196 (2021-07-13 12:57:34 -0700) are available in the Git repository at: git://kernel.ubuntu.com/ubuntu-stable/ubuntu-stable-bionic.git tags/bionic-stable-2021-07-20 for you to fetch changes up to b715840f8b6bf442f71e58da2ee1d81422a6409e: UBUNTU: upstream stable to v4.14.239, v4.19.197 (2021-07-20 09:22:42 -0700) ---------------------------------------------------------------- Alex Shi (1): mm: add VM_WARN_ON_ONCE_PAGE() macro Anson Huang (1): ARM: dts: imx6qdl-sabresd: Remove incorrect power supply assignment Christian König (1): drm/nouveau: fix dma_address check for CPU/GPU sync Hugh Dickins (13): mm/thp: try_to_unmap() use TTU_SYNC for safe splitting mm/thp: fix vma_address() if virtual address below file offset mm: page_vma_mapped_walk(): use page for pvmw->page mm: page_vma_mapped_walk(): settle PageHuge on entry mm: page_vma_mapped_walk(): use pmde for *pvmw->pmd mm: page_vma_mapped_walk(): prettify PVMW_MIGRATION block mm: page_vma_mapped_walk(): crossing page table boundary mm: page_vma_mapped_walk(): add a level of indentation mm: page_vma_mapped_walk(): use goto instead of while (1) mm: page_vma_mapped_walk(): get vma_address_end() earlier mm/thp: fix page_vma_mapped_walk() if THP mapped by ptes mm/thp: another PVMW_SYNC fix in page_vma_mapped_walk() mm, futex: fix shared futex pgoff on shmem huge page Jue Wang (1): mm/thp: fix page_address_in_vma() on file THP tails Juergen Gross (1): xen/events: reset active flag for lateeoi events later Kamal Mostafa (1): UBUNTU: upstream stable to v4.14.239, v4.19.197 ManYi Li (1): scsi: sr: Return appropriate error code when disk is ejected Miaohe Lin (2): mm/rmap: remove unneeded semicolon in page_not_mapped() mm/rmap: use page_not_mapped in try_to_unmap() Michal Hocko (1): include/linux/mmdebug.h: make VM_WARN* non-rvals Petr Mladek (2): kthread_worker: split code for canceling the delayed work timer kthread: prevent deadlock when kthread_mod_delayed_work() races with kthread_cancel_delayed_work_sync() Sean Young (1): kfifo: DECLARE_KIFO_PTR(fifo, u64) does not work on arm 32 bit Tony Lindgren (2): clocksource/drivers/timer-ti-dm: Add clockevent and clocksource support clocksource/drivers/timer-ti-dm: Prepare to handle dra7 timer wrap issue Yang Shi (1): mm: thp: replace DEBUG_VM BUG with VM_WARN when unmap fails for split afzal mohammed (1): ARM: OMAP: replace setup_irq() by request_irq() arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 4 - arch/arm/mach-omap1/pm.c | 13 ++- arch/arm/mach-omap1/time.c | 10 +-- arch/arm/mach-omap1/timer32k.c | 10 +-- arch/arm/mach-omap2/timer.c | 126 +++++++++++++++----------- debian.master/upstream-stable | 4 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +- drivers/scsi/sr.c | 2 + drivers/xen/events/events_base.c | 23 ++++- include/linux/hugetlb.h | 16 ---- include/linux/kfifo.h | 3 +- include/linux/mmdebug.h | 21 ++++- include/linux/pagemap.h | 13 +-- include/linux/rmap.h | 3 +- kernel/futex.c | 2 +- kernel/kthread.c | 77 ++++++++++------ mm/huge_memory.c | 26 ++---- mm/hugetlb.c | 5 +- mm/internal.h | 53 ++++++++--- mm/page_vma_mapped.c | 160 ++++++++++++++++++++------------- mm/rmap.c | 48 ++++++---- 21 files changed, 366 insertions(+), 257 deletions(-)