From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756113AbbFVHVP (ORCPT ); Mon, 22 Jun 2015 03:21:15 -0400 Received: from mail-bl2on0115.outbound.protection.outlook.com ([65.55.169.115]:44756 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756003AbbFVHVG (ORCPT ); Mon, 22 Jun 2015 03:21:06 -0400 Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; canb.auug.org.au; dkim=none (message not signed) header.d=none; X-WSS-ID: 0NQC4F0-07-UPM-02 X-M-MSG: Message-ID: <5587B759.3090504@amd.com> Date: Mon, 22 Jun 2015 09:20:57 +0200 From: =?windows-1252?Q?Christian_K=F6nig?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Stephen Rothwell , Dave Airlie CC: , , =?windows-1252?Q?Marek_Ol=9A=E1k?= , =?windows-1252?Q?Michel_D=E4nzer?= , Alex Deucher Subject: Re: linux-next: manual merge of the drm tree with Linus' tree References: <20150621135051.27364542@canb.auug.org.au> In-Reply-To: <20150621135051.27364542@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.224.55.35] X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD053;1:8ooUN0XL93wrj/PP8SOQYfy8QwFwmVHxpBy2ZWWJahMkD06KGoAAO7dnqHPb1ocl1WIc2jHw/MmNhHDe7WNbcG4Ds6iuVjJGJDvd8KtX6vZDkOeaeQLPFCjLOB35AscuM0iXFzWDf++sFgXLBWgSxJbQPRIlehxr8vfBTWKsSRz7jxvuqLgulJr/KgBgRX8NLJ3NWaF7rCxtfBFm0RgDeiyHj5FoFmFz7xi1NehdCGj2KLt/sI6qERd0nPaBqz2P7mvoMJiK3JpHS8lPdiOKE2+nSGvgkrAEhJLhKarFqsI= X-Forefront-Antispam-Report: CIP:165.204.84.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(428002)(189002)(24454002)(51704005)(199003)(54356999)(65816999)(76176999)(87266999)(86362001)(2950100001)(59896002)(105586002)(101416001)(50986999)(106466001)(46102003)(92566002)(87936001)(33656002)(80316001)(189998001)(23746002)(64126003)(83506001)(5001920100001)(65806001)(47776003)(5001770100001)(77096005)(62966003)(65956001)(4001350100001)(50466002)(36756003)(77156002)(3940600001);DIR:OUT;SFP:1102;SCL:1;SRVR:BY2PR0201MB1495;H:atltwp01.amd.com;FPR:;SPF:None;MLV:ovrnspm;MX:1;A:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0201MB1495;2:cD4OafEnG5lM2vsuw+vDLGNOghDPwtH3aTbwzg3Np6olfL4xfzp9z1wGZbMkG9f6;3:SS+mrOo/orGfvdBVvIy93/nG7pCX+QLjCJYjOt4QTapz+4aXVmhxK3S809qaA+0QOjDJgm3aJ+RdkY8hWQbSBd0naD1UOhL9Z0YrGG5Y74Kw17CuF4eMwgH1TIxwL2pB6H2RthCyE7JXc3QfPY6OeZ/n5Czy4UPfk1vSHl4Kk4bAaCIqtj8ji3IPGJMuJgc6KT9uHueHR8ZJpRIK/L4qMkLTX/tqJOHBOOiw0zIZLKndFBt1FRQio70el7C80WOc;20:xU2rvjTvLpEllGGLjAemMKYvVGNA9FBpLIssqhPo3WxaVB+V0WD+ItrArjlzvXcBfVxS+v9qDMyLxuEwbVoULPNBtNL4frSZ4NDPj0c2IZQxqOMaL6vaVz329Km0zjva0A6ixg1ReBQ2IhMAM+im/b/R27XF/bBSsGUQtqXuW12KoIl63hrXQTe15JuVW7a8xA2rzjBiVZre45P+G5zW7sLXRDyJ+4E57RQMZW0Mpxpkl/LDhcmNOoGRRTob0yy777OyshdYHKLEkWtYPRpUxsLS4j+Scn4qQ5vADThafw8V6kMOdSkduO/SEmz9LVN7tnlapigmKOX0fVjpunxZIc9DeOFYKApgK2MPyFS2PpLFhuzSFuvVaELaHeVMv0Cu7hj+cYV9da1dIuftYMOAQG4yoSTH+J9EChIFhGVBSGsvNhFf/FpKfDSAt7tHBu00qiia3ekAGfTBv4TYT9DO1ACUV8JoHxGp7G1SWhMKhB7UxiyevAsQP3P1lmRNQshY X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0201MB1495; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:BY2PR0201MB1495;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0201MB1495; X-Microsoft-Exchange-Diagnostics: 1;BY2PR0201MB1495;4:yL2bFvQrVBaGOQ/48bZCMEPa4y9Endtc08fYQgSd3NwSJ0rl3RoZ8IEVFAWwFDAS7W6VUZRdL7dsg9mBF4PV683u3Jq2q+g+c5pkBRAPl/1iAoJj2g7uqltYUmBpJU/QYVnPDZkAJyVkXpFsoz0CExr4F3XGI8OTY8n97M5WP05vffARROaSD6h3Nu8mPeIuxM30xPG6kNVxygMgw2oiqJ7Xm2Z7LsHjOMot66ukoSrX9+qz3ZNj8PR9geXWiYtmIfG/fgC4slOLHUjpUcg6YSbjXN1fZemQSKeH/qFO9gU= X-Forefront-PRVS: 06157D541C X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;BY2PR0201MB1495;23:hvM3OkKdoHATdCLMt9GgPayrK5jRyGZ31l+?= =?Windows-1252?Q?9bU9dtZzXKDvQKz/cq3hyUm8L39yKG0gJh/L3xU+7jWVJjBRoLqwXt07?= =?Windows-1252?Q?GrO+Ey22OkwYVbaNqefu83dy947ulR0RQZ1Q//AmPVt5LB/H1Ij7yifT?= =?Windows-1252?Q?74h56slTD9Ir0DbLnon6tkJrKQREIAYq4MYiM9UBeZiRwlma2sCFQeS9?= =?Windows-1252?Q?ThrsZjNxJOiXY1EzXF0O1LUN465J2BEvm5AnPNkg2Uf+E1bSRYCRj6nc?= =?Windows-1252?Q?9BQhOlR3dhkpl8ds3+LR4tW1++T9kvMUFGTzHalUu7XpfL5AjSHsJKhM?= =?Windows-1252?Q?k9Njujqtm+KHKmnFnClQUoqFR8w/0WxIr8TYLnVg93zeuh2qJxnbMHLd?= =?Windows-1252?Q?IHN4xi/ngvV/nbJOib9WaEK1tTbsqkmS5n+wiJ4FNNu0P6ns0+YMcUsC?= =?Windows-1252?Q?X+97VsEYA9JjH/Rr43h8LWblmS9PUH1gYOaHm6yoO0nYOKLNXygch9l+?= =?Windows-1252?Q?/HxAdaTnQ0dXDMO5ZkXy0vd70qcDFttpTizsPSQNfuXoiVMnnlKryaui?= =?Windows-1252?Q?lxCYBrdQbeY99Kw5fdj40jpWXMgoc5Lum3wINFEUlnxLR5Utr2fx6XMT?= =?Windows-1252?Q?EoyyZ+g0fjzW8dtUagSsVQZ1wZbx8fGXQz99jOc+LsIJIkzNEy6yzyph?= =?Windows-1252?Q?/EOT8I7J79kQacS8IYxKosybYvh0sHtG17DY8F8SL+FbVpJIlvzNNa9e?= =?Windows-1252?Q?i4vXrEoYnQN8s+sVuFMMm5ylldH6ta4nA6zzCKyIhcwwx8Y/zXybGn53?= =?Windows-1252?Q?Y4crOulHzNln6g1mN74Gj6pBT5HV+yee/31wzkjMsY6UYHX+CUq2xYGB?= =?Windows-1252?Q?620N5bcsw3mQfacc1mLRFxutgz/NUC0Yi5xeGbZEw7+glW6BUw0bnXHz?= =?Windows-1252?Q?S+FU5YC0BjgasHoRjFduRoUdz1fVy2noumkVV2RslKOKyYV9fUi8wF49?= =?Windows-1252?Q?jsNJgwSLWq7lnwZoB6V0/VpU/VK5teWAFnsySkvEYqzK/Yg2PSnO84mb?= =?Windows-1252?Q?hbxElGfYiYtjJOhR18OmfVJgnmSEJ2JYE2dQy?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR0201MB1495;5:nQ1UPI1KG0h4aETDGm9xoCium8j5mcELIKCf+DTQxoFungDgNl1xuriVIwoSfoJ6dXBzV5kZJzPqsdZveZx7WRPRLBZPKD5f8QyhAeTY0AfhpGNbmppjgb4c7vejT/Ut6m8ygzP2sE3RpqVXEsvDxg==;24:Km2qqQdQCSzcCgHBGGR0dAvFjykOD7WHeMKHoqgfhJjiFlQ/gVq4j+IYgFnR5tbfyPAWpaq0D2hLlE5ABT37DRrjRv3Dy4hzvT9ydZJRRS0=;20:AWrwFCfodJQhiT6Pc0Q+trB/6l9I0RADYKNxzIi7leRmpGiWJ3zKs4dtxvuOAhMQk9L8EI1MkteA2kMmXtoksQ== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2015 07:21:02.5696 (UTC) X-MS-Exchange-CrossTenant-Id: fde4dada-be84-483f-92cc-e026cbee8e96 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fde4dada-be84-483f-92cc-e026cbee8e96;Ip=[165.204.84.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0201MB1495 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen & Dave, indeed RADEON_INFO_VA_UNMAP_WORKING was added to 4.1 to indicate that a certain kernel bug is fixed now and we can remove the user space workaround. And RADEON_INFO_GPU_RESET_COUNTER was stashed to be merged in 4.2 as new feature. Annoying but harmless and Stephen's resolve of the conflict looks valid to me. Regards, Christian. On 21.06.2015 05:50, Stephen Rothwell wrote: > Hi Dave, > > Today's linux-next merge of the drm tree got conflicts in: > > drivers/gpu/drm/radeon/radeon_kms.c > include/uapi/drm/radeon_drm.h > > between commit: > > 3bc980bf19bb ("drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query") > > from Linus' tree and commit: > > 72b9076b2887 ("drm/radeon: add a GPU reset counter queryable by userspace") > > from the drm tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/