Hi Srikar,

Today's linux-next merge of the uprobes tree got a conflicts in various
files between commits from the tip tree and commits from the uprobes tree.

It looks like a later (and different) version of the uprobes patch set has
been merged into the tip tree.  So I have dropped the uprobes tree
changes for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/