Subject: [merged] mm-mmapc-replace-is_err-and-ptr_err-with-ptr_err_or_zero.patch removed from -mm tree To: duanj.fnst@xxxxxxxxxxxxxx,riel@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 05 Jun 2014 12:49:31 -0700 The patch titled Subject: mm/mmap.c: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO has been removed from the -mm tree. Its filename was mm-mmapc-replace-is_err-and-ptr_err-with-ptr_err_or_zero.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Duan Jiong <duanj.fnst@xxxxxxxxxxxxxx> Subject: mm/mmap.c: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO Fix a coccinelle error regarding usage of IS_ERR and PTR_ERR instead of PTR_ERR_OR_ZERO. Signed-off-by: Duan Jiong <duanj.fnst@xxxxxxxxxxxxxx> Acked-by: Rik van Riel <riel@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/mmap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff -puN mm/mmap.c~mm-mmapc-replace-is_err-and-ptr_err-with-ptr_err_or_zero mm/mmap.c --- a/mm/mmap.c~mm-mmapc-replace-is_err-and-ptr_err-with-ptr_err_or_zero +++ a/mm/mmap.c @@ -2965,9 +2965,7 @@ int install_special_mapping(struct mm_st struct vm_area_struct *vma = _install_special_mapping(mm, addr, len, vm_flags, pages); - if (IS_ERR(vma)) - return PTR_ERR(vma); - return 0; + return PTR_ERR_OR_ZERO(vma); } static DEFINE_MUTEX(mm_all_locks_mutex); _ Patches currently in -mm which might be from duanj.fnst@xxxxxxxxxxxxxx are origin.patch linux-next.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