The patch titled sfc: do not define inline macro has been added to the -mm tree. Its filename is sfc-do-not-define-inline-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://www.zip.com.au/~akpm/linux/patches/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: sfc: do not define inline macro From: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx> Signed-off-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/sfc/net_driver.h | 5 ----- 1 file changed, 5 deletions(-) diff -puN drivers/net/sfc/net_driver.h~sfc-do-not-define-inline-macro drivers/net/sfc/net_driver.h --- a/drivers/net/sfc/net_driver.h~sfc-do-not-define-inline-macro +++ a/drivers/net/sfc/net_driver.h @@ -81,11 +81,6 @@ do {if (net_ratelimit()) EFX_INFO(efx, f #define EFX_LOG_RL(efx, fmt, args...) \ do {if (net_ratelimit()) EFX_LOG(efx, fmt, ##args); } while (0) -/* Kernel headers may redefine inline anyway */ -#ifndef inline -#define inline inline __attribute__ ((always_inline)) -#endif - /************************************************************************** * * Efx data structures _ Patches currently in -mm which might be from bhutchings@xxxxxxxxxxxxxx are sfc-use-mod_timer-to-set-expiry-and-add_timer-together.patch sfc-remove-casts-to-void.patch sfc-simplify-efx_rx_calc_buffer_size-using-get_order.patch sfc-remove-unncesssary-ul-suffixes-on-0-literals.patch sfc-add-and-remove-braces-to-comply-with-kernel-style.patch sfc-replace-various-macros-with-inline-functions.patch sfc-merge-efx_page_offset-into-efx_rx_buf_offset.patch sfc-use-resource_size_t-for-pci-bus-address.patch sfc-correct-and-expand-some-comments.patch sfc-do-not-define-inline-macro.patch sfc-remove-redundant-casts-to-and-from-void.patch sfc-add-checks-for-heap-allocation-failure.patch sfc-remove-sub-minor-component-from-driver-version.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