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=-7.2 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,USER_AGENT_SANE_2 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 870C4C11F64 for ; Mon, 28 Jun 2021 22:51:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 57D0D61CF9 for ; Mon, 28 Jun 2021 22:51:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234332AbhF1Wxe (ORCPT ); Mon, 28 Jun 2021 18:53:34 -0400 Received: from gimli.rothwell.id.au ([103.230.158.156]:42761 "EHLO gimli.rothwell.id.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233746AbhF1Wxd (ORCPT ); Mon, 28 Jun 2021 18:53:33 -0400 Received: from authenticated.rothwell.id.au (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.rothwell.id.au (Postfix) with ESMTPSA id 4GDNBD5l3Wzyk8; Tue, 29 Jun 2021 08:51:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothwell.id.au; s=201702; t=1624920665; bh=/uxx2/XMQ5Xn4hhQm234IexsORg6ynHGjqB67VOSi74=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=QG7REzv0/Xp8xY7qsIXKwX0UX3gDejLyJm+KHWzQNVvWykg2YwKz83NxMnOiczG0+ 97ZolQARyWCogOWa56SdUZMtQ3EdsNW1NARlvTzETLXKpcFBA1r8MD1J4tTxXtNkNN 06U6mbEzak2k6bVjgyV312wfdz4sbqEx+bzdgUy2cXyArkYp8T5jBho2fpq9+1y6v/ Qtb7o84eludtZ1WhJc4PydWQ4BNXkLPogby6Gk5tXdzV+CcBtuA2OChCstOmspjTKc nhgMQZTVf9sdZm8cX2rYLa58fp5GOIjT59wHRKrlU5+FKsyIpCKcjaZM1OGvhjRqJ5 PY8lVn7sKGNYg== Date: Tue, 29 Jun 2021 08:50:59 +1000 From: Stephen Rothwell To: Andy Shevchenko Cc: Stephen Rothwell , Jens Axboe , David Miller , "Gustavo A. R. Silva" , "Alexander A. Klimov" , Christoph Hellwig , Finn Thain , Linux Kernel Mailing List , Linux Next Mailing List , Vaibhav Gupta Subject: Re: linux-next: manual merge of the block tree with the ide and kspp-gustavo trees Message-ID: <20210629085059.10ab5080@elm.ozlabs.ibm.com> In-Reply-To: References: <20210621141110.548ec3d0@canb.auug.org.au> <20210621223045.018223b9@elm.ozlabs.ibm.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/wIs9KiAiv9TORwvmFtUACfm"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/wIs9KiAiv9TORwvmFtUACfm Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 28 Jun 2021 14:36:16 +0300 Andy Shevchenko wrote: > > On Mon, Jun 21, 2021 at 10:30:45PM +1000, Stephen Rothwell wrote: > > On Mon, 21 Jun 2021 13:56:13 +0300 Andy Shevchenko wrote: =20 > > > On Mon, Jun 21, 2021 at 7:13 AM Stephen Rothwell wrote: > > > =20 > > > > 2c8cbe0b2971 ("IDE SUBSYSTEM: Replace HTTP links with HTTPS ones") > > > > 9a51ffe845e4 ("ide: use generic power management") > > > > f9e09a0711ca ("ide: sc1200: use generic power management") > > > > d41b375134a9 ("ide: delkin_cb: use generic power management") > > > > 6800cd8cbc6e ("ide-acpi: use %*ph to print small buffer") > > > > 731d5f441e1c ("ide: Fix fall-through warnings for Clang") > > > > > > > > from the ide and kspp-gustavo trees and commits: =20 > > >=20 > > > As far as I can tell the IDE hasn't sent PR to LInus for a long time > > > (like a few release cycles). I don't know what happened there, though= . =20 > >=20 > > Yeah, the top commit in the ide tree (which is intended to hold bug > > fixes for Linus' tree) is dated 4 Aug 2020, so hopefully this will > > prompt Dave to do something with it. There has been no ide "future > > development" tree in linux-next since 2011. =20 >=20 > Yep, I think the best approach here may be to apply those (by sending a P= R) > followed by marking subsystem orphaned or delete it entirely. >=20 > David, what are your thoughts? Well the conflicting block tree commits have now been merged into Linus' tree and completely remove drivers/ide, so I will just remove the ide tree from linux-next starting tomorrow. --=20 Cheers, Stephen Rothwell --Sig_/wIs9KiAiv9TORwvmFtUACfm Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmDaUlMACgkQAVBC80lX 0GyrHwgAollpbnqh8PTS//6xHSm/ZWQJLifI2b/xCENwIeWSol/IZH/dTNcXRVCT +GL7RFFOrNWgkQNgDWy+wMN640wuTvllK3Ggn1/XapjWV5rOcqSFMnfjJXImpxkg TvvNluc17nddxFX1SfA10Y8oOGcbRCCQqV4bofpjxu5Bbo0MHxTqzWhfZ8QejEAp KWmaGjMjTxoqpk0bVR8t6H8Kg2Vfw7e/Aa8MavZwz8Um7bQ+fZmlUYoZEcaYfSfd XIEtKwd9qP0XKZ0p45our0NqD/N+rtjtFq2efiMGwSuwjzbvEJOpsFxZk1aYlYWd yzJV0pBmkUmmJiOT01i3+1hYpj2daA== =jRXm -----END PGP SIGNATURE----- --Sig_/wIs9KiAiv9TORwvmFtUACfm--