From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Kleine-Budde Subject: Re: linux-next: Tree for Dec 14 (net/can) Date: Fri, 14 Dec 2012 22:32:15 +0100 Message-ID: <50CB9ADF.6050400@pengutronix.de> References: <20121214184216.e05d715c71468f475d8bcfeb@canb.auug.org.au> <50CB7BAD.9040805@infradead.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig8648F8A4665292D82D70378F" Return-path: In-Reply-To: <50CB7BAD.9040805@infradead.org> Sender: linux-can-owner@vger.kernel.org To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-can@vger.kernel.org, Oliver Hartkopp List-Id: linux-next.vger.kernel.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig8648F8A4665292D82D70378F Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 12/14/2012 08:19 PM, Randy Dunlap wrote: > On 12/13/12 23:42, Stephen Rothwell wrote: >> Hi all, >> >> Changes since 20121213: >> >> Lots of conflicts are migrating between trees. >> >=20 > on X86_32: >=20 > drivers/net/can/sja1000/sja1000_of_platform.c: In function 'sja1000_ofp= _probe': > drivers/net/can/sja1000/sja1000_of_platform.c:124:13: error: 'NO_IRQ' u= ndeclared (first use in this function) > drivers/net/can/sja1000/sja1000_of_platform.c:124:13: note: each undecl= ared identifier is reported only once for each function it appears in > make[5]: *** [drivers/net/can/sja1000/sja1000_of_platform.o] Error 1 Thanks. Fixed, I'm going to send a pull-request to David Miller. Marc --=20 Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | --------------enig8648F8A4665292D82D70378F Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iEYEARECAAYFAlDLmuIACgkQjTAFq1RaXHMY+wCeI6hjAK6Y03IlsbQSmlLtQKwR DUAAn0nGWOBhGT41I88aBih9i431LYtB =/tNH -----END PGP SIGNATURE----- --------------enig8648F8A4665292D82D70378F--