From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 3A048C433F5 for ; Fri, 11 Feb 2022 04:09:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242154AbiBKEJ1 (ORCPT ); Thu, 10 Feb 2022 23:09:27 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:46568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230111AbiBKEJ0 (ORCPT ); Thu, 10 Feb 2022 23:09:26 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB8BD95; Thu, 10 Feb 2022 20:09:25 -0800 (PST) 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 4Jw0Vl3NPqz4xcZ; Fri, 11 Feb 2022 15:09:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1644552561; bh=VUVojCKKHWJKmWHANxS0TOL5/b0Vvl062S8oKMsUMXU=; h=Date:From:To:Cc:Subject:From; b=X4BafQYNtpR9G23Lo5DB0dMiuWtJPpvuPKrmkUzS0D2FfFFfDfvYxnTSW/7/eGBmJ ze8E6zWE3H0G7DcrdFEANtSkTmt9kjvUJuV73YAUQn9oB6o/YQMMYewo87feuevoc0 ILRO90NIJ1XJtohzPAQpl1/9M84p4JcSe1fNw7SipZB6jwAI7qB/0X8fcNCUFJiv2l k9+O4AaAGyRSmgRwvcZxAfjA6NtlbAhAKwrAWreFTBz2p49FTe+tffKLrzUL2IL/4O HoLf6wVxWU/ttQNT0Hf55FEcHOvFldAtHDj4B6qkUQWhHaZKdJeO2bYCqbBuQUiChf E5nNkse/p6bUQ== Date: Fri, 11 Feb 2022 15:09:15 +1100 From: Stephen Rothwell To: Jonathan Cameron Cc: Cai Huoqing , Cai Huoqing , Linux Kernel Mailing List , Linux Next Mailing List , Marc Kleine-Budde Subject: linux-next: manual merge of the iio tree with Linus' tree Message-ID: <20220211150915.712009a0@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/RsAQV=bWgI+mxumJR4XMy9w"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/RsAQV=bWgI+mxumJR4XMy9w Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the iio tree got a conflict in: .mailmap between commit: 984d1efff230 ("mailmap: update email address of Brian Silverman") from Linus' tree and commit: f3366f8e6464 ("mailmap: Update email address for Cai Huoqing") from the iio 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. --=20 Cheers, Stephen Rothwell diff --cc .mailmap index 8cd44b0c6579,76dd303c7eac..000000000000 --- a/.mailmap +++ b/.mailmap @@@ -70,7 -70,7 +70,8 @@@ Boris Brezillon Brian Avery Brian King +Brian Silverman + Cai Huoqing Changbin Du Changbin Du Chao Yu --Sig_/RsAQV=bWgI+mxumJR4XMy9w Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIF4WsACgkQAVBC80lX 0GxDqQgApGlLLS5f/rq5gu1zLJ0oxN/F5zigNo1TdqjIKEFdZ8ti1IIH3pD9DgVB Cev5hj4OWD+UTv+RG4gvFSYfDjfg3/bHWwBhS0BzdPevYhgM0pEIxeAEpsfa+zgF 0oU303tpGThx0Tti9MNDoRPMXBy1vmrb+n3zg4LMyMvdi/zQLUXigMC5fymywDaz tBxJRIJWYtSLsrIiJ4eNN/tIU/D9LYquFXaGG8uB2/oJfPHjuxIpKd84V+izd/7+ L2xFam4MiSs5YSuAoDyJVvQRV1OtXFY20k6cnxCMLKkEiWfqKysRogVdEwHBL0zN gwH8jl1GdLXIcIlV+eSsTJbWxF7erA== =EWHb -----END PGP SIGNATURE----- --Sig_/RsAQV=bWgI+mxumJR4XMy9w--