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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 20 Jun 2019 11:11:28 +1000

Hi all,

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]