Re: [PATCH] staging: wilc1000: revert "fix TODO to compile spi and sdio components in single module"

From: gregkh
Date: Tue Sep 11 2018 - 04:21:17 EST


On Mon, Sep 10, 2018 at 04:08:36PM +0530, Ajay Singh wrote:
> Hi Greg,
>
> On Tue, 14 Aug 2018 10:43:35 +0200
> gregkh <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> > On Tue, Aug 14, 2018 at 10:34:27AM +0200, Arnd Bergmann wrote:
> > > On Tue, Aug 14, 2018 at 7:22 AM Ajay Singh
> > > <ajay.kathat@xxxxxxxxxxxxx> wrote:
> > > >
> > > > Hi Arnd,
> > > >
> > > > On Mon, 13 Aug 2018 23:20:33 +0200
> > > > Arnd Bergmann <arnd@xxxxxxxx> wrote:
> > > >
> > > > > The TODO item named "make spi and sdio components coexist in one
> > > > > build" was apparently addressed a long time ago, but never
> > > > > removed from the TODO file. However, the new patch that tries
> > > > > to address it actually makes it worse again by duplicating the
> > > > > common parts of the driver into two separate modules rather
> > > > > than sharing them. This also introduces a build regression when
> > > > > one of the two is built-in while the other is a loadable module:
> > > >
> > > > Thanks for sharing your inputs and submitting patch.
> > > > I have also submitted a patch to address the compilation error[1].
> > > > We can ignore my patch and proceed with your changes.
> > > >
> > > > [1].https://patchwork.kernel.org/patch/10563873/
> > >
> > > That patch seems useful regardless, as it removes dead code,
> > > but I'd still prefer to revert staging-linusthe 9abc44ba4e2f ("staging: wilc1000:
> > > fix TODO to compile spi and sdio components in single module")
> > > commit for the other reasons I explained.
> >
> > I agree, I'll queue it up soon, I have other patches to get to Linus
> > first.
> >
>
> This patch is applied only to 'staging-linus' in commit f45b893 and
> it's not applied to 'staging-testing/next' tree.
> Please apply this patch to 'staging-next' tree also. Because I have one
> patch to submit on top of these changes to delete the 'wilc_debug.c'
> unused file.

I will merge the staging-linus branch into staging-testing once Linus
pulls them in. Should happen next Monday or so. You can send me
patches that build on top of this now, I'll just wait until then to
apply them to my tree.

thanks,

greg k-h