On Wed, Oct 18, 2017 at 08:40:04AM -0700, Kees Cook wrote: > On Wed, Oct 18, 2017 at 7:49 AM, Mark Brown <broonie@xxxxxxxxxx> wrote: > > I fixed it up with the USB version and can carry the fix as necessary. This > > is now fixed as far as linux-next is concerned, but any non trivial > > conflicts should be mentioned to your upstream maintainer when your tree > > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularly > > complex conflicts. > FWIW, timer_setup() should be preferred over setup_timer(). Bah, that's unfortunate. When more of these come up I'll do that. It would be better to sort these out in the relevant trees though, there's quite a few of these conflicts and it's not super obvious if you're not into the timer code what's preferred.
Attachment:
signature.asc
Description: PGP signature
