Merge tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull hyperv fixes from Wei Liu:

 - clarify a comment (Michael Kelley)

 - change a pr_warn() to pr_info() (Olaf Hering)

* tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  x86/hyperv: Clarify comment on x2apic mode
  hv_balloon: disable warning when floor reached

diff --combined drivers/hv/hv_balloon.c
index b64d2efbefe71a5df31d1bd3c934faf19ecb515d,0f50295d021492c1485e9cd9d73f7c106a504dd2..eb56e09ae15f3999478b0e75f601836c92ad175a
--- 1/drivers/hv/hv_balloon.c
--- 2/drivers/hv/hv_balloon.c
+++ b/drivers/hv/hv_balloon.c
@@@ -726,7 -726,7 +726,7 @@@ static void hv_mem_hot_add(unsigned lon
  
                nid = memory_add_physaddr_to_nid(PFN_PHYS(start_pfn));
                ret = add_memory(nid, PFN_PHYS((start_pfn)),
 -                              (HA_CHUNK << PAGE_SHIFT));
 +                              (HA_CHUNK << PAGE_SHIFT), MEMHP_MERGE_RESOURCE);
  
                if (ret) {
                        pr_err("hot_add memory failed error is %d\n", ret);
@@@ -1275,7 -1275,7 +1275,7 @@@ static void balloon_up(struct work_stru
  
        /* Refuse to balloon below the floor. */
        if (avail_pages < num_pages || avail_pages - num_pages < floor) {
-               pr_warn("Balloon request will be partially fulfilled. %s\n",
+               pr_info("Balloon request will be partially fulfilled. %s\n",
                        avail_pages < num_pages ? "Not enough memory." :
                        "Balloon floor reached.");