From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: "Mark Brown" <broonie@kernel.org>,
наб <nabijaczleweli@nabijaczleweli.xyz>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tty tree with the drivers-misc tree
Date: Tue, 4 Oct 2022 17:04:13 +1100 [thread overview]
Message-ID: <20221004170413.0ae64378@canb.auug.org.au> (raw)
In-Reply-To: <YzI9dTLick7jAXdv@sirena.org.uk>
[-- Attachment #1.1: Type: text/plain, Size: 675 bytes --]
Hi all,
On Tue, 27 Sep 2022 01:01:57 +0100 Mark Brown <broonie@kernel.org> wrote:
>
> 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).
I used the attached today.
--
Cheers,
Stephen Rothwell
[-- Attachment #1.2: xx1 --]
[-- Type: application/octet-stream, Size: 28876 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-10-04 6:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 21:34 linux-next: manual merge of the tty tree with the drivers-misc tree broonie
2022-09-26 23:11 ` наб
2022-09-27 0:01 ` Mark Brown
2022-10-04 6:04 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221004170413.0ae64378@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@kernel.org \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nabijaczleweli@nabijaczleweli.xyz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox