On Wed, Oct 18, 2017 at 7:49 AM, Mark Brown <broo...@kernel.org> wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in:
>
> drivers/usb/phy/phy-isp1301-omap.c
>
> between commit:
>
> 4c13fec1ba55595 ("usb: isp1301-omap: Convert timers to use timer_setup()")
>
> from the usb tree and commit:
>
> 687f272c6b0e89d ("usb: phy: omap: use setup_timer() helper.")
>
> from the usb-gadget tree.
>
> 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().
-Kees
--
Kees Cook
Pixel Security
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
