From patchwork Wed Aug 18 00:08:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12442367 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C6D8C4338F for ; Wed, 18 Aug 2021 00:11:31 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 491F460FD9 for ; Wed, 18 Aug 2021 00:11:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 491F460FD9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=r7QsWN+5v6O3ty4jmH697n5F53ZJY8lY7hfSK1msI5Y=; b=DAt +jhzOizIE11wXDjasOZsEN2tJZ9BtX0DCXx2t9BBVtdNSi9Rtd/KvtmQrJUgHBAbWiz5Fj06VVOSf C5qOT7Vlnnt9odrWj1tEUM12lKFySgON3VumykrG/ybFUvFcIcKD+wB4zg8ltIy5maLPJy7AyVwWs +h0NA+bwRdFcCK9tNsYqrD2OEOJh8azDAaOEmeQPuU4bYTLmqik5Y1bZDdIhy506/IGlWRHSUqqau /ndQp0OJZGS3w6jrIWiO0wQglhBObIz9BdtUl0ESA1SNGUX1Dad75GpBznGjMKbrilyvUbHrU6unP bL/hEFYfeFpPD7F/wvmhbUcGANlGvJQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mG98V-003jeT-Iq; Wed, 18 Aug 2021 00:08:51 +0000 Received: from bilbo.ozlabs.org ([203.11.71.1] helo=ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mG98P-003jd6-1a for linux-arm-kernel@lists.infradead.org; Wed, 18 Aug 2021 00:08:49 +0000 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 4Gq7XP2H37z9sW8; Wed, 18 Aug 2021 10:08:21 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1629245304; bh=XVMQS6JAFV88LeSd1MLQZxVAyfJ2wKxPaOhSvniaduA=; h=Date:From:To:Cc:Subject:From; b=KifRnmE/ZE618ppmFgz3zitzg4kvgfLRzZFOaKBc40bSUcffJvcQYBhUxxwnBtA29 FpoQX7p6u7KcMGfUn9kraZPn1IVfQP08yoXDy4o5UYF57uAedW2WGsFCnEs+IsA6iO 1U0pdJKU+Zvuo/jsIMaewVXwrvVvaepm7ASWO29d+CEscPShXe8X1dvR/fEphsnBog QzhpXbyNxi9E7uty8L36yWV5xd7+ap5ZKrk90uHlAcgcetN36vzfbwVcjaamt3+beR LRUzq+hh9b12C+U7M5jQ0EzrHbQRXyH/OOwCFKXt2WqFPsAFe2tmALOH8GWAXzNem9 eqnKzn+jOsG2g== Date: Wed, 18 Aug 2021 10:08:19 +1000 From: Stephen Rothwell To: Wolfram Sang , Olof Johansson , Arnd Bergmann , ARM Cc: Conghui Chen , Cristian Marussi , Igor Skalkin , Jie Deng , Linux Kernel Mailing List , Linux Next Mailing List , Peter Hilber , Sudeep Holla , Wolfram Sang Subject: linux-next: manual merge of the i2c tree with the arm-soc tree Message-ID: <20210818100819.10927d37@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210817_170845_276543_A7A9D3C7 X-CRM114-Status: GOOD ( 16.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the i2c tree got a conflict in: include/uapi/linux/virtio_ids.h between commit: 46abe13b5e3d ("firmware: arm_scmi: Add virtio transport") from the arm-soc tree and commit: 8fb12751ac78 ("i2c: virtio: add a virtio i2c frontend driver") from the i2c 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 include/uapi/linux/virtio_ids.h index f74155f6882d,99aa27b100bc..000000000000 --- a/include/uapi/linux/virtio_ids.h