linux-kernel - Re: linux-next: manual merge of the drm tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <54C9ECF8.6020309@amd.com>
Date:	Thu, 29 Jan 2015 10:19:04 +0200
From:	Oded Gabbay <oded.gabbay@....com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Dave Airlie <airlied@...ux.ie>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Ben Goz <ben.goz@....com>
Subject: Re: linux-next: manual merge of the drm tree with Linus' tree



On 01/29/2015 04:17 AM, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got conflicts in
> drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c and
> drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h between commits
> b8cbab042cd6 ("drm/amdkfd: Allow user to limit only queues per device")
> and 9fa843e76d90 ("drm/amdkfd: Fix bug in call to init_pipelines()")
> from Linus' tree and commits bcea30817574 ("drm/amdkfd: Add SDMA
> user-mode queues support to QCM") and fe502804205e ("drm/amdkfd: Remove
> call to deprecated init_memory interface") from the drm tree.
>
> I fixed it up (hopefully - see below) and can carry the fix as
> necessary (no action is required).
>
Looks fine, thanks!

	Oded
--
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/