On Thu, Jul 30, 2020 at 08:27:29AM +0000, Christian.Gromm@xxxxxxxxxxxxx wrote:
> On Wed, 2020-07-29 at 19:03 +0200, Greg KH wrote:
> > EXTERNAL EMAIL: Do not click links or open attachments unless you
> > know the content is safe
> >
> > On Wed, Jul 29, 2020 at 06:38:48PM +0200, Christian Gromm wrote:
> > > To avoid a name conflict when adding the usb module to the
> > > driver's directory in the stable branch, this patch simply
> > > renames the kernel object.
> > >
> > > Signed-off-by: Christian Gromm <christian.gromm@xxxxxxxxxxxxx>
> > > Reported-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> > > ---
> > > drivers/staging/most/usb/{most_usb.ko => most-usb.ko} | Bin
> > > 1 file changed, 0 insertions(+), 0 deletions(-)
> > > rename drivers/staging/most/usb/{most_usb.ko => most-usb.ko}
> > > (100%)
> > >
> > > diff --git a/drivers/staging/most/usb/most_usb.ko
> > > b/drivers/staging/most/usb/most-usb.ko
> > > similarity index 100%
> > > rename from drivers/staging/most/usb/most_usb.ko
> > > rename to drivers/staging/most/usb/most-usb.ko
> >
> > You renamed a binary file??? That is not in the source tree?
> >
>
> I know. And I was kind of confused that you chose this path (1).
> I even had to mess up my git to do that.
>
> >
> > No, I mean make the patch move the .c file from staging to the
> > drivers/most directory and adjust the Kconfig/Makefiles for that
> > movement.
> >
>
> Huh, but this is exactly what I wanted to do in the first place.
> Add it to the stable branch and change the staging files to
> avoid the conflict.
> But then you told me to not touch the staging files. Remember?
Yes, but that would have made it impossible for people to review.
> Anyways, here is what I am going to do now:
> add the usb file to the stable branch, change the name of the
> .ko inside the stable branch and then once the staging files
> are removed, I'll rename it again to get the old name back.
>
> Does this make sense now?
Yes, but I still think that's harder, just do it the original way you
wanted to in the first place. Now that people have had a chance to
review it, no one has objected, so let's just do it the simple way.
thanks,
greg k-h
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
