Michael Krufky <mkrufky@xxxxxxx> wrote:I think you may have misunderstood me here. v4l didnt make the patches... You (akpm) did... We included them in our cvs when you merged them into -mm:
However, sometimes there are patches in -mm that are incompatable with -linus. An example of this is "Pavel's pm_message_t mangling" ...OK. The way I handle an exceptional case like that is to merge the
-linus-compatible patch into -mm and then have another patch on top of that
which fixes things up for the -mm tree. Later, that patch gets folded into
your patch if Pavel's stuff gets merged. Or gets dropped if it doesn't get
merged. Or gets folded into Pavel's stuff if your patch goes in first.
IOW: for a bunch of reasons we really do want to make the "fix up V4l for
-mm differences" patch be a separate patch file.
And I very much prefer that people work against -linus and when these
things occasionally pop up I'll just fix stuff up. It's only if someone is
explicitly working against a patch which is only in -mm that they should
have to care about -mm vs -linus differences.