The patch titled Subject: lib/scatterlist: clean up useless architecture versions of scatterlist.h has been removed from the -mm tree. Its filename was lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Laura Abbott <lauraa@xxxxxxxxxxxxxx> Subject: lib/scatterlist: clean up useless architecture versions of scatterlist.h There's no need to have an architecture version of scatterlist.h if the only thing the file does is include asm-generic/scatterlist.h. Switch to the asm-generic versions directly. Acked-by: Jesper Nilsson <jesper.nilsson@xxxxxxxx> Acked-by: David Howells <dhowells@xxxxxxxxxx> Signed-off-by: Laura Abbott <lauraa@xxxxxxxxxxxxxx> Cc: Lennox Wu <lennox.wu@xxxxxxxxx> Cc: Chen Liqin <liqin.linux@xxxxxxxxx>, Cc: Koichi Yasutake <yasutake.koichi@xxxxxxxxxxxxxxxx> Cc: Michal Simek <monstr@xxxxxxxxx> Cc: Hirokazu Takata <takata@xxxxxxxxxxxxxx> Cc: Mikael Starvik <starvik@xxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxxx> Cc: Tony Luck <tony.luck@xxxxxxxxx> Cc: Fenghua Yu <fenghua.yu@xxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: "James E.J. Bottomley" <JBottomley@xxxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/alpha/include/asm/Kbuild | 1 + arch/alpha/include/asm/scatterlist.h | 6 ------ arch/cris/include/asm/Kbuild | 1 + arch/cris/include/asm/scatterlist.h | 6 ------ arch/frv/include/asm/Kbuild | 1 + arch/frv/include/asm/scatterlist.h | 6 ------ arch/m32r/include/asm/Kbuild | 1 + arch/m32r/include/asm/scatterlist.h | 6 ------ arch/microblaze/include/asm/Kbuild | 1 + arch/microblaze/include/asm/scatterlist.h | 1 - arch/mn10300/include/asm/Kbuild | 1 + arch/mn10300/include/asm/scatterlist.h | 16 ---------------- arch/score/include/asm/Kbuild | 1 + arch/score/include/asm/scatterlist.h | 6 ------ 14 files changed, 7 insertions(+), 47 deletions(-) diff -puN arch/alpha/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth arch/alpha/include/asm/Kbuild --- a/arch/alpha/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth +++ a/arch/alpha/include/asm/Kbuild @@ -6,4 +6,5 @@ generic-y += exec.h generic-y += hash.h generic-y += mcs_spinlock.h generic-y += preempt.h +generic-y += scatterlist.h generic-y += trace_clock.h diff -puN arch/alpha/include/asm/scatterlist.h~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth /dev/null --- a/arch/alpha/include/asm/scatterlist.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ALPHA_SCATTERLIST_H -#define _ALPHA_SCATTERLIST_H - -#include <asm-generic/scatterlist.h> - -#endif /* !(_ALPHA_SCATTERLIST_H) */ diff -puN arch/cris/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth arch/cris/include/asm/Kbuild --- a/arch/cris/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth +++ a/arch/cris/include/asm/Kbuild @@ -13,6 +13,7 @@ generic-y += linkage.h generic-y += mcs_spinlock.h generic-y += module.h generic-y += preempt.h +generic-y += scatterlist.h generic-y += trace_clock.h generic-y += vga.h generic-y += xor.h diff -puN arch/cris/include/asm/scatterlist.h~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth /dev/null --- a/arch/cris/include/asm/scatterlist.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_CRIS_SCATTERLIST_H -#define __ASM_CRIS_SCATTERLIST_H - -#include <asm-generic/scatterlist.h> - -#endif /* !(__ASM_CRIS_SCATTERLIST_H) */ diff -puN arch/frv/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth arch/frv/include/asm/Kbuild --- a/arch/frv/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth +++ a/arch/frv/include/asm/Kbuild @@ -5,4 +5,5 @@ generic-y += exec.h generic-y += hash.h generic-y += mcs_spinlock.h generic-y += preempt.h +generic-y += scatterlist.h generic-y += trace_clock.h diff -puN arch/frv/include/asm/scatterlist.h~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth /dev/null --- a/arch/frv/include/asm/scatterlist.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCATTERLIST_H -#define _ASM_SCATTERLIST_H - -#include <asm-generic/scatterlist.h> - -#endif /* !_ASM_SCATTERLIST_H */ diff -puN arch/m32r/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth arch/m32r/include/asm/Kbuild --- a/arch/m32r/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth +++ a/arch/m32r/include/asm/Kbuild @@ -6,4 +6,5 @@ generic-y += hash.h generic-y += mcs_spinlock.h generic-y += module.h generic-y += preempt.h +generic-y += scatterlist.h generic-y += trace_clock.h diff -puN arch/m32r/include/asm/scatterlist.h~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth /dev/null --- a/arch/m32r/include/asm/scatterlist.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_M32R_SCATTERLIST_H -#define _ASM_M32R_SCATTERLIST_H - -#include <asm-generic/scatterlist.h> - -#endif /* _ASM_M32R_SCATTERLIST_H */ diff -puN arch/microblaze/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth arch/microblaze/include/asm/Kbuild --- a/arch/microblaze/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth +++ a/arch/microblaze/include/asm/Kbuild @@ -7,5 +7,6 @@ generic-y += exec.h generic-y += hash.h generic-y += mcs_spinlock.h generic-y += preempt.h +generic-y += scatterlist.h generic-y += syscalls.h generic-y += trace_clock.h diff -puN arch/microblaze/include/asm/scatterlist.h~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth /dev/null --- a/arch/microblaze/include/asm/scatterlist.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/scatterlist.h> diff -puN arch/mn10300/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth arch/mn10300/include/asm/Kbuild --- a/arch/mn10300/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth +++ a/arch/mn10300/include/asm/Kbuild @@ -6,4 +6,5 @@ generic-y += exec.h generic-y += hash.h generic-y += mcs_spinlock.h generic-y += preempt.h +generic-y += scatterlist.h generic-y += trace_clock.h diff -puN arch/mn10300/include/asm/scatterlist.h~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth /dev/null --- a/arch/mn10300/include/asm/scatterlist.h +++ /dev/null @@ -1,16 +0,0 @@ -/* MN10300 Scatterlist definitions - * - * Copyright (C) 2007 Matsushita Electric Industrial Co., Ltd. - * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public Licence - * as published by the Free Software Foundation; either version - * 2 of the Licence, or (at your option) any later version. - */ -#ifndef _ASM_SCATTERLIST_H -#define _ASM_SCATTERLIST_H - -#include <asm-generic/scatterlist.h> - -#endif /* _ASM_SCATTERLIST_H */ diff -puN arch/score/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth arch/score/include/asm/Kbuild --- a/arch/score/include/asm/Kbuild~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth +++ a/arch/score/include/asm/Kbuild @@ -8,5 +8,6 @@ generic-y += cputime.h generic-y += hash.h generic-y += mcs_spinlock.h generic-y += preempt.h +generic-y += scatterlist.h generic-y += trace_clock.h generic-y += xor.h diff -puN arch/score/include/asm/scatterlist.h~lib-scatterlist-clean-up-useless-architecture-versions-of-scatterlisth /dev/null --- a/arch/score/include/asm/scatterlist.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_SCORE_SCATTERLIST_H -#define _ASM_SCORE_SCATTERLIST_H - -#include <asm-generic/scatterlist.h> - -#endif /* _ASM_SCORE_SCATTERLIST_H */ _ Patches currently in -mm which might be from lauraa@xxxxxxxxxxxxxx are origin.patch mm-compactionc-isolate_freepages_block-small-tuneup.patch linux-next.patch debugging-keep-track-of-page-owners.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