The patch titled generic swap(): ext4: remove local swap() macro has been removed from the -mm tree. Its filename was generic-swap-ext4-remove-local-swap-macro.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: generic swap(): ext4: remove local swap() macro From: Wu Fengguang <fengguang.wu@xxxxxxxxx> Use the new generic implementation. Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> Cc: Theodore Ts'o <tytso@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ext4/namei.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN fs/ext4/namei.c~generic-swap-ext4-remove-local-swap-macro fs/ext4/namei.c --- a/fs/ext4/namei.c~generic-swap-ext4-remove-local-swap-macro +++ a/fs/ext4/namei.c @@ -74,10 +74,6 @@ static struct buffer_head *ext4_append(h #define assert(test) J_ASSERT(test) #endif -#ifndef swap -#define swap(x, y) do { typeof(x) z = x; x = y; y = z; } while (0) -#endif - #ifdef DX_DEBUG #define dxtrace(command) command #else _ Patches currently in -mm which might be from fengguang.wu@xxxxxxxxx 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