The patch titled generic swap(): ext4: remove local swap() macro has been added to the -mm tree. Its filename is generic-swap-ext4-remove-local-swap-macro.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this 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 linux-next.patch 9p-convert-d_iname-references-to-d_namename.patch nfs-remove-redundant-tests-on-reading-new-pages.patch generic-swap-ath9k-rename-swap-to-swap_array.patch generic-swap-sparc-rename-swap-to-swap_ulong.patch generic-swap-iphase-rename-swap-to-swap_byte_order.patch generic-swap-lib-sortc-rename-swap-to-swap_func.patch generic-swap-introduce-global-macro-swapa-b.patch generic-swap-ext3-remove-local-swap-macro.patch generic-swap-ext4-remove-local-swap-macro.patch generic-swap-sched-remove-local-swap-macro.patch generic-swap-dcache-use-swap-instead-of-private-do_switch.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