From: Stephen Rothwell <sfr@canb•auug.org.au>
To: DRI <dri-devel@lists•freedesktop.org>, Dave Airlie <airlied@linux•ie>
Cc: Kees Cook <keescook@chromium•org>,
Daniel Vetter <daniel.vetter@ffwll•ch>,
Intel Graphics <intel-gfx@lists•freedesktop.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Suraj Upadhyay <usuraj35@gmail•com>
Subject: Re: linux-next: manual merge of the kspp tree with the drm-misc tree
Date: Wed, 5 Aug 2020 14:10:01 +1000 [thread overview]
Message-ID: <20200805141001.61d49007@canb.auug.org.au> (raw)
In-Reply-To: <20200703143550.7ebbe771@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1412 bytes --]
Hi all,
On Fri, 3 Jul 2020 14:35:50 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> drivers/gpu/drm/drm_edid.c
>
> between commit:
>
> 948de84233d3 ("drm : Insert blank lines after declarations.")
>
> from the drm-misc tree and commit:
>
> 80b89ab785a4 ("treewide: Remove uninitialized_var() usage")
>
> from the kspp 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.
>
> diff --cc drivers/gpu/drm/drm_edid.c
> index 252e89cb54a3,b98fa573e706..000000000000
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@@ -3095,8 -3051,7 +3095,8 @@@ static int drm_cvt_modes(struct drm_con
> const u8 empty[3] = { 0, 0, 0 };
>
> for (i = 0; i < 4; i++) {
> - int uninitialized_var(width), height;
> + int width, height;
> +
> cvt = &(timing->data.other_data.data.cvt[i]);
>
> if (!memcmp(cvt->code, empty, 3))
This is now a conflict between the drm tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-08-05 4:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-03 4:35 linux-next: manual merge of the kspp tree with the drm-misc tree Stephen Rothwell
2020-08-05 4:10 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-03-27 1:26 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=20200805141001.61d49007@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=usuraj35@gmail$(echo .)com \
/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