The patch titled kbuild: remove duplicate, conflicting entry for oom.h has been removed from the -mm tree. Its filename was kbuild-remove-duplicate-conflicting-entry-for-oomh.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: kbuild: remove duplicate, conflicting entry for oom.h From: "Robert P. J. Day" <rpjday@xxxxxxxxxxxxxx> oom.h is already tagged for unifdef'ing, so its entry as a simple exportable header should be deleted. Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/Kbuild | 1 - 1 file changed, 1 deletion(-) diff -puN include/linux/Kbuild~kbuild-remove-duplicate-conflicting-entry-for-oomh include/linux/Kbuild --- a/include/linux/Kbuild~kbuild-remove-duplicate-conflicting-entry-for-oomh +++ a/include/linux/Kbuild @@ -117,7 +117,6 @@ header-y += nfs2.h header-y += nfs4_mount.h header-y += nfs_mount.h header-y += nl80211.h -header-y += oom.h header-y += param.h header-y += pci_regs.h header-y += pfkeyv2.h _ Patches currently in -mm which might be from rpjday@xxxxxxxxxxxxxx are origin.patch git-dvb.patch git-mtd.patch xtensa-warn-about-including-asm-rwsemh-directly.patch xtensa-use-newer-__spin_lock_unlocked-macro.patch remove-ifdef-__kernel__-checks-from-unexported-headers.patch remove-__kernel__-tests-of-unexported-headers-under-asm-generic.patch drop-the-exporting-of-empty-linux-byteorder-generich.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