All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
	<intel-gfx@lists.freedesktop.org>,
	<dri-devel@lists.freedesktop.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Dave Airlie <airlied@linux.ie>,
	Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Thu, 7 Nov 2013 13:37:51 +1100	[thread overview]
Message-ID: <20131107133751.95ceeb3ddf512a0af6f78f2a@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1055 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_panel.c between commit 5bdebb183c97
("drm/sysfs: sort out minor and connector device object lifetimes") from
the drm tree and commit 752aa88a1e78 ("drm/i915: make backlight functions
take a connector") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_panel.c
index 09b2994c9b37,cad41ac330e8..000000000000
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@@ -726,7 -802,8 +802,8 @@@ int intel_panel_setup_backlight(struct 
  	}
  	dev_priv->backlight.device =
  		backlight_device_register("intel_backlight",
- 					  connector->kdev, dev,
 -					  &connector->kdev,
++					  connector->kdev,
+ 					  to_intel_connector(connector),
  					  &intel_panel_bl_ops, &props);
  
  	if (IS_ERR(dev_priv->backlight.device)) {

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
	intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Thu, 7 Nov 2013 13:37:51 +1100	[thread overview]
Message-ID: <20131107133751.95ceeb3ddf512a0af6f78f2a@canb.auug.org.au> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 1055 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_panel.c between commit 5bdebb183c97
("drm/sysfs: sort out minor and connector device object lifetimes") from
the drm tree and commit 752aa88a1e78 ("drm/i915: make backlight functions
take a connector") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_panel.c
index 09b2994c9b37,cad41ac330e8..000000000000
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@@ -726,7 -802,8 +802,8 @@@ int intel_panel_setup_backlight(struct 
  	}
  	dev_priv->backlight.device =
  		backlight_device_register("intel_backlight",
- 					  connector->kdev, dev,
 -					  &connector->kdev,
++					  connector->kdev,
+ 					  to_intel_connector(connector),
  					  &intel_panel_bl_ops, &props);
  
  	if (IS_ERR(dev_priv->backlight.device)) {

[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

             reply	other threads:[~2013-11-07  2:38 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-07  2:37 Stephen Rothwell [this message]
2013-11-07  2:37 ` linux-next: manual merge of the drm-intel tree with the drm tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2023-10-03  0:09 Stephen Rothwell
2023-10-03  0:09 ` Stephen Rothwell
2023-10-05 14:41 ` Jani Nikula
2023-05-30  1:59 Stephen Rothwell
2023-05-30  1:59 ` Stephen Rothwell
2023-05-30  1:57 Stephen Rothwell
2023-05-30  1:57 ` Stephen Rothwell
2023-05-30  2:10 ` Stephen Rothwell
2023-05-30  2:10   ` Stephen Rothwell
2023-01-24 23:42 Stephen Rothwell
2023-01-24 23:42 ` Stephen Rothwell
2022-09-13  2:19 Stephen Rothwell
2022-09-13  2:19 ` Stephen Rothwell
2022-09-12  1:46 Stephen Rothwell
2022-09-12  1:46 ` Stephen Rothwell
2022-02-11  2:06 Stephen Rothwell
2022-02-11  2:06 ` Stephen Rothwell
2022-02-09  0:55 Stephen Rothwell
2022-02-09  0:55 ` Stephen Rothwell
2021-08-12  1:28 Stephen Rothwell
2021-04-01  2:13 Stephen Rothwell
2021-04-01  2:13 ` Stephen Rothwell
2021-03-17  3:08 Stephen Rothwell
2021-03-17  3:08 ` Stephen Rothwell
2021-03-18  1:52 ` Stephen Rothwell
2021-03-18  1:52   ` Stephen Rothwell
2021-04-29 22:23   ` Stephen Rothwell
2021-04-29 22:23     ` Stephen Rothwell
2021-05-14  1:53     ` Stephen Rothwell
2021-05-14  1:53       ` Stephen Rothwell
2021-05-14 12:14       ` Thomas Zimmermann
2021-01-25  0:46 Stephen Rothwell
2021-01-25  0:46 ` Stephen Rothwell
2020-07-14  2:59 Stephen Rothwell
2020-07-14  2:59 ` Stephen Rothwell
2019-08-22  3:15 Stephen Rothwell
2019-02-06  0:42 Stephen Rothwell
2019-01-17  1:59 Stephen Rothwell
2019-01-17  1:59 ` Stephen Rothwell
2017-05-19  2:04 Stephen Rothwell
2016-09-07  3:59 Stephen Rothwell
2014-07-23  3:18 Stephen Rothwell
2014-07-23  3:18 ` Stephen Rothwell
2014-07-23  3:06 Stephen Rothwell
2014-07-23  3:06 ` Stephen Rothwell
2014-07-23  5:09 ` Daniel Vetter
2014-07-23  5:09   ` Daniel Vetter
2014-04-03  1:00 Stephen Rothwell
2014-04-03  1:00 ` Stephen Rothwell
2014-01-22  3:09 Stephen Rothwell
2014-01-22  3:09 ` Stephen Rothwell
2014-01-22  3:04 Stephen Rothwell
2014-01-22  3:04 ` Stephen Rothwell
2014-01-22 10:06 ` Daniel Vetter
2014-01-23  1:21   ` Olof Johansson
2014-01-23  1:21     ` Olof Johansson
2014-01-23 21:10     ` Olof Johansson
2014-01-23 21:10       ` Olof Johansson
2013-08-29  4:09 Stephen Rothwell
2013-08-29  4:09 ` Stephen Rothwell
2013-06-18  3:04 Stephen Rothwell
2013-06-18  3:04 ` Stephen Rothwell
2013-05-01  4:37 Stephen Rothwell
2013-05-01  8:08 ` Daniel Vetter

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=20131107133751.95ceeb3ddf512a0af6f78f2a@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=airlied@linux.ie \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jbarnes@virtuousgeek.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /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: link
Be 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.