From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752286AbeC0WDa (ORCPT ); Tue, 27 Mar 2018 18:03:30 -0400 Received: from ozlabs.org ([103.22.144.67]:38655 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751890AbeC0WD2 (ORCPT ); Tue, 27 Mar 2018 18:03:28 -0400 Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Date: Wed, 28 Mar 2018 09:02:22 +1100 From: Stephen Rothwell To: Arnd Bergmann , Masahiro Yamada Cc: Linux-Next Mailing List , Linux Kernel Mailing List , James Hogan Subject: linux-next: manual merge of the asm-generic tree with the kbuild tree Message-ID: <20180328090222.0f3c34da@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_//QhUNAk4SqR+7IFcMV3udDS"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_//QhUNAk4SqR+7IFcMV3udDS Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the asm-generic tree got a conflict in: arch/metag/boot/dts/Makefile between commit: b985b71d295f ("kbuild: mark $(targets) as .SECONDARY and remove .PRECIOUS= markers") from the kbuild tree and commit: bb6fb6dfcc17 ("metag: Remove arch/metag/") from the asm-generic tree. I fixed it up (I just removed the file) 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 conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell --Sig_//QhUNAk4SqR+7IFcMV3udDS Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlq6v24ACgkQAVBC80lX 0Gw/VQf/TNvKlcI+j0uJ/vEMgGzy7j0oc462k0SmWQPs5vhPrFcGl5Dwk/mrAReg XXK1xbI3Yxg1DvmrJquXh9g8z/U2PkJNgZ0C0MG5Kki/T7ZKyqgaOvH/QrgcHB1h GN7VClrG25fDh6/u03shkMx5yccFmagzzLHi+Y5Ir7XCw/4hVy8EpWshaxdel6ze 2pziRnkqTp0ZU+ZQhMura10pKQZvshPTllY+euugHB//l7Ia2oCDJzPP8aZpO6Xi psiMpLZrZmt9CPg0VhoRvfs/h3lJg43guY4TApqPys0xld0c3NOGmAmBTXFLv8mr f47vlVaSKHmVKFUx/ly8KK7dMsv0Aw== =4lXp -----END PGP SIGNATURE----- --Sig_//QhUNAk4SqR+7IFcMV3udDS--