On Thu, Dec 07, 2023 at 01:42:13PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/android/binder_alloc.c
>
> between commit:
>
> 8b59d7857c30 ("list_lru: allow explicit memcg and NUMA node selection")
>
> from the mm tree and commits:
>
> ea9cdbf0c727 ("binder: rename lru shrinker utilities")
> ea2735ce19c1 ("binder: refactor page range allocation")
> (and maybe others)
>
> from the char-misc 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 for the merge resolution, sorry it's so complex. I'll keep this
around in case I need it when sending stuff to Linus for 6.8-rc1.
thanks,
greg k-h
