Messages in this thread | | | Date | Thu, 7 Feb 2013 11:16:12 +0000 | From | James Hogan <> | Subject | linux-next build conflict between modules and metag trees (LOCKDEP_NOW_UNRELIABLE) |
| |
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?
The only commits this would include are: $ git log --oneline linus/master..373d4d0 373d4d0 taint: add explicit flag to show whether lock dep is still OK. 64748a2 module: printk message when module signature fail taints kernel.
Thanks James
| |