From patchwork Thu Jul  7 01:31:10 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: 12909001
X-Patchwork-Delegate: herbert@gondor.apana.org.au
Return-Path: <linux-crypto-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 3A532C433EF
	for <linux-crypto@archiver.kernel.org>; Thu,  7 Jul 2022 02:02:26 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S234684AbiGGCCZ (ORCPT <rfc822;linux-crypto@archiver.kernel.org>);
        Wed, 6 Jul 2022 22:02:25 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52578 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S234678AbiGGCCY (ORCPT
        <rfc822;linux-crypto@vger.kernel.org>);
        Wed, 6 Jul 2022 22:02:24 -0400
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BF852F031;
        Wed,  6 Jul 2022 19:02:22 -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 4Ldfmq5fYTz4xL4;
        Thu,  7 Jul 2022 12:02:19 +1000 (AEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
        s=201702; t=1657159341;
        bh=UwtjIoglRDJEKGedzdm0Ahvx+a41vhCrbpYe2EuiEYw=;
        h=Date:From:To:Cc:Subject:From;
        b=o0Bd03RSQlOUl1QxEGvhTrgpmUnJdnAH7j2M5I8TcnWM/NmHQMDiEMxOsuBtx75hW
         m82hhMRIOD0OHV1iCwrmIzKaAg5YFRbr64TiejWxjnDPQWVG+BzHUb27tdhTgbunga
         rKxZJIGszYZTOi2hjOvZK2rcNj8tK6DdwCYLo/2HUJEQzFeS0q42nbjS3T1F7QZA6K
         5GkiSDAJrY0MaKr8sYj55WqZ4lDGuV7pDSEbJ2tb/JW/5OSGnqbzaX7Cbo4tpgVWNP
         sHmgGuyEQ8Nt5FdX8HnvOP0EGExrgMV5NpM93tBp+cGQmTrQpSiUMp+8xyUKbCCzcn
         WJVyf8xAE2C2Q==
Date: Thu, 7 Jul 2022 11:31:10 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>,
        Linux Crypto List <linux-crypto@vger.kernel.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will@kernel.org>
Cc: Guangbin Huang <huangguangbin2@huawei.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Zhou Wang <wangzhou1@hisilicon.com>
Subject: linux-next: manual merge of the crypto tree with the arm-perf,
 arm64 trees
Message-ID: <20220707113110.5d11a098@canb.auug.org.au>
MIME-Version: 1.0
Precedence: bulk
List-ID: <linux-crypto.vger.kernel.org>
X-Mailing-List: linux-crypto@vger.kernel.org

Hi all,

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

  MAINTAINERS

between commit:

  66637ab137b4 ("drivers/perf: hisi: add driver for HNS3 PMU")

from the arm-perf, arm64 trees and commit:

  ce6330f74b08 ("MAINTAINERS: update HiSilicon ZIP and QM maintainers")

from the crypto 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 MAINTAINERS
index 027d9a232107,b04fb3324837..000000000000
--- a/MAINTAINERS