From nobody Thu Dec 18 07:57:20 2025 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 A14D9C001E0 for ; Tue, 15 Aug 2023 01:54:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234048AbjHOBxd (ORCPT ); Mon, 14 Aug 2023 21:53:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234054AbjHOBxa (ORCPT ); Mon, 14 Aug 2023 21:53:30 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8544DB0; Mon, 14 Aug 2023 18:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1692064408; bh=/yI6gnWPXeMs75/SF7gnZEHG4nmUt3Yp6v7q6Xf82kE=; h=Date:From:To:Cc:Subject:From; b=U0ysCnF2KMLJdAJQUUpRiQRtzeUEF1xjCeFr905CLIgyqHIccdcOiHe/Hmok2OVpj JxKxO+p+wj2qjmjLSt/R46+SVxWXhRAnlky4Za9VX8Sx9f8n94KoZm/2Rg9HIMo96k AxPjBqmAiEfXP22AEA6+cx7qrln0Lwz5rylpuvaQydbKIs1kFFroMUbMz/bSGf0/LL wbZYuu90RGvJilqC0+0NiyLhBIaH1UQOmMqVqPk9yNWUKn56MC4Ujh++Z/B6ErSpXl mEQXc0O6TC0W+6qkyj1Rn0DlrENycHeuJP9EH5QsTDxsLHbCjnWKQNz3RE4VWf9z/4 u0BYawOkNG7Ng== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RPvS73DVcz4wb5; Tue, 15 Aug 2023 11:53:27 +1000 (AEST) Date: Tue, 15 Aug 2023 11:53:25 +1000 From: Stephen Rothwell To: Jiri Kosina , Benjamin Tissoires Cc: Andrew Morton , Bjorn Andersson , David Rheinsberg , Jiri Kosina , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the hid tree with Linus' tree Message-ID: <20230815115325.0d20b960@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/jf=mXhClskyeMoY0yKNBYqE"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/jf=mXhClskyeMoY0yKNBYqE Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the hid tree got a conflict in: .mailmap between commit: 286812b041cc ("mailmap: update remaining active codeaurora.org email addr= esses") from Linus' tree and commit: 0c4b9411f363 ("MAINTAINERS: update my email address") from the hid 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 5dd318121982,cea699139e6d..000000000000 --- a/.mailmap +++ b/.mailmap @@@ -138,10 -119,10 +138,13 @@@ Daniel Borkmann =20 Daniel Borkmann Daniel Borkmann David Brownell +David Collins + David Rheinsberg + David Rheinsberg + David Rheinsberg David Woodhouse +Dedy Lansky +Deepak Kumar Singh Dengcheng Zhu Dengcheng Zhu Dengcheng Zhu --Sig_/jf=mXhClskyeMoY0yKNBYqE Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTa2pUACgkQAVBC80lX 0GxPzgf+L3QhsDc9Hr1KPqZwQre48dudDb9lyhDaNonLWTO9sbbchrv6H4tQAZ9I VzjvZCmiUv0yWaGDxjEva72EwXkCT2W0zV3KFZ3HUbgZqKKu/8tIutJ8urV6rfH5 tHeCs9W+VPyf9VvCJC8rQ0gzXba5VvR+4WoqhBL8OEVBTgpKHVWwjiHiofCNt4WR Ld349i3M58A6My08Zc4VI1l/OZXcY+EDxR+1vzDV88ZpyMcmDjrgjjFn+tM/zyMo QSYU3T/9lJImCbgOUc7Se2ANUt/0Od4NSsZob2/j9VR+T7VouXH0cxAMwlgApZLg c955sSO1vKMVYG9jJwXVMZ/iifSojg== =Ji3X -----END PGP SIGNATURE----- --Sig_/jf=mXhClskyeMoY0yKNBYqE--