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, 9 Jul 2019 09:20:03 +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: Re: linux-next: manual merge of the char-misc tree with the
 driver-core tree
Message-ID: <20190709092003.6087a9c4@canb.auug.org.au>
In-Reply-To: <20190613155344.64fce8b9@canb.auug.org.au>
References: <20190613155344.64fce8b9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/1e01G77HmLeK=CYrjp0RpJD"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/1e01G77HmLeK=CYrjp0RpJD
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 13 Jun 2019 15:53:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>=20
>   drivers/misc/vmw_balloon.c
>=20
> between commit:
>=20
>   225afca60b8a ("vmw_balloon: no need to check return value of debugfs_cr=
eate functions")
>=20
> from the driver-core tree and commits:
>=20
>   83a8afa72e9c ("vmw_balloon: Compaction support")
>   5d1a86ecf328 ("vmw_balloon: Add memory shrinker")
>=20
> from the char-misc tree.
>=20
> 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
> --=20
> Cheers,
> Stephen Rothwell
>=20
> 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;

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

--=20
Cheers,
Stephen Rothwell

--Sig_/1e01G77HmLeK=CYrjp0RpJD
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0jz6MACgkQAVBC80lX
0Gz3Kwf+N6auBRYxel7zls7Vvoiwx41cqdla7fVdMeNYbCXvZX1+tWEQM9XKFSA+
h8Q14dwEXl/TJBf2IWoJjqlUuY294CcgENn/rFSyHcpzu6vthOh2gzjcsXVSnLiA
ZmeHbP9obSEaENEXxN9aZTRGemOPxV8/+X0onw8vZysfX9t8zUSv4QdgM7hHayIl
Hst1/QXJOw+q48vUOvgv74pH4nccSubARTqo7+FlJzcpq5TMaeZ9zR1m0Xoz8FWQ
TmKh+xPT5/Gf1ubANsbg7RB3FUr7SuMfwD9/djlMWBSRxc9xRUOxq2CoibkdIZiF
vh2g5yjgRQ+95vU/hUqA0VJqWfansA==
=RT3+
-----END PGP SIGNATURE-----

--Sig_/1e01G77HmLeK=CYrjp0RpJD--