lkml.org 
[lkml]   [2013]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next build conflict between modules and metag trees (LOCKDEP_NOW_UNRELIABLE)
Date
James Hogan <james.hogan@imgtec.com> writes:
> Hi Rusty,
>
> The metag architecture tree adds an add_taint(TAINT_DIE) like other
> architectures do, and the modules-next tree adds the
> LOCKDEP_NOW_UNRELIABLE flag to all uses of add_taint (but obviously
> misses arch/metag since it doesn't exist yet), causing a compile error
> on metag in -next when the two are merged together.
>
> Is it okay for me to merge your commit 373d4d0 ("taint: add explicit
> flag to show whether lock dep is still OK.") in modules-next into the
> base of the metag tree and expect it not to be rebased, so that I can
> then squash the fix into the metag tree?

This was my fault for taking a shortcut. I should have changed the name
so the old add_taint worked still (set_taint?), then remove add_taint
after the merge.

But I won't be rebasing, so you should be fine to merge it.

Cheers,
Rusty.


\
 
 \ /
  Last update: 2013-02-08 05:21    [W:0.065 / U:0.328 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site