The patch titled netfilter: remove broken macro has been added to the -mm tree. Its filename is netfilter-remove-broken-macro.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: netfilter: remove broken macro From: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx> Remove broken and unused macro (parentheses don't add up). Signed-off-by: Mariusz Kozlowski <m.kozlowski@xxxxxxxxxx> Cc: Patrick McHardy <kaber@xxxxxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- net/ipv4/netfilter/ip_nat_standalone.c | 6 ------ 1 file changed, 6 deletions(-) diff -puN net/ipv4/netfilter/ip_nat_standalone.c~netfilter-remove-broken-macro net/ipv4/netfilter/ip_nat_standalone.c --- a/net/ipv4/netfilter/ip_nat_standalone.c~netfilter-remove-broken-macro +++ a/net/ipv4/netfilter/ip_nat_standalone.c @@ -44,12 +44,6 @@ #define DEBUGP(format, args...) #endif -#define HOOKNAME(hooknum) ((hooknum) == NF_IP_POST_ROUTING ? "POST_ROUTING" \ - : ((hooknum) == NF_IP_PRE_ROUTING ? "PRE_ROUTING" \ - : ((hooknum) == NF_IP_LOCAL_OUT ? "LOCAL_OUT" \ - : ((hooknum) == NF_IP_LOCAL_IN ? "LOCAL_IN" \ - : "*ERROR*"))) - #ifdef CONFIG_XFRM static void nat_decode_session(struct sk_buff *skb, struct flowi *fl) { _ Patches currently in -mm which might be from m.kozlowski@xxxxxxxxxx are fix2-gregkh-driver-modules-state.patch git-dvb.patch mips-dbg_io-stray-brackets-fix.patch mtd-rtc_from4-brace-fix.patch sk98lin-debug-build-fix.patch netfilter-remove-broken-macro.patch scsi-sic7xxx-stray-bracket-fix.patch h8300-stray-bracket-fix.patch i2lib-unused-variable-cleanup.patch make-1-bit-bitfields-unsigned.patch char-ip2-remove-broken-macro.patch video-cyberfb-broken-macro-removal.patch video-neofb-stray-bracket-fix.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