From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kees Cook Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb tree Date: Wed, 18 Oct 2017 08:40:04 -0700 Message-ID: References: <20171018144912.qlc7vlnhdqmr5tdd@sirena.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: <20171018144912.qlc7vlnhdqmr5tdd-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org> Sender: linux-usb-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Mark Brown Cc: Felipe Balbi , Tony Lindgren , Felipe Balbi , Greg Kroah-Hartman , Allen Pais , linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Linux-Next Mailing List , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org On Wed, Oct 18, 2017 at 7:49 AM, Mark Brown 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 majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html