The patch titled Subject: decompressors: group XZ_DEC_* symbols under an if XZ_BCJ / endif has been removed from the -mm tree. Its filename was decompressors-group-xz_dec_-symbols-under-an-if-xz_bcj-endif.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Florian Fainelli <florian@xxxxxxxxxxx> Subject: decompressors: group XZ_DEC_* symbols under an if XZ_BCJ / endif Group all architecture-specific BCJ filter configuration symbols under an if XZ_BCJ / endif statement. Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx> Acked-by: Lasse Collin <lasse.collin@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/xz/Kconfig | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff -puN lib/xz/Kconfig~decompressors-group-xz_dec_-symbols-under-an-if-xz_bcj-endif lib/xz/Kconfig --- a/lib/xz/Kconfig~decompressors-group-xz_dec_-symbols-under-an-if-xz_bcj-endif +++ a/lib/xz/Kconfig @@ -6,42 +6,40 @@ config XZ_DEC the .xz file format as the container. For integrity checking, CRC32 is supported. See Documentation/xz.txt for more information. +if XZ_DEC + config XZ_DEC_X86 bool "x86 BCJ filter decoder" if EXPERT default y - depends on XZ_DEC select XZ_DEC_BCJ config XZ_DEC_POWERPC bool "PowerPC BCJ filter decoder" if EXPERT default y - depends on XZ_DEC select XZ_DEC_BCJ config XZ_DEC_IA64 bool "IA-64 BCJ filter decoder" if EXPERT default y - depends on XZ_DEC select XZ_DEC_BCJ config XZ_DEC_ARM bool "ARM BCJ filter decoder" if EXPERT default y - depends on XZ_DEC select XZ_DEC_BCJ config XZ_DEC_ARMTHUMB bool "ARM-Thumb BCJ filter decoder" if EXPERT default y - depends on XZ_DEC select XZ_DEC_BCJ config XZ_DEC_SPARC bool "SPARC BCJ filter decoder" if EXPERT default y - depends on XZ_DEC select XZ_DEC_BCJ +endif + config XZ_DEC_BCJ bool default n _ Patches currently in -mm which might be from florian@xxxxxxxxxxx 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