From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0D1ECC433EF for ; Wed, 13 Jul 2022 23:15:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=D+CDb+Zbhpdv0rhTyXc6WtU+4rZldm+fBrCQtH7bQPg=; b=Jys1WsvdqME5Koi0nRUm+IXpd5 M7sSi/foWjWVi3RZflKMhF+dikNEfSRQku8bsDPlI/ftnR62rlzBWlOPDEbXQc9l/2r5pNN13sUyX JlZi9iMSN+bXE0rcVpDX1lntjseAERw6mm+4rKIDLhtMguNsqx0pExj2GgN0d2TwWxP587Dy5dvZA jpPASENXxaOAClwEZgfInJWrt3B5wpgICCRJoqvUaFxOZbYXyAHtNCYuvaFWDdEYyeog47w6xGZam RYw1Ta5yC6bh6soPtHpRNMDJW9mYvsbfhXWUB5ux+WneKSK7HWkaubMfGTa6JqUxdbLC3bzoKTBtG u2jN8fSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBlY2-0095CH-8G; Wed, 13 Jul 2022 23:13:38 +0000 Received: from gandalf.ozlabs.org ([150.107.74.76]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBlXy-009580-Jg for linux-arm-kernel@lists.infradead.org; Wed, 13 Jul 2022 23:13:36 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Ljthf4MRTz4xZB; Thu, 14 Jul 2022 09:13:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1657754005; bh=8QDhy/yafq+zddNmXsnWB3SOgiThHS2yHFHT/LoOpPE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=rhhdHVpJFja5h2fSgLdZya6P+U7TbBDSn6rRH4VHqMSUaB3LGcs5Hmh3RdvubQru9 LdzS+/GJIrXRwyAKvmvxb5af9C6RrpugtIqakDrK+uxEgZOJgvSNhAwEHDYv4YFJ6X yGBLHCPRC9TX3wfFJZ9NwVj6n4w8Sx0wcR3lARL2DL0C/0JRgxTNrEefXNR4R45pXK /4rEEzwDSzPP9MwJhISz0/XcgksoVoMYg2UDRM9PnD02nzdRt/dyPd/sm0Dw42Ge22 PyvfWTurVrmfv1oMugdeg5/mfbJrFKh/Esq+3BghM+tL6K1pTGtoWNg+vMIm9f61QL lu8p/nFB9bEUQ== Date: Thu, 14 Jul 2022 09:13:21 +1000 From: Stephen Rothwell To: Greg KH , Olof Johansson , Arnd Bergmann Cc: Florian Fainelli , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Gleixner , William Zhang , ARM Subject: Re: linux-next: manual merge of the broadcom tree with the spdx tree Message-ID: <20220714091321.4ecfe830@canb.auug.org.au> In-Reply-To: <20220711095520.4fad4c97@canb.auug.org.au> References: <20220711095520.4fad4c97@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220713_161334_818649_3A46DD86 X-CRM114-Status: GOOD ( 19.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: multipart/mixed; boundary="===============3056391671934078544==" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org --===============3056391671934078544== Content-Type: multipart/signed; boundary="Sig_/ekux/TwU2iZousa/RrxmrUB"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/ekux/TwU2iZousa/RrxmrUB Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 11 Jul 2022 09:55:20 +1000 Stephen Rothwell = wrote: >=20 > Today's linux-next merge of the broadcom tree got a conflict in: >=20 > arch/arm/mach-bcm/bcm63xx.c >=20 > between commit: >=20 > 52e6676ef56f ("treewide: Replace GPLv2 boilerplate/reference with SPDX = - gpl-2.0_30.RULE (part 1)") >=20 > from the spdx tree and commit: >=20 > 889390f83d4e ("arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA") >=20 > from the broadcom tree. >=20 > 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. This is now a conflict between the arm-soc tree and the spdx tree. --=20 Cheers, Stephen Rothwell --Sig_/ekux/TwU2iZousa/RrxmrUB Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLPUZEACgkQAVBC80lX 0Gy92gf8C1qZ21pWn3/VKWtP0JOV2I9uvqpJH4DWoDDbfqOpINgqTBEn2Gvqk9b1 6N7fK+C71ZZl99pkNgAM7o5pHPEFqhiVTX2M5VXCCNjqxfJCN40NY7L5OAS7TA9e rkHsyUywQexnADKUKuhtjwR5ebH5peteu32xsXOE/D7rmrbCunvWt34HkEWliCNH 3OhVZ4K6lhe9JDPYA4Mb5qf/5BDsdNx+NLuP6sPi8QJ3BM6lk2fTTvzGW0ynhAJI zyguUGi/j0Oa58N8RB1G+0OGWIcHTvs6ar+r7neGdmG+sH7upnsY3saVZC2F0zuw gbsxc89VGhNA1vb3Tu4GqXcTGIYpkA== =RNOJ -----END PGP SIGNATURE----- --Sig_/ekux/TwU2iZousa/RrxmrUB-- --===============3056391671934078544== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --===============3056391671934078544==--