Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 17 Mar 2021 08:07:44 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Wei Liu <wei.liu@kernel.org>
Cc:     Borislav Petkov <bp@suse.de>, Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Juergen Gross <jgross@suse.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michael Kelley <mikelley@microsoft.com>
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

--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 <wei.liu@kernel.org> 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--