Hi Jens,

Today's linux-next merge of the block tree got conflicts in
include/linux/interrupt.h and kernel/softirq.c between commit
978b0116cd225682a29e3d1d5010319bf2de32c2 ("softirq: allocate less
vectors") from the tip-core tree and commit
c065c007d92de6ed071c9939bd1982d3a35ebd0f ("softirq: Define and use
NR_SOFTIRQ") from the block tree.

These two commits seem to do the same thing.  I have used the latter as
other things in the block tree depend on it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/