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 X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 E1498C432BE for ; Wed, 1 Sep 2021 04:23:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE22460F9E for ; Wed, 1 Sep 2021 04:23:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236217AbhIAEYF (ORCPT ); Wed, 1 Sep 2021 00:24:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbhIAEYE (ORCPT ); Wed, 1 Sep 2021 00:24:04 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12E66C061575; Tue, 31 Aug 2021 21:23:08 -0700 (PDT) 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 4GzrWj3PTBz9sRN; Wed, 1 Sep 2021 14:22:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1630470184; bh=QVGYJTbvW0WF1fUfaf4tWknJbshw01BG4Gxa9ed0MUM=; h=Date:From:To:Cc:Subject:From; b=AI/vxfob+q65nwX5RMt9BfZuccVX26N1NZg+YCXefpMBVbcJjJNx9SWk4blbHjTTc 23H4d6pOlFVI4WYp6i8ZXg8i40w2PTojHCQU/lYlVVFhMzcGCBEY0NGjVbAvDfXNv9 2/m3RFHVV4FgNdEirzgGFLHWJbV6Z1OJKpDSprfqa6bYfgu709mfMEO46Pe2ajhtJg DUV/g2qwPm2YXrAuxNX0kDlDvlp4L55Clt3qDYU9mnHWHDtWDK4G14lmyTHCfYMUiC 2/4km8ay46byO5sobEL13wf5q7i5aAcA43Fy2pLVWkihS0u3SlHkDCOWyEJLa67S27 Z1tUSqP7bDh/Q== Date: Wed, 1 Sep 2021 14:22:55 +1000 From: Stephen Rothwell To: "Michael S. Tsirkin" , 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 , Viresh Kumar , Wolfram Sang Subject: linux-next: manual merge of the vhost tree with the arm-soc and Linus' trees Message-ID: <20210901142255.1189dd71@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/9JNJFV5mlQs9ZSnWjTTHMgh"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/9JNJFV5mlQs9ZSnWjTTHMgh Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the vhost tree got a conflict in: include/uapi/linux/virtio_ids.h between commits: 46abe13b5e3d ("firmware: arm_scmi: Add virtio transport") 3cfc88380413 ("i2c: virtio: add a virtio i2c frontend driver") from the arm-soc and Linus' trees and commit: df2fd4361a56 ("uapi: virtio_ids: Sync ids with specification") from the vhost tree. I fixed it up (the latter included the changes form the former commits, so I juts used that) 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 --Sig_/9JNJFV5mlQs9ZSnWjTTHMgh Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmEvAB8ACgkQAVBC80lX 0Gye8wgAky5thkjxdw6QO4Ek88qchgaqQjC/QcWVze5DixqD/LPsuiuHhwwxXDy8 vdhZaW6yyLYGJwCFHMwYMSxlmC9nsq7buUUvjkCpR5RrrqC4qyWoJuzL42GUGbBh DCC0y7tYPR04c9D21EbaK38VCHXw9vVMp3zGVU6Lfimfh5z90x3sL6kXNmIK7+9M kFB70YgLnwEKtku/msIpG1i78Gr0xN/YDlCL44fHOiooUiY4O4IQFx9WAC29HMGy jju4Dc3XsX1UAHIRhjAgaHOx3mmfBiosygtEgMTAcqz4Sd12Jvf8oqobozNm42TZ IPKBrvBc5ADSY3H9sUchAnhqNez/NA== =jFO8 -----END PGP SIGNATURE----- --Sig_/9JNJFV5mlQs9ZSnWjTTHMgh-- 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 X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 2DA03C432BE for ; Wed, 1 Sep 2021 04:25:53 +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 E21C861054 for ; Wed, 1 Sep 2021 04:25:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E21C861054 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=GeJUFPYxFMyRRXLZ7Fh0ar52THQfwx2tT6mj9t+Pm3s=; b=gzO /h3XVuKlSMFUNrCW4HGm4srVK17L/gzrIKeWVPAXoxI3YtkIqNtvDbubyW5YJ8q9uaeHvMITkSieJ HTfXDftPTAydUifUiXOt9AX0vvz5HwWUV7/4qfy/Ef0EsmNUTozEqwDAlh0/YTQkG3wYWY2RXHFhe H0o4rANY68Z4oYsDcmF8vjCLHCO0bpsGoAR5sGfjwzIC2KESQpb6lw9SM1qTeXfGY3WYNXJsUX8Zd yOXPnp7FFfUo+jnLrGNOQrZ4JxPWvsFnP+kUKgjNiQ9nMcfNT4BDzfqORVU5Pan5bPmXuI/27i/a0 hZVngccKT/Q+uYXylMNslMvSKnoHQgg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLHmM-003lyc-D0; Wed, 01 Sep 2021 04:23:14 +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 1mLHmG-003ly1-IA for linux-arm-kernel@lists.infradead.org; Wed, 01 Sep 2021 04:23:12 +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 4GzrWj3PTBz9sRN; Wed, 1 Sep 2021 14:22:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1630470184; bh=QVGYJTbvW0WF1fUfaf4tWknJbshw01BG4Gxa9ed0MUM=; h=Date:From:To:Cc:Subject:From; b=AI/vxfob+q65nwX5RMt9BfZuccVX26N1NZg+YCXefpMBVbcJjJNx9SWk4blbHjTTc 23H4d6pOlFVI4WYp6i8ZXg8i40w2PTojHCQU/lYlVVFhMzcGCBEY0NGjVbAvDfXNv9 2/m3RFHVV4FgNdEirzgGFLHWJbV6Z1OJKpDSprfqa6bYfgu709mfMEO46Pe2ajhtJg DUV/g2qwPm2YXrAuxNX0kDlDvlp4L55Clt3qDYU9mnHWHDtWDK4G14lmyTHCfYMUiC 2/4km8ay46byO5sobEL13wf5q7i5aAcA43Fy2pLVWkihS0u3SlHkDCOWyEJLa67S27 Z1tUSqP7bDh/Q== Date: Wed, 1 Sep 2021 14:22:55 +1000 From: Stephen Rothwell To: "Michael S. Tsirkin" , 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 , Viresh Kumar , Wolfram Sang Subject: linux-next: manual merge of the vhost tree with the arm-soc and Linus' trees Message-ID: <20210901142255.1189dd71@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210831_212308_802499_65B175B8 X-CRM114-Status: GOOD ( 15.03 ) 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: , Content-Type: multipart/mixed; boundary="===============3243463005667318216==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============3243463005667318216== Content-Type: multipart/signed; boundary="Sig_/9JNJFV5mlQs9ZSnWjTTHMgh"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/9JNJFV5mlQs9ZSnWjTTHMgh Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the vhost tree got a conflict in: include/uapi/linux/virtio_ids.h between commits: 46abe13b5e3d ("firmware: arm_scmi: Add virtio transport") 3cfc88380413 ("i2c: virtio: add a virtio i2c frontend driver") from the arm-soc and Linus' trees and commit: df2fd4361a56 ("uapi: virtio_ids: Sync ids with specification") from the vhost tree. I fixed it up (the latter included the changes form the former commits, so I juts used that) 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 --Sig_/9JNJFV5mlQs9ZSnWjTTHMgh Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmEvAB8ACgkQAVBC80lX 0Gye8wgAky5thkjxdw6QO4Ek88qchgaqQjC/QcWVze5DixqD/LPsuiuHhwwxXDy8 vdhZaW6yyLYGJwCFHMwYMSxlmC9nsq7buUUvjkCpR5RrrqC4qyWoJuzL42GUGbBh DCC0y7tYPR04c9D21EbaK38VCHXw9vVMp3zGVU6Lfimfh5z90x3sL6kXNmIK7+9M kFB70YgLnwEKtku/msIpG1i78Gr0xN/YDlCL44fHOiooUiY4O4IQFx9WAC29HMGy jju4Dc3XsX1UAHIRhjAgaHOx3mmfBiosygtEgMTAcqz4Sd12Jvf8oqobozNm42TZ IPKBrvBc5ADSY3H9sUchAnhqNez/NA== =jFO8 -----END PGP SIGNATURE----- --Sig_/9JNJFV5mlQs9ZSnWjTTHMgh-- --===============3243463005667318216== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============3243463005667318216==--