Re: linux-next: manual merge of the mm-stable tree with the arc-current tree

[Vineet Gupta]

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