Subject: linux-next: manual merge of the crypto tree with the arm-perf, arm64 trees

From: Stephen Rothwell <[email-masked]>
Date: Thu, 7 Jul 2022 11:31:10 +1000

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.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 027d9a232107,b04fb3324837..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9069,13 -8936,8 +9069,14 @@@ F:	Documentation/admin-guide/perf/hisi-
  F:	Documentation/admin-guide/perf/hisi-pmu.rst
  F:	drivers/perf/hisilicon
  
 +HISILICON HNS3 PMU DRIVER
 +M:	Guangbin Huang <[email-masked]>
 +S:	Supported
 +F:	Documentation/admin-guide/perf/hns3-pmu.rst
 +F:	drivers/perf/hisilicon/hns3_pmu.c
 +
- HISILICON QM AND ZIP Controller DRIVER
+ HISILICON QM DRIVER
+ M:	Weili Qian <[email-masked]>
  M:	Zhou Wang <[email-masked]>
  L:	[email-masked]
  S:	Maintained