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.
Sam