From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Airlie <airlied@linux•ie>,
DRI <dri-devel@lists•freedesktop.org>,
Jonathan Corbet <corbet@lwn•net>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Mauro Carvalho Chehab <mchehab+samsung@kernel•org>,
Maxime Ripard <maxime.ripard@bootlin•com>
Subject: Re: linux-next: manual merge of the drm tree with the jc_docs tree
Date: Tue, 9 Jul 2019 09:54:17 +1000 [thread overview]
Message-ID: <20190709095417.01294540@canb.auug.org.au> (raw)
In-Reply-To: <20190624134147.4950d388@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2786 bytes --]
Hi all,
On Mon, 24 Jun 2019 13:41:47 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> Documentation/fb/modedb.rst
>
> between commit:
>
> ab42b818954c ("docs: fb: convert docs to ReST and rename to *.rst")
>
> from the jc_docs tree and commit:
>
> 1bf4e09227c3 ("drm/modes: Allow to specify rotation and reflection on the commandline")
>
> from the drm 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/modedb.rst
> index 3c2397293977,1dd5a52f9390..000000000000
> --- a/Documentation/fb/modedb.rst
> +++ b/Documentation/fb/modedb.rst
> @@@ -45,18 -45,29 +45,32 @@@ signals (e.g. HDMI and DVI-I). For othe
> is specified the output is disabled.
>
> You can additionally specify which output the options matches to.
> -To force the VGA output to be enabled and drive a specific mode say:
> +To force the VGA output to be enabled and drive a specific mode say::
> +
> video=VGA-1:1280x1024@60me
>
> -Specifying the option multiple times for different ports is possible, e.g.:
> +Specifying the option multiple times for different ports is possible, e.g.::
> +
> video=LVDS-1:d video=HDMI-1:D
>
> + Options can also be passed after the mode, using commas as separator.
> +
> + Sample usage: 720x480,rotate=180 - 720x480 mode, rotated by 180 degrees
> +
> + Valid options are:
> +
> + - margin_top, margin_bottom, margin_left, margin_right (integer):
> + Number of pixels in the margins, typically to deal with overscan on TVs
> + - reflect_x (boolean): Perform an axial symmetry on the X axis
> + - reflect_y (boolean): Perform an axial symmetry on the Y axis
> + - rotate (integer): Rotate the initial framebuffer by x
> + degrees. Valid values are 0, 90, 180 and 270.
> +
> +
> -***** oOo ***** oOo ***** oOo ***** oOo ***** oOo ***** oOo ***** oOo *****
> +-----------------------------------------------------------------------------
>
> What is the VESA(TM) Coordinated Video Timings (CVT)?
> +=====================================================
>
> From the VESA(TM) Website:
>
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-07-08 23:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 3:41 linux-next: manual merge of the drm tree with the jc_docs tree Stephen Rothwell
2019-07-08 23:54 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-12-12 0:57 Stephen Rothwell
2016-07-11 2:32 Stephen Rothwell
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=20190709095417.01294540@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=corbet@lwn$(echo .)net \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxime.ripard@bootlin$(echo .)com \
--cc=mchehab+samsung@kernel$(echo .)org \
/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