Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 29 Oct 2019 15:19:28 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "Michael S. Tsirkin" <mst@redhat.com>,
        "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Yin Fengwei <fengwei.yin@intel.com>
Subject: linux-next: manual merge of the vhost tree with the pm tree
Message-ID: <20191029151928.780c8ede@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/8/pO3iz7Jzmo1jr.hT+nBWe";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/8/pO3iz7Jzmo1jr.hT+nBWe
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:

  drivers/acpi/processor_idle.c

between commit:

  fa583f71a99c ("ACPI: processor_idle: Skip dummy wait if kernel is in gues=
t")

from the pm tree and commit:

  a04c0533b07c ("ACPI: disable extra P_LVLx access on KVM")

from the vhost tree.

I fixed it up (I just used the pm tree version) 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_/8/pO3iz7Jzmo1jr.hT+nBWe
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl23vdAACgkQAVBC80lX
0GwB7Af/bIMWCfmlAWbK1bcyj7T0fC3Akqzp9SKgR6ff98TmFY7LKDmRmnfE4Cvv
9TK6E8IZbXT5Fm5k0LTE9zsZxWWYlJvPr7wSfrMWg8YMZ64LXdL5SGr+HwS8u58G
P68ajYRLY6xmbyYPjQxCJ7ZcOPJK5wIrnBiZEHgKjIo7BRl5c3CRwe/C1Xef+FCM
uRkrn32jaWehpIaEak/rihhO++z/kvcPUYiAW+cIQKqVo6IgRtx0OGnI8MpllBSL
gvzAla2ApKLoRmuMEDwQYxRXcO43/ZwuPgdy7h5ce7xM59ERfwjLJsIRHZO8XZuC
KTII8JFVnlP7Bg7UNZ/KUWHW4ZrIRg==
=C/QN
-----END PGP SIGNATURE-----

--Sig_/8/pO3iz7Jzmo1jr.hT+nBWe--