sfr at canb
Feb 26, 2012, 6:58 PM
Post #1 of 2
linux-next: manual merge of the uprobes tree with the tip tree
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.
Stephen Rothwell sfr [at] canb