Re: linux-next: manual merge of the tip tree with the mm tree

[Stephen Rothwell]

Hi Suren,

On Mon, 6 Jan 2025 12:21:14 -0800 Suren Baghdasaryan <surenb@xxxxxxxxxx> wrote:
>
> On Sun, Jan 5, 2025 at 7:09 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > I got 2 more conflicts today due to the duplicate patch above.  
> 
> Have you been able to resolve the conflicts? Can I help with that?

I just use the version from the mm tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgprBjV89acWU.pgp
Description: OpenPGP digital signature