Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
From:   Jonathan Corbet <corbet@lwn.net>
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Alex Deucher <alexdeucher@gmail.com>
Cc:     Hans de Goede <hdegoede@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Ma Jun <Jun.Ma2@amd.com>, Sumit Garg <sumit.garg@linaro.org>
Subject: Re: linux-next: manual merge of the amdgpu tree with the jc_docs tree
In-Reply-To: <20231212104657.524d359e@canb.auug.org.au>
References: <20231212104657.524d359e@canb.auug.org.au>
Date:   Mon, 11 Dec 2023 16:58:51 -0700
Message-ID: <87zfygwatg.fsf@meer.lwn.net>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the amdgpu tree got a conflict in:
>
>   Documentation/driver-api/index.rst
>
> between commit:
>
>   50709576d81b ("Documentation: Destage TEE subsystem documentation")
>
> from the jc_docs tree and commit:
>
>   2128f3cca5a2 ("Documentation/driver-api: Add document about WBRF mechanism")
>
> from the amdgpu tree.
>
> I fixed it up (see below) 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.

Thanks, both fixups in that file seem fine.

Clearly, though, we've run into the "everybody adding stuff to the end
causes a lot of conflicts" problem.  Time to impose some better
organization onto that file.

jon