From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752491AbbDTEy1 (ORCPT ); Mon, 20 Apr 2015 00:54:27 -0400 Received: from ozlabs.org ([103.22.144.67]:33766 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751058AbbDTEy0 (ORCPT ); Mon, 20 Apr 2015 00:54:26 -0400 Date: Mon, 20 Apr 2015 14:54:18 +1000 From: Stephen Rothwell To: "Michael S. Tsirkin" , Rusty Russell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the vhost tree with the virtio tree Message-ID: <20150420145418.730f0520@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/6adTYTJ1NO+B/o/C88xSkDv"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/6adTYTJ1NO+B/o/C88xSkDv Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Michael, Today's linux-next merge of the vhost tree got a conflict in drivers/virtio/virtio_balloon.c between commit df81b29c7b81 ("virtio_balloon: transitional interface") from the virtio tree and commit 263f23c089f2 ("virtio_balloon: transitional interface") from the vhost tree. I fixed it up (by using the version of the files from the virtio tree) and can carry the fix as necessary. Please clean up this mess ... --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/6adTYTJ1NO+B/o/C88xSkDv Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJVNIZ+AAoJEMDTa8Ir7ZwVF6UP/jj7M0AzPNVSJegn625UeANb dIgVujfyLwuiJr3Y5+ACFzGAnZdHeE28BCxX8+eE/WqdP7FzlK/Ui0B/j44OlSFm rYFfwubPSb+L1UY0a086TZPZyjAALnOJRnmaxD1iYW4EHGV3aPPnudzruUKagV3W Ufs0m7PJ662/4EfoMy0T7RhQaooWeEKIYpr7GFVZ/9oHhF2tZ0EW/G8ZokWj+siG TD6h5eHmDe1LS6sxM2+dt/byqFJ0eTE98tJCEJlu7WoMdWn6irHY7z25qCdZXKD8 JkThtRL0/mPHx5Ixs5hxQKUR7QFH2lUFA5e25CmXKI0BDMNucDRBslvQo72r7Ocn Heh4MmU+/zaD5Nqcj+8uiR6hqHqx9lHHxA8z2UDmAYyll7zdePK4ARUlIeci5BBl XmZ6yK8NkAMr3W0ADA+mSNGifiJHMDAXPlZ+mm5qAEqUyKT0YetjZ0nGiQQVqHRY BacYNgqvRFjxdnG/RBjj2nMrh7bb86f3j14pK9F/isx1F9R+7CdNpjzPaAjvNvVp IcOph7fP8mA5hYkqifS6RJh4NpzuMlbNQjuB3vRQaaDnhCIQtaxEH66mSxCKCN3K mU7Ru4W5DaQN4TFttvauYw6xoHqyy/zqqj3TvveoEM0cZvZuxuOKsgm8dT76HyOL 5BEJnJOXPVz1g42Qsymd =tF1D -----END PGP SIGNATURE----- --Sig_/6adTYTJ1NO+B/o/C88xSkDv--