From nobody Thu Jun 25 12:00:20 2026 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 47AEAC433EF for ; Mon, 21 Feb 2022 21:19:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234635AbiBUVUN (ORCPT ); Mon, 21 Feb 2022 16:20:13 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:53638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232375AbiBUVUL (ORCPT ); Mon, 21 Feb 2022 16:20:11 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03AA4AE74; Mon, 21 Feb 2022 13:19:48 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9404C611F0; Mon, 21 Feb 2022 21:19:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D1DBC340E9; Mon, 21 Feb 2022 21:19:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645478387; bh=/3k3i5+18OgZKxICGkCzfT85CiOhYAfOPUTLxe9uoPA=; h=From:To:Cc:Subject:Date:From; b=JPPccXKveFIyLOvszoUVscl6NqZDH+dApIdkUvl3V0WoVEAWi1M6VPRM27X16Shoy U/MUdR2zTKuJY/vK1nH38OoWKkm6FbkXACGTItvA+P/SeLWZJ9mtZ1MqscEpAJWDBl npVId+WFaj4Ms3zZPdjBKrHeKEt6mBZ5jtW7VBk/xQhQzVaxH+549GVXlqUPUwfdFN mh98HTsQl9sE49xQP7lN2bpGfiJgRglWdGELRbhSkCX2aXwqrxwCHZAT0oyN6I8Bbp GXskM/ByzFfYjrb6vScuocM0l9AodPttIZLPEciBa9PJK+I1btnG/zhDhlYlql4w+s KE59tf9c8Q6Ag== From: broonie@kernel.org To: Jonathan Cameron Cc: Cai Huoqing , Cai Huoqing , Jonathan Cameron , Linux Kernel Mailing List , Linux Next Mailing List , Marc Kleine-Budde Subject: linux-next: manual merge of the iio tree with the origin tree Date: Mon, 21 Feb 2022 21:19:43 +0000 Message-Id: <20220221211943.2092199-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the iio tree got a conflict in: .mailmap between commit: 984d1efff2304 ("mailmap: update email address of Brian Silverman") from the origin tree and commit: f3366f8e64645 ("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. diff --cc .mailmap index 8cd44b0c65797,76dd303c7eac1..0000000000000 --- 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