From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932206AbdGCQlW (ORCPT ); Mon, 3 Jul 2017 12:41:22 -0400 Received: from mout.gmx.net ([212.227.17.22]:58751 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932166AbdGCQlV (ORCPT ); Mon, 3 Jul 2017 12:41:21 -0400 Subject: Re: linux-next: manual merge of the jc_docs tree with the kbuild tree To: Stephen Rothwell , Jonathan Corbet , Masahiro Yamada Cc: Linux-Next Mailing List , Linux Kernel Mailing List References: <20170626111331.5443587b@canb.auug.org.au> <20170703125859.0678914b@canb.auug.org.au> From: Kamil Rytarowski Message-ID: <054dc72a-39ce-ee8c-62d1-c17f487009de@gmx.com> Date: Mon, 3 Jul 2017 18:43:32 +0200 User-Agent: Mozilla/5.0 (X11; NetBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.1.0 MIME-Version: 1.0 In-Reply-To: <20170703125859.0678914b@canb.auug.org.au> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="GMfQrbd2Hp2IBUu6FxPbGpC6VCvSJa4iP" X-Provags-ID: V03:K0:cz5ZQyZ3m2/v57OOEUg8gW+B3ifYroyKy5nZ7Gji2OGphG31PVv KreW2KVYGWJtCDlujUF9d8KHpzkpto+FCt0qqVuZZ+rE7a9XVNBI5GvWJJDX6sq+mdGGTt3 nVvlJ+0B4g58W18hb6ZWA4FesVzs8qKZcR4pkISG4JG+X3NJR2OvhczZM53cgsVc1KPTO/M EWBrWXSHb1cR0SUCY3mdA== X-UI-Out-Filterresults: notjunk:1;V01:K0:3MxkUMadZ98=:64HSUYd826C4TdHxby0gw/ 7o03FHoIwTn7Cewd81Se6LBl7Wi+7jtQKmP+1JNj4tZgbCxOxo2PLDv3atw5tOanwTTE1h9w5 4EwBUK1zGtB3Rt8zOSbK8sGcOvNMVjDj7VmS867WRMwUVxbqYBQWpU6oSVlACbg/435qaj3wE 4zECPntfFARvNqCb5emnWgZ4np2150PPvpLcmKUOA0pJjFXYD1M6mu9i0pQmHztOpC5RuXgNK XdEFUI0AEiWO4D0H/2MWoBReqRaOUVFK755UpmBBViqROwsrDRrwWn6+J+T+RhN5gwTQvbAB3 fQ5aCq3Oh9d0bel+6reOgpVGGsEJzBu1JktqoaB6uLzMDm3M4bsut5HKbvWhzrDYoKujIrJwJ n1E9TXnLOFgolCooeF5SfxMzCCmXfKqcfqTBR+JAYusAxawAnHRfJuK9/NSxKSzkt8ItrdfZq 68q/9NtO8AlSqcbkGJMZH7JpR9cCqYM0/e+B2cwFDvE/JIeIeuZrRlDhRsYvmOwm0UDtV6jKJ PfkAh8XTvEwk76Ml+KQeodjhJOK6/qy5IAVqh4QYWBAEFjpDDBjGKnyZ5/5RAWhWOo154EhC1 vJcY81ALNaCcNPd16aeOaH1EKre35ZSoGCGjKuz5W9ptZbbb7O8Em2EjlT1ycWJuIGWiNRpNf VnTnnYBm0IISdcRZpIrq69wMf+9tOkQZ3SRaILfl3reisUfNYeInuQtDC0PwQWI5Gh0KXEQov QDZO+I14N7JbjhoYbm+8Dc0TgcnpfypxhvjxWLKcjQ2EcDTJ9mML6blFOBc= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --GMfQrbd2Hp2IBUu6FxPbGpC6VCvSJa4iP Content-Type: multipart/mixed; boundary="xnsQVpoVNsUhonTaq4xVmfFQUbG3sGJUT"; protected-headers="v1" From: Kamil Rytarowski To: Stephen Rothwell , Jonathan Corbet , Masahiro Yamada Cc: Linux-Next Mailing List , Linux Kernel Mailing List Message-ID: <054dc72a-39ce-ee8c-62d1-c17f487009de@gmx.com> Subject: Re: linux-next: manual merge of the jc_docs tree with the kbuild tree References: <20170626111331.5443587b@canb.auug.org.au> <20170703125859.0678914b@canb.auug.org.au> In-Reply-To: <20170703125859.0678914b@canb.auug.org.au> --xnsQVpoVNsUhonTaq4xVmfFQUbG3sGJUT Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hello, Am I expected to do it myself and resend a new patch? On 03.07.2017 04:58, Stephen Rothwell wrote: > Hi all, >=20 > With the merge window opening, just a reminder that this conflict still= > exists. >=20 > On Mon, 26 Jun 2017 11:13:31 +1000 Stephen Rothwell wrote: >> >> Today's linux-next merge of the jc_docs tree got a conflict in: >> >> scripts/kernel-doc-xml-ref >> >> between commit: >> >> cb77f0d623ff ("scripts: Switch to more portable Perl shebang") >> >> from the kbuild tree and commit: >> >> 52b3f239bb69 ("Docs: clean up some DocBook loose ends") >> >> from the jc_docs tree. >> >> I fixed it up (the latter removed the file, so I did that) 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 conflicti= ng >> tree to minimise any particularly complex conflicts. >=20 --xnsQVpoVNsUhonTaq4xVmfFQUbG3sGJUT-- --GMfQrbd2Hp2IBUu6FxPbGpC6VCvSJa4iP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJZWnQ0AAoJEEuzCOmwLnZsUDkP/jd8a3ahwGKjziSLFDcyeh9y RmiC/1mvmyJs9z2aqUzXTc4AWK40M6toSlhcZxaLyhOd6KEoCqpm3PyV2AdT3r1y VE4R178li56eZbdfIDtZ41w9oRfuBcrb4z4oqUtXOzh5gy91eLDiAUaWZzoOP4cN Z8nA75y1xUGIFItYT/aUlPYNX/5A19CVPTF5+5k+H8ROx14l+GsHw8L5Fdh59nta 7aVtc+GEwBLPtmH9MhS3mUWEWEfcReMz8oWKSKYiyNBUQYG4aLcn4ZfnJCWWVHps EaPWjRgAc8TZi6KE69LA6h00gZ+6XKUNqKkY7pZhLEklzDt28GM1ToO1LHXgRjR9 acmRS8i3SzM70NA1Ip/lujoJzjwFlu28ARPrxbHZs3hPdCJxXuQrFo7EAL3+pfI8 7tMnfbK9bMpeGuLtIn9dYMUwyXg6b5vmsfSe7boULN2UO89+w0EboJfGfGc1dOHe XnxL89C1Lb4tt++mDbXAVL/YUBE5T/v+f5CfwvzBCpwFB03rzhKGJCu01s8ossWZ XijYcHzkP3WELn2+GN63tMUESVpH5+7/78E3eeQsd27L7ARs4ZA+WEIgmXcC28Qv w1c2H3OETdDQ997ceSq0YPPiIehkZzPjsg4IbuNTvh2+K8wQSp5xDzGwXAW+XkdQ RdBwO9al1V+UPUxiOhiR =MEJt -----END PGP SIGNATURE----- --GMfQrbd2Hp2IBUu6FxPbGpC6VCvSJa4iP--