On Fri, Jan 18, 2013 at 01:29:04PM +1100, Stephen Rothwell wrote: > Hi Greg, > > After merging the driver-core tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > In file included from drivers/net/wireless/ath/wil6210/wil6210.h:24:0, > from drivers/net/wireless/ath/wil6210/main.c:26: > drivers/net/wireless/ath/wil6210/dbg_hexdump.h:21:0: error: "print_hex_dump_bytes" redefined [-Werror] > include/linux/printk.h:322:0: note: this is the location of the previous definition > > Caused by commit 7a555613eb77 ("dynamic_debug: dynamic hex dump") > interacting with commit 2be7d22f0625 ("wireless: add new wil6210 802.11ad > 60GHz driver") that was added to Linus' tree in the last few days. > > I have applied the following merge fix patch for today: > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Date: Fri, 18 Jan 2013 13:24:32 +1100 > Subject: [PATCH] wireless: remove conflicting version of print_hex_dump_bytes > > Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Thanks, I've merged 3.9-rc4 into my tree and applied this patch to fix the build breakage. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html