From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drivers-x86 tree with the tree Date: Tue, 12 Mar 2013 13:34:02 +1100 Message-ID: <20130312133402.7a3e5edfbbfa423fd91575a2@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Tue__12_Mar_2013_13_34_02_+1100_YpdBZ6RhOWuGd.Uj" Return-path: Received: from haggis.pcug.org.au ([203.10.76.10]:41423 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755008Ab3CLCeW (ORCPT ); Mon, 11 Mar 2013 22:34:22 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Matthew Garrett Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Benson Leung , Linus --Signature=_Tue__12_Mar_2013_13_34_02_+1100_YpdBZ6RhOWuGd.Uj Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Matthew, Today's linux-next merge of the drivers-x86 tree got a conflict in drivers/platform/x86/chromeos_laptop.c between a series of patches from Linus' tree and the same series of patches from the drivers-x86 tree. There was an extra patch merged into Linus tree affecting this file, so I used that version. Please, when you rebase/rewrite stuff before sending it to Linus, also update your -next included tree (or just *don't do that* :-(). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Signature=_Tue__12_Mar_2013_13_34_02_+1100_YpdBZ6RhOWuGd.Uj Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJRPpQaAAoJEECxmPOUX5FE8k8P/j97YNzce0MmOqScophU21HV G/WmJkdZwpEtgxdjgV3ArY2vvA99zoxzUdVenS67pqeAGNoNdpDPqxl2pcnJVa+b 3B5jtOrTusWcC/00m5IoCVfuHw4eC4KW7PM0AjzU3IJe8bHoOKLi9KSaqzjAxmrk VB+SnFWoBifhqUrGIi5nwkRHmfGRCsjFClTlPm6kjSbpntr1klatAKCM8SPtoR0A jxVdq3kwUXa8PVsOz6C2qUf8hB4DJDxijTnjQ60kCwEEKsNZUElVoIdq5snWu6ks FknFGYyeJC7Dx995uE2UNqx3KyWZODSzR2qJs/3AmIhdPNCjQVOg6jbXFK6SRYtE cwr9oL+AHtAs2KwNvtdSMn8NCCTuHdr/T91fs3hdEUEpiZarwj3aX+T5V0uZrg2a ry9/xi1thX7v4Qda1A+agyq+tPewddz7Mx+1HPc4mSgUNbvYPneZaBY360H7PI47 1LHG1/X9NHj6CpL5E3pEUqFWlWy28uPvyimu2lRic26oz/r3TcMQeO8qwFLrRC+z c5E/2NhXk2+vVnMbjdDrMmDQ8/TU+dwEv/+5K4nUDxZMRUSJ56bCzRF7ETGO8/YW 3Yr4oDpJOP/Yb1IOdl1fHF+2zS96z+7HvvpnMGOGLzu30z0uPJyfJmjg5TCzB73J mh9RE3GCIMMAqD3lgAmA =QHRy -----END PGP SIGNATURE----- --Signature=_Tue__12_Mar_2013_13_34_02_+1100_YpdBZ6RhOWuGd.Uj--