Merge tag 'for-linus-6.1-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull xen fixes from Juergen Gross:
 "Two trivial cleanups, and three simple fixes"

* tag 'for-linus-6.1-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/platform-pci: use define instead of literal number
  xen/platform-pci: add missing free_irq() in error path
  xen-pciback: Allow setting PCI_MSIX_FLAGS_MASKALL too
  xen/pcpu: fix possible memory leak in register_pcpu()
  x86/xen: Use kstrtobool() instead of strtobool()

diff --combined arch/x86/xen/enlighten_pv.c
index f82857e,34b05ee..038da45
--- 1/arch/x86/xen/enlighten_pv.c
--- 2/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@@ -23,6 -23,7 +23,7 @@@
  #include <linux/start_kernel.h>
  #include <linux/sched.h>
  #include <linux/kprobes.h>
+ #include <linux/kstrtox.h>
  #include <linux/memblock.h>
  #include <linux/export.h>
  #include <linux/mm.h>
@@@ -113,7 -114,7 +114,7 @@@ static __read_mostly bool xen_msr_safe 
  static int __init parse_xen_msr_safe(char *str)
  {
        if (str)
-               return strtobool(str, &xen_msr_safe);
+               return kstrtobool(str, &xen_msr_safe);
        return -EINVAL;
  }
  early_param("xen_msr_safe", parse_xen_msr_safe);
@@@ -775,7 -776,6 +776,7 @@@ static void xen_load_idt(const struct d
  {
        static DEFINE_SPINLOCK(lock);
        static struct trap_info traps[257];
 +      static const struct trap_info zero = { };
        unsigned out;
  
        trace_xen_cpu_load_idt(desc);
@@@ -785,7 -785,7 +786,7 @@@
        memcpy(this_cpu_ptr(&idt_desc), desc, sizeof(idt_desc));
  
        out = xen_convert_trap_info(desc, traps, false);
 -      memset(&traps[out], 0, sizeof(traps[0]));
 +      traps[out] = zero;
  
        xen_mc_flush();
        if (HYPERVISOR_set_trap_table(traps))