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 X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0370CC433E6 for ; Sun, 14 Feb 2021 22:00:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CAA2664E29 for ; Sun, 14 Feb 2021 22:00:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229994AbhBNWAX (ORCPT ); Sun, 14 Feb 2021 17:00:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229827AbhBNWAT (ORCPT ); Sun, 14 Feb 2021 17:00:19 -0500 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D6BBC061574; Sun, 14 Feb 2021 13:59:39 -0800 (PST) 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 4Df1Nj6Rdbz9sCD; Mon, 15 Feb 2021 08:59:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1613339976; bh=NrAe61u6Sjbojr9dkYz/RB+vJuIKfMkQw32Zxlhg3L4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=YAeMr1qlQWm8K9T24uDAqbaxFkZQT5D1FK5iM9dpg/Rog9YHEVih2+ECSCADzYYES ESg7Z7hXv4HE93W8/AM2oMWT9IKNVL3SVi4n9eRVsnhM23ILXCGIwLhWyw/iAn3G1W i1QbHmcsQcsTTdJ3xRm8dd7h7XqGwN8W0mkLtGQ2FHB5hyrA3W7S2Qd4d7o8PjDv+s SQ2yZ7MyhtDlMnTdJQPHxvoDzQc/SxS3dZ1lwUNRaaTN/7peR7VJtM3wuht6qwdyyd YgJQAVVJ0nhNYNj+vrLJ4hjrj/6wRtLeeTMHejmCP8JO/R2FoeAgO9xnAgzBUtlaIo JdQ+bjMHggIjQ== Date: Mon, 15 Feb 2021 08:59:33 +1100 From: Stephen Rothwell To: Masahiro Yamada , James Bottomley Cc: "Martin K. Petersen" , Hannes Reinecke , Linux Kernel Mailing List , Linux Next Mailing List , Sasha Levin Subject: Re: linux-next: manual merge of the scsi tree with the kbuild tree Message-ID: <20210215085933.53d42bf0@canb.auug.org.au> In-Reply-To: <20210128165611.24fcb9cb@canb.auug.org.au> References: <20210125150213.2b09c92e@canb.auug.org.au> <20210128165611.24fcb9cb@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/mVXRk7oNoSzVZxC/pwmNUrv"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/mVXRk7oNoSzVZxC/pwmNUrv Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Thu, 28 Jan 2021 16:56:11 +1100 Stephen Rothwell = wrote: >=20 > On Mon, 25 Jan 2021 15:02:13 +1100 Stephen Rothwell wrote: > > > > Today's linux-next merge of the scsi-mkp tree got a conflict in: > >=20 > > drivers/scsi/gdth.c > >=20 > > between commit: > >=20 > > 537896fabed1 ("kbuild: give the SUBLEVEL more room in KERNEL_VERSION") > >=20 > > from the kbuild tree and commit: > >=20 > > 0653c358d2dc ("scsi: Drop gdth driver") > >=20 > > from the scsi-mkp tree. > >=20 > > I fixed it up (I deleted 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 >=20 > This is now a conflict between the scsi tree and the kbuild tree. With the merge window about to open, this is a reminder that this conflict still exists. --=20 Cheers, Stephen Rothwell --Sig_/mVXRk7oNoSzVZxC/pwmNUrv Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmApnUUACgkQAVBC80lX 0GxJaAf/R6MUE1zwS5cuRIEuK2Acv0OA5jerZ+7td4veR0mg/VHE/euacXYSxKPr QF6aYV3i8xWCAvumm4Sb73yJ94UeCdGTVwL85iq+MDc1OrPRF3Vt74x8h22E7cWr hTshVBUHO05TQwo0ww/YBrSgFo3Nf/Zl+0xzYbJjD2Vzd6H9KJwKXItnHjJ87IfQ C7FEdH0VVeYjguKff+R4KOBpMJ9k44do+/PhVF9WPrfix4bxxDFHigelzSPUMuxz Mx3l81wf8ludNHSxDMAFgG/sXH06JSQMaeyUniQRbhjVxZclY06l5Tffy6BHwIBs k/bnEQkm7wgQOmFOSQBdE1Bm6tydqA== =KYdI -----END PGP SIGNATURE----- --Sig_/mVXRk7oNoSzVZxC/pwmNUrv--