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

[Jonathan Corbet <corbet@lwn.net>]

Phillip Potter <phil@philpotter.co.uk> writes:

> I was yes, the point I was trying to make (poorly) is that your patch
> conflicts with Randy's patch which itself is not yet in linux-next, as
> normally I send everything together at the start of the merge window to
> Jens, as I don't have my own kernel.org tree yet, and usually I only get
> one or two patches in a cycle anyway.
>
> This is not your fault, you couldn't have been expected to know this in
> retrospect, and I should probably look into getting my own tree/GPG key
> sorted to alleviate this problem in future.
>
> In the meantime, if you're comfortable with the idea, I can just resolve
> the conflict myself when I send the patches onto Jens this time and
> include patch 3/3 pre-fixed up. Merge window will be fairly soon anyway.

So I'm a little confused by the state of everything at this point, but
I'm assuming that I need not worry about taking these changes through
docs-next.  Please let me know if that's not correct.

Thanks,

jon