On Thu, Mar 12, 2015 at 10:32:40AM +0100, Quentin Lambert wrote: > > > On 12/03/2015 10:27, Dan Carpenter wrote: > >On Wed, Mar 11, 2015 at 06:37:30PM +0200, Giedrius Statkevičius wrote: > >>It's still not in staging-testing for some reason :( > >> > >It can take several weeks to get merged. Relax. > > > >regards, > >dan carpenter > > > What should i do concerning that ? > I need to send a second version of this patch anyway to fix the > fact that i inverted 2 statements, namely: > > +exit_unlock: > + if (ld) > + tty_ldisc_deref(ld); > + spin_unlock_irqrestore(&ch->ch_lock, flags); > > should be > > +exit_unlock: > + spin_unlock_irqrestore(&ch->ch_lock, flags); > + if (ld) > + tty_ldisc_deref(ld); > > Should I wait these several weeks to send the second version or should > I send a second version fixing this issue a wait for someone to ask me > to solve the conflict ? Just wait a bit, I should catch up on patches in this area soon, and I will let everyone know if patches do not apply. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
