linux-kernel - Re: linux-next: manual merge of the jc_docs tree with the char-misc.current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20190709095005.32bbf42d@canb.auug.org.au>
Date:   Tue, 9 Jul 2019 09:50:05 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Corbet <corbet@....net>, Greg KH <greg@...ah.com>,
        Arnd Bergmann <arnd@...db.de>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Takashi Iwai <tiwai@...e.de>,
        Mauro Carvalho Chehab <mchehab+samsung@...nel.org>
Subject: Re: linux-next: manual merge of the jc_docs tree with the
 char-misc.current tree

Hi all,

On Thu, 20 Jun 2019 11:11:28 +1000 Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped