From patchwork Tue May 17 08:17:37 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 12852094
Return-Path: <linux-parisc-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 540D9C433EF
	for <linux-parisc@archiver.kernel.org>; Tue, 17 May 2022 08:18:15 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S242922AbiEQISN (ORCPT <rfc822;linux-parisc@archiver.kernel.org>);
        Tue, 17 May 2022 04:18:13 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43850 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S243198AbiEQISE (ORCPT
        <rfc822;linux-parisc@vger.kernel.org>);
        Tue, 17 May 2022 04:18:04 -0400
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2519E49911;
        Tue, 17 May 2022 01:17:45 -0700 (PDT)
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
        (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
         key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits)
 server-digest SHA256)
        (No client certificate requested)
        by mail.ozlabs.org (Postfix) with ESMTPSA id 4L2TWR2YKSz4xXk;
        Tue, 17 May 2022 18:17:39 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1652775460;
        bh=572SuXd7v4FRWek+kcJo9wkb5oH+FJnOllGT7clrH8g=;
        h=Date:From:To:Cc:Subject:From;
        b=S537oM7FIdlQhaKxoFDpQwJXehRPgBgifW16Xqr72nv4PfhwYl4Oiejovec8Qax7Y
         6m+bRkqy8O2VLJHCT7XX10FW+tzFON1B4xGyVyALDIYGYTR4dxQr8t8iWNKi5dqeuM
         Fyzgf0wmWBe72mD8jaW5YsxgHRb5M0U4PoBkGdMK+bi/MwrorCb0eyEigu5UM8Q9bk
         moVpRfB7JCEuwL3phTFv9JfSaKGnvb4BPkBv0MZgDDfLSuyrbn9sNDBJmJZP4rgNFj
         86PRzDfypm1LWuMdHadWiVaduHqOmJmfU/DZExfZi8G1ThAKtEnzTHLRXpn1pvndbM
         YnqHE06EnuqTw==
Date: Tue, 17 May 2022 18:17:37 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
        Helge Deller <deller@gmx.de>
Cc: Parisc List <linux-parisc@vger.kernel.org>,
        John David Anglin <dave.anglin@bell.net>,
        "Liam R. Howlett" <Liam.Howlett@Oracle.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: linux-next: manual merge of the mm tree with the parisc-hd tree
Message-ID: <20220517181737.102eec7a@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <linux-parisc.vger.kernel.org>
X-Mailing-List: linux-parisc@vger.kernel.org

Hi all,

Today's linux-next merge of the mm tree got a conflict in:

  arch/parisc/kernel/cache.c

between commit:

  2d30c4586e69 ("parisc: Rewrite cache flush code for PA8800/PA8900")

from the parisc-hd tree and commit:

  25ba0672baad ("parisc: remove mmap linked list from cache handling")

from the mm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc arch/parisc/kernel/cache.c
index 0fd04073d4b6,ab7c789541bf..000000000000
--- a/arch/parisc/kernel/cache.c