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
Date: Mon, 8 Jul 2019 23:25:12 +0000 [thread overview]
Message-ID: <A3330909-6201-4FB6-B20B-89D8C1CE7A0C@vmware.com> (raw)
In-Reply-To: <20190709092003.6087a9c4@canb.auug.org.au>
> On Jul 8, 2019, at 4:20 PM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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:
>>
>> drivers/misc/vmw_balloon.c
>>
>> between commit:
>>
>> 225afca60b8a ("vmw_balloon: no need to check return value of debugfs_create 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.
>>
>> --
>> 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 != X86_HYPER_VMWARE)
>> return -ENODEV;
>>
>> - for (page_size = VMW_BALLOON_4K_PAGE;
>> - page_size <= VMW_BALLOON_LAST_SIZE; page_size++)
>> - INIT_LIST_HEAD(&balloon.page_sizes[page_size].pages);
>> -
>> -
>> INIT_DELAYED_WORK(&balloon.dwork, vmballoon_work);
>>
>> + error = vmballoon_register_shrinker(&balloon);
>> + if (error)
>> + goto fail;
>> +
>> - error = vmballoon_debugfs_init(&balloon);
>> - if (error)
>> - goto fail;
>> + vmballoon_debugfs_init(&balloon);
>>
>> + /*
>> + * Initialization of compaction must be done after the call to
>> + * balloon_devinfo_init() .
>> + */
>> + balloon_devinfo_init(&balloon.b_dev_info);
>> + error = vmballoon_compaction_init(&balloon);
>> + if (error)
>> + goto fail;
>> +
>> + INIT_LIST_HEAD(&balloon.huge_pages);
>> spin_lock_init(&balloon.comm_lock);
>> init_rwsem(&balloon.conf_sem);
>> balloon.vmci_doorbell = 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.
Greg,
Can you please take care of it, as you are the maintainer of char-misc
and the committer of the patch?
next prev parent reply other threads:[~2019-07-08 23:25 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-13 5:53 linux-next: manual merge of the char-misc tree with the driver-core tree Stephen Rothwell
2019-06-13 6:10 ` Greg KH
2019-07-08 23:20 ` Stephen Rothwell
2019-07-08 23:25 ` Nadav Amit [this message]
2019-07-09 6:15 ` Greg KH
2019-07-12 7:45 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2025-09-08 6:25 Stephen Rothwell
2025-09-08 8:57 ` Greg KH
2019-07-01 9:09 Stephen Rothwell
2019-07-01 18:39 ` Nathan Chancellor
2019-07-01 21:53 ` Stephen Rothwell
2019-07-01 20:04 ` Nathan Chancellor
2019-07-01 21:58 ` Stephen Rothwell
2019-07-02 14:18 ` Jean-Philippe Brucker
2019-07-02 15:18 ` Joerg Roedel
2019-07-02 15:23 ` Michael S. Tsirkin
2019-07-02 15:58 ` Joerg Roedel
2019-07-02 17:05 ` Michael S. Tsirkin
2019-07-02 21:41 ` Stephen Rothwell
2019-07-03 8:41 ` Suzuki K Poulose
2019-07-12 0:53 ` Stephen Rothwell
2019-07-15 20:22 ` Mathieu Poirier
2019-06-20 5:35 Stephen Rothwell
2019-06-20 6:20 ` Greg KH
2019-07-08 23:51 ` Stephen Rothwell
2019-07-09 7:12 ` Winkler, Tomas
2019-07-10 6:00 ` Stephen Rothwell
2017-02-01 4:28 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=A3330909-6201-4FB6-B20B-89D8C1CE7A0C@vmware.com \
--to=namit@vmware$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox