The patch titled x86-64: Calgary - fix few style problems pointed out by checkpatch.pl has been removed from the -mm tree. Its filename was x86-64-calgary-fix-few-style-problems-pointed-out-by-checkpatchpl.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: x86-64: Calgary - fix few style problems pointed out by checkpatch.pl From: Muli Ben-Yehuda <muli@xxxxxxxxxx> No actual code was harmed in the production of this patch. Thanks to Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> for telling me about checkpatch.pl. Signed-off-by: Muli Ben-Yehuda <muli@xxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86_64/kernel/pci-calgary.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff -puN arch/x86_64/kernel/pci-calgary.c~x86-64-calgary-fix-few-style-problems-pointed-out-by-checkpatchpl arch/x86_64/kernel/pci-calgary.c --- a/arch/x86_64/kernel/pci-calgary.c~x86-64-calgary-fix-few-style-problems-pointed-out-by-checkpatchpl +++ a/arch/x86_64/kernel/pci-calgary.c @@ -375,7 +375,9 @@ static inline struct iommu_table *find_i pbus = pdev->bus; tbl = pbus->self->sysdata; - BUG_ON(pdev->bus->parent && (tbl->it_busno != pdev->bus->parent->number)); + + BUG_ON(pdev->bus->parent && + (tbl->it_busno != pdev->bus->parent->number)); return tbl; } @@ -941,7 +943,8 @@ static void calioc2_dump_error_regs(stru /* dump rest of error regs */ printk(KERN_EMERG "Calgary: "); for (i = 0; i < ARRAY_SIZE(errregs); i++) { - erroff = (0x810 + (i * 0x10)); /* err regs are at 0x810 - 0x870 */ + /* err regs are at 0x810 - 0x870 */ + erroff = (0x810 + (i * 0x10)); target = calgary_reg(bbar, phboff | erroff); errregs[i] = be32_to_cpu(readl(target)); printk("0x%08x@0x%lx ", errregs[i], erroff); @@ -1207,7 +1210,7 @@ static int __init calgary_init(void) { int ret; struct pci_dev *dev = NULL; - void* tce_space; + void *tce_space; ret = calgary_locate_bbars(); if (ret) _ Patches currently in -mm which might be from muli@xxxxxxxxxx are origin.patch intel-iommu-dmar-detection-and-parsing-logic.patch intel-iommu-pci-generic-helper-function.patch intel-iommu-clflush_cache_range-now-takes-size-param.patch intel-iommu-iova-allocation-and-management-routines.patch intel-iommu-intel-iommu-driver.patch intel-iommu-avoid-memory-allocation-failures-in-dma-map-api-calls.patch intel-iommu-intel-iommu-cmdline-option-forcedac.patch intel-iommu-dmar-fault-handling-support.patch intel-iommu-iommu-gfx-workaround.patch intel-iommu-iommu-floppy-workaround.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html