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;
From:   Nadav Amit <namit@vmware.com>
To:     Greg KH <greg@kroah.com>
CC:     Arnd Bergmann <arnd@arndb.de>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the char-misc tree with the
 driver-core tree
Thread-Topic: linux-next: manual merge of the char-misc tree with the
 driver-core tree
Thread-Index: AQHVIaxkp0bwsFh6w0+5MKCG3RI9WabBg/6AgAABcAA=
Date:   Mon, 8 Jul 2019 23:25:12 +0000
Message-ID: <A3330909-6201-4FB6-B20B-89D8C1CE7A0C@vmware.com>
References: <20190613155344.64fce8b9@canb.auug.org.au>
 <20190709092003.6087a9c4@canb.auug.org.au>
In-Reply-To: <20190709092003.6087a9c4@canb.auug.org.au>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: vmware.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-ID: <5DD5CF10FBBCF948B753E4CF6293E6FA@namprd05.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 18b54981-2494-41f7-5874-08d703fb86b7
X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Jul 2019 23:25:12.6442
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: namit@vmware.com
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR05MB6614
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> On Jul 8, 2019, at 4:20 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote=
:
>=20
> Hi all,
>=20
> 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;
>=20
> I am still getting this conflict (the commit ids may have changed).
> Just a reminder in case you think Linus may need to know.

Greg,

Can you please take care of it, as you are the maintainer of char-misc
and the committer of the patch?