From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the modules tree with Linus' tree Date: Thu, 19 Dec 2013 13:51:03 +1100 Message-ID: <20131219135103.a679236c1c4ec0f614fe3357@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Thu__19_Dec_2013_13_51_03_+1100_EoeSjd=9ulGg2wFv" Return-path: Received: from ozlabs.org ([203.10.76.45]:55515 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751386Ab3LSCvJ (ORCPT ); Wed, 18 Dec 2013 21:51:09 -0500 Sender: linux-next-owner@vger.kernel.org List-ID: To: Rusty Russell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, James Solner , David Howells --Signature=_Thu__19_Dec_2013_13_51_03_+1100_EoeSjd=9ulGg2wFv Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Rusty, Today's linux-next merge of the modules tree got a conflict in Documentatio= n/module-signing.txt between commit 3cafea307642 ("Add Documentation/module= -signing.txt file") from the tree and commit 160e01aca3da ("Add Documentat= ion/module-signing.txt file") from the modules tree. I fixed it up (I arbitrarily chose the version from Linus' tree) and can carry the fix as necessary (no action is required). --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Signature=_Thu__19_Dec_2013_13_51_03_+1100_EoeSjd=9ulGg2wFv Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBCAAGBQJSsl8bAAoJEMDTa8Ir7ZwV4o8P/1dbX9cQkuJ4hW4HEoyrBpQe ztRAhthKb6RD41r5wxz48FBlZIGVJmHq/3YDL3ARX06kSBmrkZGXqYSBN/MP/l+g I7PsTOgwKh0ZudjG3js30ISJSSKrO5uEb4sP3vmwbWu5Iffwe5BqixM2Qij0lhd6 gkmI5XctFLLkhAb5Y0/u5pRGzCYoxpabZWgBMfIRrwkZMUk46ini34iVgvizlBdN m4g2B54aOZUM7dFglXvC4EPYGR7i0r7mQebf1o5RpVYOQDXmtoUvDPzldBVWzlSZ OCw0VtFa1omFZwIEUD+TY5bUBfK8FQOIZeNHVO4qKrdS/Du7DYbslJ8K8QS4A/Cc hoQJNOOOyWdtkM85puaAdBuifBrbaT4X+U20z4vUo7j75akcXiIdnr0gzYT2oB4X kPo7m1LYt73XHK3dBSFQbxAyOIk3zLjidt1y5nEEUevISmg5GxGPXbQ2osJYUrw2 Yidxni1anXo4xxl/6zNUO0aRYVns1L1NwcE7EJMwa8Lh7acgVFRpg4PEzUy5dJ2Y 6XE2tsIce/FaMfESkDJMc2wUMVRr28Y1SjdMEVFAocQdjMF1QWeo+joAH6GlaIgs pPOC/UytqEMAzTDiMJO5xA3XocBRrwfLRX2V1ddmES20NfVf3xbX3uc+UtQVLb7V ucdFzBly6cMHgHbe+csj =7CiP -----END PGP SIGNATURE----- --Signature=_Thu__19_Dec_2013_13_51_03_+1100_EoeSjd=9ulGg2wFv--