From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751821AbdJRQEv (ORCPT ); Wed, 18 Oct 2017 12:04:51 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:55142 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750853AbdJRQEu (ORCPT ); Wed, 18 Oct 2017 12:04:50 -0400 Date: Wed, 18 Oct 2017 17:04:42 +0100 From: Mark Brown To: Kees Cook Cc: Felipe Balbi , Tony Lindgren , Felipe Balbi , Greg Kroah-Hartman , Allen Pais , linux-omap@vger.kernel.org, linux-usb@vger.kernel.org, Linux-Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb tree Message-ID: <20171018160442.kgdwfzobxtcbf636@sirena.co.uk> References: <20171018144912.qlc7vlnhdqmr5tdd@sirena.co.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="td5ldxmizzp7fmgw" Content-Disposition: inline In-Reply-To: X-Cookie: Thank God I'm an atheist. User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --td5ldxmizzp7fmgw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Oct 18, 2017 at 08:40:04AM -0700, Kees Cook wrote: > On Wed, Oct 18, 2017 at 7:49 AM, Mark Brown 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. --td5ldxmizzp7fmgw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAlnne5kACgkQJNaLcl1U h9AKBgf6A2WhnLcvWwwbXLd0hXyaIS+U6lx0m25qO0N3+GspQSDZzBonCYiEwKh5 ri8NUwF9kPVPln3HVqU3C13izhvWAIK+7l6Pjh0CWT3/djAhOIPavSHFviV70daw E5YkB0cQDJGwg99ca62p79g39UtSFFGwDttaAFsuBzCGe9qLq3DLd3SqtmXZbQnN KnbzNh1FSn2dqaw6p2n1EVpvweG46iZYmcjKpAC2Mhv7/o1k0dDTUtY/nTH9wchi dxNvRDvO8mh4G+xnRhsUPGvQB4EGx2mQgALu9JbpxIqN+C1GC4P+H9VV4nbN0NXH /GX+/+y2XT2LG5NRxAX4ErW4qWI7rA== =dKuH -----END PGP SIGNATURE----- --td5ldxmizzp7fmgw--