MIME-Version: 1.0
References: <20211224163256.2a0f01af@canb.auug.org.au>
In-Reply-To: <20211224163256.2a0f01af@canb.auug.org.au>
From:   Daniel Latypov <dlatypov@google.com>
Date:   Tue, 4 Jan 2022 11:05:24 -0800
Message-ID: <CAGS_qxrmxi3a9-HGxQMwJhPnR4xfzvYFOn36QcqDgitoHdfwHA@mail.gmail.com>
Subject: Re: linux-next: manual merge of the kunit-next tree with the jc_docs tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Shuah Khan <skhan@linuxfoundation.org>,
        Brendan Higgins <brendanhiggins@google.com>,
        Jonathan Corbet <corbet@lwn.net>,
        Harinder Singh <sharinder@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Thu, Dec 23, 2021 at 9:33 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the kunit-next tree got a conflict in:
>
>   Documentation/dev-tools/kunit/index.rst
>
> between commit:
>
>   6c6213f4a29b ("Documentation: KUnit: Rewrite main page")
>
> from the jc_docs tree and commit:
>
>   58b391d74630 ("Documentation: kunit: remove claims that kunit is a mocking framework")
>
> from the kunit-next tree.
>
> I fixed it up (I just used the former version) and can carry the fix as

Thanks for this.

Harinder's patch should supersede my small fixup patch.
It wasn't clear when Harinder's patches would land in the docs tree.

But it looks like my patch two files that Harinder's didn't, specifically:
 Documentation/dev-tools/kunit/api/index.rst | 3 +--
 Documentation/dev-tools/kunit/api/test.rst  | 3 +--

Shuah, Brendan: I can send a new version of 58b391d74630 that only
updates those two files, if wanted.
Or we can go with Stephen's fix, which looks good to me.

> 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.
>
> --
> Cheers,
> Stephen Rothwell