The patch titled Subject: include-define-__phys_to_pfn-as-phys_pfn-fix has been removed from the -mm tree. Its filename was include-define-__phys_to_pfn-as-phys_pfn-fix.patch This patch was dropped because it was folded into include-define-__phys_to_pfn-as-phys_pfn.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: include-define-__phys_to_pfn-as-phys_pfn-fix use macro arg name `x' Cc: Chen Gang <gang.chen.5i5j@xxxxxxxxx> Cc: Chen Gang <xili_gchen_5257@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/pfn.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/pfn.h~include-define-__phys_to_pfn-as-phys_pfn-fix include/linux/pfn.h --- a/include/linux/pfn.h~include-define-__phys_to_pfn-as-phys_pfn-fix +++ a/include/linux/pfn.h @@ -9,6 +9,6 @@ #define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT) #define PFN_DOWN(x) ((x) >> PAGE_SHIFT) #define PFN_PHYS(x) ((phys_addr_t)(x) << PAGE_SHIFT) -#define PHYS_PFN(y) ((unsigned long)((y) >> PAGE_SHIFT)) +#define PHYS_PFN(x) ((unsigned long)((x) >> PAGE_SHIFT)) #endif _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are include-linux-dcacheh-remove-semicolons-from-hash_len_declare.patch include-define-__phys_to_pfn-as-phys_pfn.patch mempolicy-convert-the-shared_policy-lock-to-a-rwlock-fix-2.patch mm-zonelist-enumerate-zonelists-array-index-checkpatch-fixes.patch mm-zonelist-enumerate-zonelists-array-index-fix.patch mm-get-rid-of-__alloc_pages_high_priority-checkpatch-fixes.patch mm-vmalloc-remove-vm_vpages-fix.patch fs-block_devc-bdev_write_page-use-blk_queue_enter-gfp_noio.patch arm64-mm-support-arch_mmap_rnd_bits-fix.patch page-flags-define-pg_locked-behavior-on-compound-pages-fix.patch mm-rework-mapcount-accounting-to-enable-4k-mapping-of-thps-fix.patch mm-hwpoison-adjust-for-new-thp-refcounting-fix.patch thp-reintroduce-split_huge_page-fix.patch mm-prepare-page_referenced-and-page_idle-to-new-thp-refcounting-checkpatch-fixes.patch thp-add-debugfs-handle-to-split-all-huge-pages-fix.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