# git rev-parse -q --verify e1cbc3b96a9974746b2a80c3a6c8a0f7eff7b1b5^{commit} e1cbc3b96a9974746b2a80c3a6c8a0f7eff7b1b5 already have revision, skipping fetch # git checkout -q -f -B kisskb e1cbc3b96a9974746b2a80c3a6c8a0f7eff7b1b5 # git clean -qxdf # < git log -1 # commit e1cbc3b96a9974746b2a80c3a6c8a0f7eff7b1b5 # Merge: 3335d5550256 b0dacee202ef # Author: Linus Torvalds # Date: Tue May 31 09:56:54 2022 -0700 # # Merge tag 'iommu-updates-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu # # Pull iommu updates from Joerg Roedel: # # - Intel VT-d driver updates: # - Domain force snooping improvement. # - Cleanups, no intentional functional changes. # # - ARM SMMU driver updates: # - Add new Qualcomm device-tree compatible strings # - Add new Nvidia device-tree compatible string for Tegra234 # - Fix UAF in SMMUv3 shared virtual addressing code # - Force identity-mapped domains for users of ye olde SMMU legacy # binding # - Minor cleanups # # - Fix a BUG_ON in the vfio_iommu_group_notifier: # - Groundwork for upcoming iommufd framework # - Introduction of DMA ownership so that an entire IOMMU group is # either controlled by the kernel or by user-space # # - MT8195 and MT8186 support in the Mediatek IOMMU driver # # - Make forcing of cache-coherent DMA more coherent between IOMMU # drivers # # - Fixes for thunderbolt device DMA protection # # - Various smaller fixes and cleanups # # * tag 'iommu-updates-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (88 commits) # iommu/amd: Increase timeout waiting for GA log enablement # iommu/s390: Tolerate repeat attach_dev calls # iommu/vt-d: Remove hard coding PGSNP bit in PASID entries # iommu/vt-d: Remove domain_update_iommu_snooping() # iommu/vt-d: Check domain force_snooping against attached devices # iommu/vt-d: Block force-snoop domain attaching if no SC support # iommu/vt-d: Size Page Request Queue to avoid overflow condition # iommu/vt-d: Fold dmar_insert_one_dev_info() into its caller # iommu/vt-d: Change return type of dmar_insert_one_dev_info() # iommu/vt-d: Remove unneeded validity check on dev # iommu/dma: Explicitly sort PCI DMA windows # iommu/dma: Fix iova map result check bug # iommu/mediatek: Fix NULL pointer dereference when printing dev_name # iommu: iommu_group_claim_dma_owner() must always assign a domain # iommu/arm-smmu: Force identity domains for legacy binding # iommu/arm-smmu: Support Tegra234 SMMU # dt-bindings: arm-smmu: Add compatible for Tegra234 SOC # dt-bindings: arm-smmu: Document nvidia,memory-controller property # iommu/arm-smmu-qcom: Add SC8280XP support # dt-bindings: arm-smmu: Add compatible for Qualcomm SC8280XP # ... # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 e1cbc3b96a9974746b2a80c3a6c8a0f7eff7b1b5 # < make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # < make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:13846:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/arch/mips/boot/dts/img/boston.dts:128.19-178.5: Warning (pci_device_reg): /pci@14000000/pci2_root@0,0,0: PCI unit address format error, expected "0,0" /kisskb/src/drivers/net/wireless/intel/iwlwifi/pcie/trans.c:1093: error: "CAUSE" redefined [-Werror] #define CAUSE(reg, mask) \ In file included from /kisskb/src/arch/mips/include/asm/ptrace.h:19, from /kisskb/src/include/linux/sched/signal.h:14, from /kisskb/src/include/linux/rcuwait.h:6, from /kisskb/src/include/linux/percpu-rwsem.h:7, from /kisskb/src/include/linux/fs.h:33, from /kisskb/src/arch/mips/include/asm/elf.h:12, from /kisskb/src/include/linux/elf.h:6, from /kisskb/src/include/linux/module.h:19, from /kisskb/src/include/linux/device/driver.h:21, from /kisskb/src/include/linux/device.h:32, from /kisskb/src/include/linux/pci.h:37, from /kisskb/src/drivers/net/wireless/intel/iwlwifi/pcie/trans.c:7: /kisskb/src/arch/mips/include/uapi/asm/ptrace.h:18: note: this is the location of the previous definition #define CAUSE 65 cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:271: drivers/net/wireless/intel/iwlwifi/pcie/trans.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net/wireless/intel/iwlwifi] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net/wireless/intel] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net/wireless] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1839: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 120 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.5.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:06:49.085324