Re: [PATCH 3/3] block: remove last remaining traces of IDE documentation

[Paul Gortmaker <paul.gortmaker@windriver.com>]

[Re: [PATCH 3/3] block: remove last remaining traces of IDE documentation] On 29/04/2022 (Fri 00:43) Phillip Potter wrote:

> On Wed, Apr 27, 2022 at 12:59:17PM -0400, Paul Gortmaker wrote:
> > [Re: [PATCH 3/3] block: remove last remaining traces of IDE documentation] On 27/04/2022 (Wed 08:50) Jonathan Corbet wrote:
> > 
> > > The Documentation/ide part of this is already dealt with in docs-next;
> > > obviously there was more to do, though :)
> > 
> > Ah, I'd checked mainline master of today but not sfr's next.
> > 
> > Here is a delta diff against today's linux-next
> > 
> > Thanks,
> > Paul.
> > --
> > 
> > From ecb86eb357e5151ba5f7e7d172c65d07d88c4c39 Mon Sep 17 00:00:00 2001
> > From: Paul Gortmaker <paul.gortmaker@windriver.com>
> > Date: Wed, 27 Apr 2022 12:45:50 -0400
> > Subject: [PATCH -next] Documentation: remove last remaining traces of IDE
> >  information
> > 
> > The last traces of the IDE driver went away in commit b7fb14d3ac63
> > ("ide: remove the legacy ide driver") but it left behind some traces
> > of old documentation.
> > 
> > As luck would have it Randy and I would submit similar changes within
> > a week of each other to address this.  As Randy's commit is in the doc
> > tree already - this delta is just the stuff my removal contained that
> > was not in Randy's IDE doc removal.

[...]

> 
> Hi Paul,
> 
> Apologies if I'm missing something, but this updated diff still seems to
> conflict with Randy's earlier one. As cdrom doesn't get a lot of churn,
> I agreed with Jens that I would usually just send on all accepted
> patches at once to him and he would take them via his tree (I currently
> have four accepted patches, including your two others and Randy's patch,
> plus one other).
> 
> Anyhow, please could this be corrected? Or me shown the error of my ways
> (always possible I'm making a mistake) :-) Many thanks.

Are you working off linux-next?  If not, what is your baseline and what
are you running and what do you see?  For example, the commands below:

The ecb86 that I sent in this e-mail still applies on linux-next of
today which contains Jens next as you can seed:

$git show next-20220506~84^2~5
commit 9c83ebdb74780b2bf2f0cdf4964b33fab696cc44
Merge: 6694d6faf1e5 49c3b9266a71
Author: Jens Axboe <axboe@kernel.dk>
Date:   Thu May 5 17:18:31 2022 -0600

    Merge branch 'for-5.19/drivers' into for-next
        
$git checkout -b ide-next next/master
Branch 'ide-next' set up to track remote branch 'master' from 'next'.
Switched to a new branch 'ide-next'

$git cherry-pick ecb86eb357e5151ba5f7e7d172c65d07d88c4c39
Auto-merging Documentation/index.rst
Removing Documentation/cdrom/ide-cd.rst   
Auto-merging Documentation/admin-guide/kernel-parameters.txt
[ide-next 458628cda8fe] Documentation: remove last remaining traces of
IDE information
 Date: Wed Apr 27 12:45:50 2022 -0400
  6 files changed, 9 insertions(+), 646 deletions(-)
   delete mode 100644 Documentation/cdrom/ide-cd.rst

Paul.
--

> 
> Regards,
> Phil