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:   Thu, 13 Jun 2019 15:53:44 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Nadav Amit <namit@vmware.com>
Subject: linux-next: manual merge of the char-misc tree with the driver-core
 tree
Message-ID: <20190613155344.64fce8b9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/U4N4kI9k/xWKLnuuvxrCEXi"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/U4N4kI9k/xWKLnuuvxrCEXi
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  drivers/misc/vmw_balloon.c

between commit:

  225afca60b8a ("vmw_balloon: no need to check return value of debugfs_crea=
te functions")

from the driver-core tree and commits:

  83a8afa72e9c ("vmw_balloon: Compaction support")
  5d1a86ecf328 ("vmw_balloon: Add memory shrinker")

from the char-misc tree.

I fixed it up (see below) 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

diff --cc drivers/misc/vmw_balloon.c
index fdf5ad757226,043eed845246..000000000000
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@@ -1553,15 -1942,26 +1932,24 @@@ static int __init vmballoon_init(void
  	if (x86_hyper_type !=3D X86_HYPER_VMWARE)
  		return -ENODEV;
 =20
- 	for (page_size =3D VMW_BALLOON_4K_PAGE;
- 	     page_size <=3D VMW_BALLOON_LAST_SIZE; page_size++)
- 		INIT_LIST_HEAD(&balloon.page_sizes[page_size].pages);
-=20
-=20
  	INIT_DELAYED_WORK(&balloon.dwork, vmballoon_work);
 =20
+ 	error =3D vmballoon_register_shrinker(&balloon);
+ 	if (error)
+ 		goto fail;
+=20
 -	error =3D vmballoon_debugfs_init(&balloon);
 -	if (error)
 -		goto fail;
 +	vmballoon_debugfs_init(&balloon);
 =20
+ 	/*
+ 	 * Initialization of compaction must be done after the call to
+ 	 * balloon_devinfo_init() .
+ 	 */
+ 	balloon_devinfo_init(&balloon.b_dev_info);
+ 	error =3D vmballoon_compaction_init(&balloon);
+ 	if (error)
+ 		goto fail;
+=20
+ 	INIT_LIST_HEAD(&balloon.huge_pages);
  	spin_lock_init(&balloon.comm_lock);
  	init_rwsem(&balloon.conf_sem);
  	balloon.vmci_doorbell =3D VMCI_INVALID_HANDLE;

--Sig_/U4N4kI9k/xWKLnuuvxrCEXi
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0B5OgACgkQAVBC80lX
0GxkTgf/RYWZ6v9hX/MnklSXgcgWAgzRuGzVzUfYl9gfy3bW0KZI4wxdqbummx5m
F/+Y6QsnOuLSwGjUBlR/Nk1bCAKTV7qPqY1SBJD9sFjt5Z5pGEAkDzI/flatV5tv
jB96Wr3Z/5dkqDIycEeoAdM2241iSZx0rxYo1tUwWlBfoJ3xdC+7/rcJweoSvhgd
c9DIDstLJJuHO82AcLqwYK+LdCRemVbywVU25LxgxVVcoEZQburqmpBv6BEmzXF3
uiSdXBD68z583JYiZD5DN8Rtajzvdq96XDWxRxXTkjb4pcYO3EUMKRmYNWaIPKKv
l4o8AbVhboykwOlx3/IgxDRTjwiqPw==
=vazS
-----END PGP SIGNATURE-----

--Sig_/U4N4kI9k/xWKLnuuvxrCEXi--