linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for Oct 21
@ 2013-10-21 15:36 Thierry Reding
  2013-10-21 23:20 ` linux-next: Tree for Oct 21 (panel-simple.c) Randy Dunlap
                   ` (2 more replies)
  0 siblings, 3 replies; 15+ messages in thread
From: Thierry Reding @ 2013-10-21 15:36 UTC (permalink / raw)
  To: linux-next, linux-kernel; +Cc: Mark Brown

Hi all,

I've uploaded today's linux-next tree to the master branch of the
repository below:

        git://gitorious.org/thierryreding/linux-next.git

A next-20131021 tag is also provided for convenience.

Gained a couple new conflicts, loads of build failures. I've tried to
fix the most obvious ones, but as a downside haven't gotten around to
write up the specifics about the conflicts. I might still do that
tomorrow, but I figured most people wouldn't have time to look into
those anyway given that they'll be busy with the conferences.

Thierry

^ permalink raw reply	[flat|nested] 15+ messages in thread
* linux-next: Tree for Oct 14
@ 2013-10-14 14:48 Thierry Reding
  2013-10-14 14:48 ` linux-next: manual merge of the drm tree Thierry Reding
  0 siblings, 1 reply; 15+ messages in thread
From: Thierry Reding @ 2013-10-14 14:48 UTC (permalink / raw)
  To: linux-next, linux-kernel; +Cc: Mark Brown

Hi all,

I've uploaded today's linux-next tree to the master branch of the
repository below:

        git://gitorious.org/thierryreding/linux-next.git

A next-20131014 tag is also provided for convenience.

Gained a few conflicts, but nothing too exciting. x86 and ARM default
configurations build fine. There were some build failures unrelated to
the merge, most of which I fixed and added as patches on top of the
final merge.

Thierry

^ permalink raw reply	[flat|nested] 15+ messages in thread
* linux-next: manual merge of the drm tree
@ 2008-10-17  5:56 Stephen Rothwell
  0 siblings, 0 replies; 15+ messages in thread
From: Stephen Rothwell @ 2008-10-17  5:56 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, Harvey Harrison, Eric Anholt

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_dma.c between commit
80a914dc05683ecfc98f9e1887fd6564846ffbec ("misc: replace __FUNCTION__
with __func__") from Linus' tree and commit
811c552c21f3d7fca8eb647ccf0d303378ccea7d ("i915: Use struct_mutex to
protect ring in GEM mode") from the drm tree.

Just context changes.  I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc drivers/gpu/drm/i915/i915_dma.c
index 9ac4720,593286e..0000000
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@@ -516,8 -536,11 +536,11 @@@ static int i915_dispatch_flip(struct dr
  	drm_i915_private_t *dev_priv = dev->dev_private;
  	RING_LOCALS;
  
+ 	if (!dev_priv->sarea_priv)
+ 		return -EINVAL;
+ 
  	DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n",
 -		  __FUNCTION__,
 +		  __func__,
  		  dev_priv->current_page,
  		  dev_priv->sarea_priv->pf_current_page);
  
@@@ -642,11 -677,17 +677,17 @@@ static int i915_cmdbuffer(struct drm_de
  static int i915_flip_bufs(struct drm_device *dev, void *data,
  			  struct drm_file *file_priv)
  {
+ 	int ret;
+ 
 -	DRM_DEBUG("%s\n", __FUNCTION__);
 +	DRM_DEBUG("%s\n", __func__);
  
- 	LOCK_TEST_WITH_RETURN(dev, file_priv);
+ 	RING_LOCK_TEST_WITH_RETURN(dev, file_priv);
+ 
+ 	mutex_lock(&dev->struct_mutex);
+ 	ret = i915_dispatch_flip(dev);
+ 	mutex_unlock(&dev->struct_mutex);
  
- 	return i915_dispatch_flip(dev);
+ 	return ret;
  }
  
  static int i915_getparam(struct drm_device *dev, void *data,

^ permalink raw reply	[flat|nested] 15+ messages in thread
* linux-next: manual merge of the drm tree
@ 2008-07-10  6:10 Stephen Rothwell
  0 siblings, 0 replies; 15+ messages in thread
From: Stephen Rothwell @ 2008-07-10  6:10 UTC (permalink / raw)
  To: Dave Airlie; +Cc: linux-next, Sam Ravnborg

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

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in include/Kbuild
between commit 4896a02e1e6d4f0ae5b23c24eff0ba10e26caab4 ("kbuild: only
one call for include/ in make headers_*") from the kbuild tree and commit
ae74c0f7f4abab0cf1e943c562b52df8868dc1ee ("drm: reorganise drm tree to be
more future proof") from the drm tree.

The former removes a line just where the latter is adding one. I fixed it
up and can carry the fix.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2013-10-23 12:19 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-21 15:36 linux-next: Tree for Oct 21 Thierry Reding
2013-10-21 23:20 ` linux-next: Tree for Oct 21 (panel-simple.c) Randy Dunlap
2013-10-22  8:10   ` Thierry Reding
2013-10-22  0:58 ` linux-next: Tree for Oct 21 (sound/pci/hda/patch_hdmi.c) Randy Dunlap
2013-10-22  7:42   ` Takashi Iwai
2013-10-22 15:10 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-22 15:10   ` linux-next: manual merge of the wireless-next tree Thierry Reding
2013-10-22 15:10   ` linux-next: manual merge of the drm tree Thierry Reding
2013-10-22 15:10   ` linux-next: manual merge of the arm-soc tree Thierry Reding
2013-10-23 12:19     ` Tony Lindgren
2013-10-22 15:10   ` linux-next: manual merge of the mvebu tree Thierry Reding
2013-10-23  8:59     ` Jason Cooper
  -- strict thread matches above, loose matches on Subject: below --
2013-10-14 14:48 linux-next: Tree for Oct 14 Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the drm tree Thierry Reding
2008-10-17  5:56 Stephen Rothwell
2008-07-10  6:10 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).