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 15768C433E0 for ; Tue, 16 Mar 2021 21:08:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD76864F8F for ; Tue, 16 Mar 2021 21:08:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232321AbhCPVIQ (ORCPT ); Tue, 16 Mar 2021 17:08:16 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:35277 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229584AbhCPVHu (ORCPT ); Tue, 16 Mar 2021 17:07:50 -0400 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 4F0Qq70RfNz9sVm; Wed, 17 Mar 2021 08:07:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1615928868; bh=KOfhboZ2EAC/BynPOrI8fT0IbPi+1mIjnRowCgT+YQo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=KUB0csnqr3khC2vUcnOlttFhjF5QZ/bZ1RwojvGWUJkuS7KjmGjPGKx69SSsJuNo+ TNeCA45q4BRHE8QiDusVHJdGsrJz07ZkOzzRsFT5YICqVO0w9QvSw0fJ+GkY2a8njf gFbtyrlNNMrUIUUHiZXwrIrXTSJhOmMHfGT6GDwjaIYIEabWtC8ARNIT+VaVy3jSCv czMcYCq1am7P4FSroeL7rCVCOcAAgODkwOG3odR80v6yViUCl67A3GrcPZnasgaEm4 fAej9UpnXsuAAaCgDXq0K9leWeH+9rOQcZFXkyTAlN2E9s2ohvvp9pSvomZ8NYVf73 YFHFNet9RsnJQ== Date: Wed, 17 Mar 2021 08:07:44 +1100 From: Stephen Rothwell To: Wei Liu Cc: Borislav Petkov , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Juergen Gross , Linux Kernel Mailing List , Linux Next Mailing List , Michael Kelley Subject: Re: linux-next: manual merge of the hyperv tree with the tip tree Message-ID: <20210317080744.33f5c6a9@canb.auug.org.au> In-Reply-To: <20210316150554.32xtihkhvdkup3eq@liuwe-devbox-debian-v2> References: <20210315143505.35af617b@canb.auug.org.au> <20210316150254.GC18822@zn.tnic> <20210316150554.32xtihkhvdkup3eq@liuwe-devbox-debian-v2> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/WLrdil7jlpsOmUPVPVSbx0I"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/WLrdil7jlpsOmUPVPVSbx0I Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Tue, 16 Mar 2021 15:05:54 +0000 Wei Liu wrote: > > > Right, > >=20 > > so tglx and I took a quick look and came to the conclusion that it would > > be best if you - provided it is not too much trouble - keep applying > > this patch so that linux-next can get tested properly and we - Wei or I > > - explain this merge conflict in our pull requests during the next merge > > window and ask Linus to merge your patch ontop. This way we'll save us > > the cross-tree merging dance. =20 >=20 > Totally agreed. :-) >=20 > I've made a note to inform Linus about this in the next merge window. No worries, I will keep applying the patch (my setup allows that to happen automatically). Linus should apply it as a part of the merge resolution (as do I). --=20 Cheers, Stephen Rothwell --Sig_/WLrdil7jlpsOmUPVPVSbx0I Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmBRHiAACgkQAVBC80lX 0Gx+Rgf/bfAhsBXyqL5Zai6OUKdZbC1+XfBnAGJ8k/fENNYMje8yQ6/h2+T9hsmG 5I6uoiXQjWwonUfGbDqJ5hu525Ap/qZdYVok7M0GxgtE5Q/reSr8rg51GLY8MFYz trZhPblpvMncwQ4QdfvssgZVILz6cnennHAvDDXu//qZM7gYIAwKRg8jZlC/+6uK MPuh+OOQw+R+HQGNdUMKJCy91vzGYxO/tHZgvgD5zcDC4RfZeNkiTt6mqT4NUqET eTQCFb+F2WP4FhL8HvJ6UiiugGmyFIl5uX9NxLi6Fvp9yc8j6Lj2sdZkuxkZzD4+ JUTrP4sUmJv5FBXxu0YyRsjKKVhQbw== =wI+K -----END PGP SIGNATURE----- --Sig_/WLrdil7jlpsOmUPVPVSbx0I--