Re: [linux-next:master 1436/1582] drivers/net/ethernet/smsc/smc91x.c:2378:6: error: implicit declaration of function 'machine_is_assabet'
David Millerwrites: > Please send me a fixup follow-on patch. > > If changes are in my tree, they are part of the permanent record > and won't be rebased out. Ok, understood, I'm on it. Thanks. -- Robert
Re: [linux-next:master 1436/1582] drivers/net/ethernet/smsc/smc91x.c:2378:6: error: implicit declaration of function 'machine_is_assabet'
From: Robert JarzmikDate: Wed, 19 Oct 2016 21:58:06 +0200 > Hi David, > > Here is a little mess I created with my former serie : >>drivers/net/ethernet/smsc/smc91x.c: In function 'smc_drv_probe': drivers/net/ethernet/smsc/smc91x.c:2378:6: error: implicit declaration of function 'machine_is_assabet' [-Werror=implicit-function-declaration] >> if (machine_is_assabet() && machine_has_neponset()) >> ^~ >>cc1: some warnings being treated as errors >> >> vim +/machine_is_assabet +2378 drivers/net/ethernet/smsc/smc91x.c > > The mess comes from the patch "net: smc91x: isolate u16 writes alignment > workaround", where I though I had removed all "machine_is_*()" calls, and I > didn't notice the machine_is_assabet() one. > > The fix is to re-add the removed include in the wrong chunk in [1]. > > Now do you want : > - another apart patch to fix the faulty one > - a "fixup!" patch to fixup the commit in your next tree > - or anything else Please send me a fixup follow-on patch. If changes are in my tree, they are part of the permanent record and won't be rebased out.
Re: [linux-next:master 1436/1582] drivers/net/ethernet/smsc/smc91x.c:2378:6: error: implicit declaration of function 'machine_is_assabet'
Hi David, Here is a little mess I created with my former serie : >drivers/net/ethernet/smsc/smc91x.c: In function 'smc_drv_probe': >>> drivers/net/ethernet/smsc/smc91x.c:2378:6: error: implicit declaration of >>> function 'machine_is_assabet' [-Werror=implicit-function-declaration] > if (machine_is_assabet() && machine_has_neponset()) > ^~ >cc1: some warnings being treated as errors > > vim +/machine_is_assabet +2378 drivers/net/ethernet/smsc/smc91x.c The mess comes from the patch "net: smc91x: isolate u16 writes alignment workaround", where I though I had removed all "machine_is_*()" calls, and I didn't notice the machine_is_assabet() one. The fix is to re-add the removed include in the wrong chunk in [1]. Now do you want : - another apart patch to fix the faulty one - a "fixup!" patch to fixup the commit in your next tree - or anything else As I didn't compile assabet, my testers have missed this one. Please tell me which way suits you to repair this commit. Cheers. -- Robert [1] @@ -63,8 +63,6 @@ #if defined(CONFIG_ARM) -#include - /* Now the bus width is specified in the platform data * pretend here to support all I/O access types */