Re: [Outreachy kernel] [PATCH] staging: wil1000: fix misspelled words

[Greg KH <gregkh@linuxfoundation.org>]

On Wed, Sep 30, 2015 at 01:21:53PM +0300, Ioana Ciornei wrote:
> On Wed, Sep 30, 2015 at 5:00 AM, Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Wed, Sep 30, 2015 at 03:17:06AM +0300, Ioana Ciornei wrote:
> > > Fix misspelled words throughout the entire subsystem
> > >
> > > Signed-off-by: Ioana Ciornei <ciorneiioana@gmail.com>
> > > ---
> > >  drivers/staging/wilc1000/coreconfigurator.c       |  2 +-
> > >  drivers/staging/wilc1000/host_interface.c         | 26 +++++++++++------------
> > >  drivers/staging/wilc1000/host_interface.h         |  8 +++----
> > >  drivers/staging/wilc1000/linux_mon.c              |  2 +-
> > >  drivers/staging/wilc1000/linux_wlan.c             | 18 ++++++++--------
> > >  drivers/staging/wilc1000/wilc_msgqueue.c          |  2 +-
> > >  drivers/staging/wilc1000/wilc_msgqueue.h          |  8 +++----
> > >  drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 22 +++++++++----------
> > >  drivers/staging/wilc1000/wilc_wfi_cfgoperations.h |  4 ++--
> > >  drivers/staging/wilc1000/wilc_wlan.c              |  4 ++--
> > >  10 files changed, 48 insertions(+), 48 deletions(-)
> >
> > This patch doesn't apply to my staging-testing branch at all, due to
> > other changes that happened in the past few days with this driver.
> > Please refresh your tree and rebase your patch and resend it so that I
> > can apply it.
> 
> Just to be sure.. are we supposed to keep track and apply patches on
> top of the staging-testing or staging-next branch?
> In the tutorials it appears staging-next to be the one to follow.

staging-testing usually only diverges from staging-next for less than 24
hours, so usually working on staging-next is fine to do.  Except when
you are working on a driver, like this one, that is also being worked on
by other developers.  For that, I recommend using staging-testing.

But note, this driver is averaging 10-20 patches every few days from
other developers, things are changing quickly in it, keeping up to date
and slip your patch in while that happens is going to be tricky.  Expect
to have to rebase it a few times because of this, sorry.

thanks,

greg k-h