lkml.org 
[lkml]   [2022]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tty tree with the drivers-misc tree
On Tue, Sep 27, 2022 at 01:11:11AM +0200, наб wrote:

> Similar situation as
> https://lore.kernel.org/all/20220926210631.657728-1-broonie@kernel.org/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).
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2022-09-27 02:03    [W:0.077 / U:0.636 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site