From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Mar 2025 21:33:32 +0000 (-0700)
Subject: Merge tag 'for-linus-6.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dce3ab4c57e662ae019c22e7c2f2aa887617beae;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'for-linus-6.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen updates from Juergen Gross:

 - cleanup: remove an used function

 - add support for a XenServer specific virtual PCI device

 - fix the handling of a sparse Xen hypervisor symbol table

 - avoid warnings when building the kernel with gcc 15

 - fix use of devices behind a VMD bridge when running as a Xen PV dom0

* tag 'for-linus-6.15-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  PCI/MSI: Convert pci_msi_ignore_mask to per MSI domain flag
  PCI: vmd: Disable MSI remapping bypass under Xen
  xen/pci: Do not register devices with segments >= 0x10000
  xen/pciback: Remove unused pcistub_get_pci_dev
  xenfs/xensyms: respect hypervisor's "next" indication
  xen/mcelog: Add __nonstring annotations for unterminated strings
  xen: Add support for XenServer 6.1 platform device
---

dce3ab4c57e662ae019c22e7c2f2aa887617beae
diff --cc include/linux/msi.h
index b81e10da62a2,59a421fc42bf..6d7d1947f928
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@@ -558,16 -555,10 +557,18 @@@ enum 
  	MSI_FLAG_PCI_MSIX_ALLOC_DYN	= (1 << 20),
  	/* PCI MSIs cannot be steered separately to CPU cores */
  	MSI_FLAG_NO_AFFINITY		= (1 << 21),
+ 	/* Inhibit usage of entry masking */
+ 	MSI_FLAG_NO_MASK		= (1 << 22),
  };
  
 +/*
 + * Flags for msi_parent_ops::chip_flags
 + */
 +enum {
 +	MSI_CHIP_FLAG_SET_EOI		= (1 << 0),
 +	MSI_CHIP_FLAG_SET_ACK		= (1 << 1),
 +};
 +
  /**
   * struct msi_parent_ops - MSI parent domain callbacks and configuration info
   *