Re: [PATCH 1/14] LinuxTV.org DVB driver update

David S. Miller
2003-10-11T17:59:20Z

On Sat, 11 Oct 2003 10:41:43 +0200
Michael Hunold <hunold@convergence.de> wrote:

> Unfortunately, I don't notice every patch that goes directly into 2.6
> without getting postet on the linux-dvb mailinglist. Now if someone
> changes stuff in our CVS in the same file, it can happen that the stuff
> from the kernel is wiped out.

It is your responsibility to resolve such things though. It is
inevitable and unavoidable that others outside of your development
group will make many changes to your files, as we fix bugs that
are tree-wide.