[ewg] RHEL4 U[4-7] backports conflict with vendor headers

[Tziporet Koren]

Brian J. Murrell wrote:
> Hi All,
>
> I have just filed bug 1655 about another backports header conflict withe
> the vendor kernel headers.
>
> assert_spin_locked is defined in include/linux/jbd.h in the vendor's
> sources and is also defined in
> ofa_kernel/kernel_addons/backport/2.6.9_U{4,5,6,7}/include/linux/spinlock.h in OFED 1.4.1.
>
> This of course yields a:
>
> include/linux/jbd.h:1204:1: "assert_spin_locked" redefined
>
> for any source file that includes both linux/spinlock.h and linux/jbd.h.
>
>   
Jon

Can you look at this?
Can we fix it for 1.5?

Tziporet