From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [wrecked] mm-hugetlbfs-fix-rmapping-for-anonymous-hugepages-with-page_pgoff-v3-fix.patch removed from -mm tree Date: Mon, 07 Jul 2014 13:01:24 -0700 Message-ID: <53bafc94.xQJUwfs/+YUsNVca%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pa0-f73.google.com ([209.85.220.73]:45293 "EHLO mail-pa0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929AbaGGUBZ (ORCPT ); Mon, 7 Jul 2014 16:01:25 -0400 Received: by mail-pa0-f73.google.com with SMTP id kq14so1030742pab.0 for ; Mon, 07 Jul 2014 13:01:24 -0700 (PDT) Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, n-horiguchi@ah.jp.nec.com, riel@redhat.com, sasha.levin@oracle.com, mm-commits@vger.kernel.org The patch titled Subject: mm-hugetlbfs-fix-rmapping-for-anonymous-hugepages-with-page_pgoff-v3-fix has been removed from the -mm tree. Its filename was mm-hugetlbfs-fix-rmapping-for-anonymous-hugepages-with-page_pgoff-v3-fix.patch This patch was dropped because other changes were merged, which wrecked this patch ------------------------------------------------------ From: Andrew Morton Subject: mm-hugetlbfs-fix-rmapping-for-anonymous-hugepages-with-page_pgoff-v3-fix tweak code comment Cc: Naoya Horiguchi Cc: Rik van Riel Cc: Sasha Levin Signed-off-by: Andrew Morton --- include/linux/pagemap.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff -puN include/linux/pagemap.h~mm-hugetlbfs-fix-rmapping-for-anonymous-hugepages-with-page_pgoff-v3-fix include/linux/pagemap.h --- a/include/linux/pagemap.h~mm-hugetlbfs-fix-rmapping-for-anonymous-hugepages-with-page_pgoff-v3-fix +++ a/include/linux/pagemap.h @@ -412,16 +412,16 @@ static inline loff_t page_file_offset(st } /* - * Getting page order of a given page in the context of the pagecache which - * each page belongs to. + * Get the order of a given page in the context of the pagecache which it + * belongs to. * - * Pagecache unit size is not a fixed value (hugetlbfs is an example), but - * vma_interval_tree and anon_vma_internval_tree APIs assume that its indices - * are in PAGE_SIZE unit. So this routine helps us to get normalized indices. + * Pagecache unit size is not a fixed value (hugetlbfs is an example), but the + * vma_interval_tree and anon_vma_interval_tree APIs assume that indices are in + * PAGE_SIZE units. So this function helps us to get normalized indices. * - * This page should be called only for pagecache pages/hugepages and anonymous - * pages/hugepages, because pagecache unit size is irrelevant except for those - * pages. + * page_size_order() should be called only for pagecache pages/hugepages and + * anonymous pages/hugepages, because pagecache unit size is irrelevant except + * for those pages. */ static inline unsigned int page_size_order(struct page *page) { _ Patches currently in -mm which might be from akpm@linux-foundation.org are i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch maintainers-akpm-maintenance.patch x86-numa-setup_node_data-drop-dead-code-and-rename-function-checkpatch-fixes.patch input-route-kbd-leds-through-the-generic-leds-layer.patch kbuild-explain-stack-protector-strong-config-logic.patch ocfs2-free-inode-when-i_count-becomes-zero-checkpatch-fixes.patch mm.patch slub-use-new-node-functions-checkpatch-fixes.patch slab-use-get_node-and-kmem_cache_node-functions-fix-2.patch slab-use-get_node-and-kmem_cache_node-functions-fix-2-fix.patch slab-change-int-to-size_t-for-representing-allocation-size.patch mm-page_allocc-unexport-alloc_pages_exact_nid.patch dma-cma-support-arbitrary-bitmap-granularity-fix.patch mm-vmallocc-add-a-schedule-point-to-vmalloc-fix.patch include-linux-mmdebugh-add-vm_warn_once.patch mm-catch-memory-commitment-underflow-fix.patch mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch mm-compactionc-isolate_freepages_block-small-tuneup.patch mm-zpool-implement-common-zpool-api-to-zbud-zsmalloc-fix.patch mm-zpool-prevent-zbud-zsmalloc-from-unloading-when-used-checkpatch-fixes.patch do_shared_fault-check-that-mmap_sem-is-held.patch list-fix-order-of-arguments-for-hlist_add_after_rcu-checkpatch-fixes.patch add-lib-globc-fix.patch lib-list_sortc-convert-to-pr_foo.patch lib-list_sortc-convert-to-pr_foo-fix.patch checkpatch-add-test-for-commit-id-formatting-style-in-commit-log.patch binfmt_elfc-use-get_random_int-to-fix-entropy-depleting-fix.patch fs-isofs-logging-clean-up-fix.patch kexec-implementation-of-new-syscall-kexec_file_load-checkpatch-fixes.patch kexec-support-kexec-kdump-on-efi-systems-fix.patch panic-add-taint_softlockup-fix.patch linux-next.patch drivers-gpio-gpio-zevioc-fix-build.patch drivers-staging-emxx_udc-emxx_udcc-replace-strict_strto-with-kstrto.patch kernel-posix-timersc-code-clean-up-checkpatch-fixes.patch mm-replace-remap_file_pages-syscall-with-emulation-fix.patch memcg-deprecate-memoryforce_empty-knob-fix.patch debugging-keep-track-of-page-owners.patch journal_add_journal_head-debug.patch journal_add_journal_head-debug-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch put_bh-debug.patch