Bug 695852

Summary:	dev-libs/roct-thunk-interface-9999 with sys-kernel/linux-headers-5.3 : file collision in /usr/include/linux/kfd_ioctl.h
Product:	Gentoo Linux	Reporter:	hagar-dunor
Component:	Current packages	Assignee:	Craig Andrews <candrews>
Status:	RESOLVED FIXED
Severity:	normal	CC:	gentoo, proxy-maint
Priority:	Normal
Version:	unspecified
Hardware:	All
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---

Description hagar-dunor 2019-09-29 09:59:28 UTC

Hi maintainers,

As of 

git checkout --quiet refs/git-r3/HEAD
GIT NEW branch -->
   repository:               https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/
   at the commit:            a96853953589a44eb5a89be7a5d1a3ed51d2ab39

I get

 * Messages for package dev-libs/roct-thunk-interface-9999:
(...) 
 * 
 * Detected file collision(s):
 * 
 *      /usr/include/linux/kfd_ioctl.h
 * 
 * Searching all installed packages for file collisions...
 * 
 * Press Ctrl-C to Stop
 * 
 * sys-kernel/linux-headers-5.3:0::gentoo
 *      /usr/include/linux/kfd_ioctl.h
 * 
 * Package 'dev-libs/roct-thunk-interface-9999' NOT merged due to file
 * collisions.

Cheers

Comment 1 Larry the Git Cow gentoo-dev

2019-09-30 15:35:39 UTC

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abed77fd871b0714de278d9ab296b0b15aa3c7a0

commit abed77fd871b0714de278d9ab296b0b15aa3c7a0
Author:     Craig Andrews <candrews@gentoo.org>
AuthorDate: 2019-09-30 15:35:20 +0000
Commit:     Craig Andrews <candrews@gentoo.org>
CommitDate: 2019-09-30 15:35:20 +0000

    dev-libs/roct-thunk-interface: Include patches from -2.8.0 in -9999
    
    Closes: https://bugs.gentoo.org/695852
    Package-Manager: Portage-2.3.76, Repoman-2.3.17
    Signed-off-by: Craig Andrews <candrews@gentoo.org>

 .../roct-thunk-interface/roct-thunk-interface-9999.ebuild    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)