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

Sam Ravnborg
2003-10-12T11:08:51Z

On Sun, Oct 12, 2003 at 11:16:03AM +0200, Geert Uytterhoeven wrote:
> On Sat, 11 Oct 2003, David S. Miller wrote:
> > 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.
>
> So you best subscribe to bk-commits-head and monitor every patch that affects
> drivers/media/dvb/.

Or more simple - keep a copy of the kernel where your patches got applied,
and make a diff between that kernel and latest.
Apply that diff to your local tree, and you are up-to-date.

This gives a good opportunity to review what has been applied without
passing the maintainer.

And finally it also resolve potential conflicts.

And as always - the more frequent you get patches applied, the less burden
it is to update to latest kernel.

Sam