From: "james qian wang (Arm Technology China)" <james.qian.wang@arm.com> To: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Dave Airlie <airlied@linux.ie>, DRI <dri-devel@lists.freedesktop.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>, Mihail Atanassov <Mihail.Atanassov@arm.com>, Ayan Halder <Ayan.Halder@arm.com>, Liviu Dudau <Liviu.Dudau@arm.com>, nd <nd@arm.com> Subject: Re: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Date: Thu, 29 Aug 2019 10:11:25 +0000 [thread overview] Message-ID: <20190829101118.GA9692@jamwan02-TSP300> (raw) In-Reply-To: <20190826130637.176f6208@canb.auug.org.au> On Mon, Aug 26, 2019 at 01:06:37PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/arm/display/komeda/komeda_dev.c > > between commit: > > 51a44a28eefd ("drm/komeda: Add missing of_node_get() call") > > from the drm-misc-fixes tree and commit: > > 8965ad8433ea ("drm/komeda: Enable dual-link support") > > 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. > Hi Stephen: Sorry for the conflict, and thank you very much. Regards James > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/gpu/drm/arm/display/komeda/komeda_dev.c > index 9d4d5075cc64,1ff7f4b2c620..000000000000 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > @@@ -127,7 -128,8 +129,8 @@@ static int komeda_parse_pipe_dt(struct > pipe->of_output_port = > of_graph_get_port_by_id(np, KOMEDA_OF_PORT_OUTPUT); > > + pipe->dual_link = pipe->of_output_links[0] && pipe->of_output_links[1]; > - pipe->of_node = np; > + pipe->of_node = of_node_get(np); > > return 0; > }
WARNING: multiple messages have this Message-ID (diff)
From: "james qian wang (Arm Technology China)" <james.qian.wang@arm.com> To: Stephen Rothwell <sfr@canb.auug.org.au> Cc: nd <nd@arm.com>, Ayan Halder <Ayan.Halder@arm.com>, Dave Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, Liviu Dudau <Liviu.Dudau@arm.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, DRI <dri-devel@lists.freedesktop.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Mihail Atanassov <Mihail.Atanassov@arm.com> Subject: Re: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Date: Thu, 29 Aug 2019 10:11:25 +0000 [thread overview] Message-ID: <20190829101118.GA9692@jamwan02-TSP300> (raw) In-Reply-To: <20190826130637.176f6208@canb.auug.org.au> On Mon, Aug 26, 2019 at 01:06:37PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/arm/display/komeda/komeda_dev.c > > between commit: > > 51a44a28eefd ("drm/komeda: Add missing of_node_get() call") > > from the drm-misc-fixes tree and commit: > > 8965ad8433ea ("drm/komeda: Enable dual-link support") > > 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. > Hi Stephen: Sorry for the conflict, and thank you very much. Regards James > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/gpu/drm/arm/display/komeda/komeda_dev.c > index 9d4d5075cc64,1ff7f4b2c620..000000000000 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > @@@ -127,7 -128,8 +129,8 @@@ static int komeda_parse_pipe_dt(struct > pipe->of_output_port = > of_graph_get_port_by_id(np, KOMEDA_OF_PORT_OUTPUT); > > + pipe->dual_link = pipe->of_output_links[0] && pipe->of_output_links[1]; > - pipe->of_node = np; > + pipe->of_node = of_node_get(np); > > return 0; > } _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-08-29 10:12 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-26 3:06 linux-next: manual merge of the drm tree with the drm-misc-fixes tree Stephen Rothwell 2019-08-29 10:11 ` james qian wang (Arm Technology China) [this message] 2019-08-29 10:11 ` james qian wang (Arm Technology China) -- strict thread matches above, loose matches on Subject: below -- 2023-11-22 0:29 Stephen Rothwell 2023-11-22 0:29 ` Stephen Rothwell 2023-11-28 10:04 ` Geert Uytterhoeven 2023-11-28 10:04 ` Geert Uytterhoeven 2023-09-28 2:05 Stephen Rothwell 2023-09-28 2:05 ` Stephen Rothwell 2023-06-27 1:54 Stephen Rothwell 2023-06-27 1:54 ` Stephen Rothwell 2023-07-11 1:17 ` Stephen Rothwell 2023-07-11 1:17 ` Stephen Rothwell 2022-11-21 2:06 Stephen Rothwell 2022-11-21 2:06 ` Stephen Rothwell 2022-07-11 2:47 Stephen Rothwell 2022-07-11 2:47 ` Stephen Rothwell 2022-07-11 8:05 ` Christian König 2022-07-11 8:05 ` Christian König 2022-07-17 23:44 ` Stephen Rothwell 2022-07-17 23:44 ` Stephen Rothwell 2022-07-19 7:35 ` Geert Uytterhoeven 2022-07-19 7:35 ` Geert Uytterhoeven 2022-07-27 2:55 ` Stephen Rothwell 2022-07-27 2:55 ` Stephen Rothwell 2022-07-27 3:24 ` Dave Airlie 2022-07-27 3:24 ` Dave Airlie 2022-07-27 5:37 ` Stephen Rothwell 2022-07-27 5:37 ` Stephen Rothwell 2022-03-18 0:55 Stephen Rothwell 2022-03-18 0:55 ` Stephen Rothwell 2022-03-18 1:06 ` Stephen Rothwell 2022-03-18 1:06 ` Stephen Rothwell 2021-12-22 3:50 Stephen Rothwell 2021-12-22 3:50 ` Stephen Rothwell 2021-12-22 7:31 ` Christian König 2021-12-22 7:31 ` Christian König 2021-11-29 23:33 Stephen Rothwell 2021-11-29 23:33 ` Stephen Rothwell 2021-11-30 8:58 ` Maxime Ripard 2021-11-30 8:58 ` Maxime Ripard 2021-11-30 20:35 ` Stephen Rothwell 2021-11-30 20:35 ` Stephen Rothwell 2021-10-22 0:53 Stephen Rothwell 2021-06-17 1:42 Stephen Rothwell 2021-06-17 1:42 ` Stephen Rothwell 2021-04-09 3:12 Stephen Rothwell 2021-04-09 3:12 ` Stephen Rothwell 2021-03-18 1:02 Stephen Rothwell 2021-03-18 1:02 ` Stephen Rothwell 2021-03-18 6:51 ` Tomi Valkeinen 2021-03-18 6:51 ` Tomi Valkeinen 2020-07-28 3:41 Stephen Rothwell 2020-07-28 3:41 ` Stephen Rothwell 2020-05-01 3:45 Stephen Rothwell 2020-05-01 3:45 ` Stephen Rothwell 2020-03-01 23:43 Stephen Rothwell 2020-03-01 23:43 ` Stephen Rothwell 2019-09-15 21:18 Mark Brown 2019-09-16 5:29 ` Vasily Khoruzhick 2019-09-17 2:43 ` Qiang Yu 2018-11-26 2:37 Stephen Rothwell 2018-03-08 0:47 Stephen Rothwell 2017-12-13 23:59 Stephen Rothwell 2017-12-13 23:59 ` Stephen Rothwell 2017-01-17 0:59 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=20190829101118.GA9692@jamwan02-TSP300 \ --to=james.qian.wang@arm.com \ --cc=Ayan.Halder@arm.com \ --cc=Liviu.Dudau@arm.com \ --cc=Mihail.Atanassov@arm.com \ --cc=airlied@linux.ie \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=nd@arm.com \ --cc=sfr@canb.auug.org.au \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.