Re: linux-next: manual merge of the tty tree with the drivers-misc tree

[Stephen Rothwell]

Hi all,

On Tue, 27 Sep 2022 01:01:57 +0100 Mark Brown <broonie@xxxxxxxxxx> wrote:
>
> On Tue, Sep 27, 2022 at 01:11:11AM +0200, наб wrote:
> 
> > Similar situation as
> >   https://lore.kernel.org/all/20220926210631.657728-1-broonie@xxxxxxxxxx/t
> > but the merge appears horribly broken only in the non-english files,
> > the english diff seems mostly fine.  
> 
> The non-English files just carried on the prior merge problem (in
> general I default to skipping out on merge conflicts in documentation in
> languages I can't read, admittedly this is usually also in non-latin
> scripts).

I used the attached today.

-- 
Cheers,
Stephen Rothwell

Attachment: xx1
Description: Binary data

Attachment: pgplDZTBO_3Au.pgp
Description: OpenPGP digital signature