linux-kernel - Re: linux-next: build failure after merge of the drm 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 for Android: free password hash cracker in your pocket

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

Message-ID: <alpine.DEB.2.00.1505200707290.3204@skynet.skynet.ie>
Date:	Wed, 20 May 2015 07:08:51 +0100 (IST)
From:	Dave Airlie <airlied@...ux.ie>
To:	Oded Gabbay <oded.gabbay@...il.com>
cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org,
	"Linux-Kernel@...r. Kernel. Org" <linux-kernel@...r.kernel.org>,
	Alex Deucher <alexander.deucher@....com>
Subject: Re: linux-next: build failure after merge of the drm tree


> >> > drm-next and fix it up there.
> >>
> >> Yep, against commit 79b066bd76d5 ("drm/amdkfd: Initialize sdma vm when
> >> creating sdma queue") which is in v4.1-rc3.
> >
> > So you could, of course, just merge that commit instead of Linus'
> > tree ...
> >
> > --
> > Cheers,
> > Stephen Rothwell                    sfr@...b.auug.org.au
> 
> Hi,
> Did I need to do something different in order to prevent this conflict ?
> Do some manual merge before sending the pull request ?
> 

Well this sort of thing is why linux-next exists, you can pull Linus's 
tree into yours to see if it builds before pulling, but you can find 
yourself fixing conflicts in other parts of the drm stack then.

I'll pull v4.1-rc4 tag in as a nicer merge point that misc Linus master.

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/