Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <8f8c8da7-b5a4-63b4-96fb-31a53721b5f2@kernel.org>
Date:   Mon, 21 Aug 2023 18:31:53 -0700
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: linux-next: manual merge of the mm-stable tree with the
 arc-current tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Andrew Morton <akpm@linux-foundation.org>,
        Vineet Gupta <vgupta@kernel.org>
Cc:     Baoquan He <bhe@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20230822082841.7948474d@canb.auug.org.au>
From:   Vineet Gupta <vgupta@kernel.org>
In-Reply-To: <20230822082841.7948474d@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 8/21/23 15:28, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mm-stable tree got a conflict in:
>
>    arch/arc/Kconfig
>
> between commit:
>
>    f798f91e7f5f ("ARC: uaccess: use optimized generic __strnlen_user/__strncpy_from_user")
>
> from the arc-current tree and commit:
>
>    06dfae39d200 ("arc: mm: convert to GENERIC_IOREMAP")
>
> from the mm-stable tree.
>
> BTW, if the "select GENERIC_IOREMAP" had been put in its (alphabetical)
> proper place, this conflict would not have occurred ...
>
> 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.
>

Thx a bunch Stephen.

-Vineet