[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.00.1501220230380.12580@skynet.skynet.ie>
Date: Thu, 22 Jan 2015 02:31:06 +0000 (GMT)
From: Dave Airlie <airlied@...ux.ie>
To: Stephen Rothwell <sfr@...b.auug.org.au>
cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Ben Goz <ben.goz@....com>, Oded Gabbay <oded.gabbay@....com>
Subject: Re: linux-next: manual merge of the drm tree with Linus' tree
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/radeon/radeon_kfd.c between commit b64b8afcca9d
> ("drm/amd: Fixing typos in kfd<->kgd interface") from Linus' tree and
> commit a84a9903b588 ("drm/radeon: Implement SDMA interface functions")
> from the drm tree.
btw I pushed a drm-next with all these fixed in it a little while ago
we must be racing!
Dave.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists