On 03/03/16 13:41, Krzysztof Hałasa wrote: > Hans Verkuil <hverkuil@xxxxxxxxx> writes: > >> When a driver is merged for the first time in the kernel it is always as >> a single change, i.e. you don't include the development history as that >> would pollute the kernel's history. > > We don't generally add new drivers with long patch series, that's right. > That's because there is usually no reason to do so. This situation is > different, there is a very good reason. > > I'm not asking for doing this with a long patch set. A single patch from > me + single patch containing the Ezequiel changes would suffice. > >> Those earlier versions have never >> been tested/reviewed to the same extent as the final version > > This is not a real problem, given the code will be changed immediately > again. > >> and adding >> them could break git bisect. > > Not really. You can apply the version based on current media tree, > I have posted it a week ago or so. This doesn't require any effort. > > BTW applying the thing in two consecutive patches (the old version + > changes) doesn't break git bisect at all. It only breaks the compiling, > and only in the very case when git bisect happens to stop between the > first and second patch, and the driver is configured in. Very unlikely, > though the remedy is very easy as shown in "man git-bisect". > This is a common thing when you do git bisect, though the related > patches are usually much more distant and thus the probability that the > kernel won't compile is much much greater. > > Alternatively one could apply the original version to an older kernel and > merge the product. Less trivial and I don't know why one would want to > do so, given #1. > > One could also disable the CONFIG_VIDEO_TW686X in Kconfig (at the > original patch). Possibilities are endless. > > We have to face it: there is absolutely no problem with adding the > driver with two patches, either using my original patch or the updated > one. And it doesn't require any effort, just a couple of git commands. > >> It is a quite unusual situation and the only way I could make it worse would >> by not merging anything. > > Not really. > There is a very easy way out. You can just add the driver properly with > two patches. > > > Though I don't know why do you think my driver alone doesn't qualify to > be merged (without subsequent Ezequiel's changes). It's functional > and stable, and I have been using it (in various versions) for many > months. It's much more mature than many other drivers which make it to > the kernel regularly. > > It is definitely _not_ my driver that is problematic. > There is no point whatsoever in committing a driver and then replacing it with another which has a different feature set. I'm not going to do that. One option that might be much more interesting is to add your driver to staging with a TODO stating that the field support should be added to the mainline driver. So the code is there and having it in staging makes it a bit easier to do the migration. And if nothing is done about it after 1-2 years, then it is removed again since that indicates that there is not enough interest in the features specific to your driver version. I'm not sure if Mauro would go for it, but I think this is a fair option. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
