From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sven Eckelmann Date: Thu, 21 Dec 2017 06:58:10 +0100 Message-ID: <4060789.SGkTrSoHMT@sven-edge> In-Reply-To: <20171220.143946.211997742797133128.davem@davemloft.net> References: <20171220110124.13117-1-sw@simonwunderlich.de> <20171220.143946.211997742797133128.davem@davemloft.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1669468.C6FPmEiCKP"; micalg="pgp-sha512"; protocol="application/pgp-signature" Subject: Re: [B.A.T.M.A.N.] [PATCH 00/19] pull request for net-next: batman-adv 2017-12-20 List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: b.a.t.m.a.n@lists.open-mesh.org Cc: David Miller , sw@simonwunderlich.de, netdev@vger.kernel.org --nextPart1669468.C6FPmEiCKP Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" On Mittwoch, 20. Dezember 2017 14:39:46 CET David Miller wrote: [...] > Pulled, but there was a minor docbook annotation conflict I had to > address. > > This pull added () to the function names in the docbook comments, > but this overlapped with the fix of a variable name in the docbook > info for the same function. > > It was trivial, but please take a look. Thanks, looks exactly like the merge I did while testing the net fixes with the net-next changes. Kind regards, Sven --nextPart1669468.C6FPmEiCKP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEF10rh2Elc9zjMuACXYcKB8Eme0YFAlo7TXIACgkQXYcKB8Em e0bvnxAAhN8+MUNTfpnUdX8KLL1Ia2Fi2XBOBpod9PRFMoix/lGGP8gz5kBooXlj nPIROMXTO6RA2VLO7H3eWwBX62msVTjEVxIgVDSmlBcN78XtNSBCA5Bg8STTn7+E QqA6Hv5wDznoqyDjLLpmtLAkQyYPtoVnt84MUq33qoD3WRJsUzRlRaSC9P9AagKh U9lYskgRG98WbrQkc6tlrVQy6vom0xL+lQu9f5W3w7iEjuyNyluh63MvI1q9Svn7 iA/Ia6DKffyA022ODM8eNEAkoWnVuRl/YrbWRFk5FFTJVGhGNHTV5sHEqwflDPAK pidoE2nyHxqi23wVSIhNc0pJQJcsgPInUujXOxCA/IRo6zD68rbuELDLvM1xJvRW zqnLPJYl5GD6v0kJTkMxxp5gbG6hjWmaYmA4OI3HFQ3+MUPVD0UzQqdGIj1XDFDb TJhIGlLSA/DJiwq9Vb5fla04xRTRYO2OpPZROVYtvlIyO+NtMMpJhKgCLqPnKLMb HLyQyDglpMR11B7V6COHGjFTpIYmiWuHvS1FAcUbubmPBkMFvpFwDQxxTZLAyTlH prJE+QPGhOJwyrSb7gLVDQLOk51TynA2XQv3lwCd3YHXQLnoBSQuxeUNpIPb/3Uv OSDozd+RHb85z0a7Nu2MqAP/nrNk/CQCov34CxRdbkvD+5Ctdbo= =pwKf -----END PGP SIGNATURE----- --nextPart1669468.C6FPmEiCKP--