Re: [PATCH] USB: serial/ftdi_sio.c Fix kernel oops

Willy Tarreau
2013-06-07T18:50:03Z

On Fri, Jun 07, 2013 at 10:30:09AM -0700, Greg Kroah-Hartman wrote:
> On Fri, Jun 07, 2013 at 03:14:32PM +0200, Lotfi Manseur wrote:
> > Handle null termios in ftdi_set_termios(), introduced in
> > commit 552f6bf1bb0eda0011c0525dd587aa9e7ba5b846
> > This has been corrected in the mainline by
> > commits c515598e0f5769916c31c00392cc2bfe6af74e55 and
> > a816e3113b63753c330ca4751ea1d208e93e3015.
>
> Then why shouldn't we just include those commit instead of your patch,
> which looks much different from these?
>
> I'd much rather take the originals, not something else.

Indeed. I've checked, and the second commit was just cosmetic (silence
a warning reported by sparse for ptr == 0 introduced in the first one).

The context is minimally different (original commit introduces a jump
to a label whose context has changed). I tend to think that the merged
fix has less changes of being incorrectly applied, but given their
triviality we could very well merge the original ones instead, and
keep initial authorship BTW.

Willy