From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Corbet <corbet@lwn•net>, Greg KH <greg@kroah•com>,
Arnd Bergmann <arnd@arndb•de>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Takashi Iwai <tiwai@suse•de>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>
Subject: Re: linux-next: manual merge of the jc_docs tree with the char-misc.current tree
Date: Tue, 9 Jul 2019 09:50:05 +1000 [thread overview]
Message-ID: <20190709095005.32bbf42d@canb.auug.org.au> (raw)
In-Reply-To: <20190620111128.7599af5a@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2062 bytes --]
Hi all,
On Thu, 20 Jun 2019 11:11:28 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> Documentation/fb/fbcon.rst
>
> between commit:
>
> fce677d7e8f0 ("docs: fb: Add TER16x32 to the available font names")
>
> from the char-misc.current tree and commit:
>
> ab42b818954c ("docs: fb: convert docs to ReST and rename to *.rst")
>
> from the jc_docs 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/fb/fbcon.rst
> index 5a865437b33f,cfb9f7c38f18..000000000000
> --- a/Documentation/fb/fbcon.rst
> +++ b/Documentation/fb/fbcon.rst
> @@@ -77,12 -80,12 +80,12 @@@ C. Boot option
>
> 1. fbcon=font:<name>
>
> - Select the initial font to use. The value 'name' can be any of the
> - compiled-in fonts: 10x18, 6x10, 7x14, Acorn8x8, MINI4x6,
> - PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, TER16x32, VGA8x16, VGA8x8.
> + Select the initial font to use. The value 'name' can be any of the
> + compiled-in fonts: 10x18, 6x10, 7x14, Acorn8x8, MINI4x6,
> - PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, VGA8x16, VGA8x8.
> ++ PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, TER16x32, VGA8x16, VGA8x8.
>
> Note, not all drivers can handle font with widths not divisible by 8,
> - such as vga16fb.
> + such as vga16fb.
>
> 2. fbcon=scrollback:<value>[k]
>
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
This is now a conflict between the jc_docs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-07-08 23:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-20 1:11 linux-next: manual merge of the jc_docs tree with the char-misc.current tree Stephen Rothwell
2019-06-20 5:57 ` Greg KH
2019-07-08 23:50 ` 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=20190709095005.32bbf42d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=corbet@lwn$(echo .)net \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+samsung@kernel$(echo .)org \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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