summaryrefslogtreecommitdiffstats
path: root/lib/notifier-error-inject.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-12-08 20:25:45 -0500
committerDavid S. Miller <davem@davemloft.net>2012-12-08 20:25:45 -0500
commitba501666fa8d44344a1f7e5158ba973491a70671 (patch)
treece71348bab0fe881627d6ed8e43c6e137d3c3a8c /lib/notifier-error-inject.c
parentc772dde343917b0961f75227cfb8c2b2f2b31d24 (diff)
parent0fef8f205f6f4cdff1869e54e44f317a79902785 (diff)
downloadblackbird-op-linux-ba501666fa8d44344a1f7e5158ba973491a70671.tar.gz
blackbird-op-linux-ba501666fa8d44344a1f7e5158ba973491a70671.zip
Merge branch 'tipc_net-next_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Paul Gortmaker says: ==================== Changes since v1: -get rid of essentially unused variable spotted by Neil Horman (patch #2) -drop patch #3; defer it for 3.9 content, so Neil, Jon and Ying can discuss its specifics at their leisure while net-next is closed. (It had no direct dependencies to the rest of the series, and was just an optimization) -fix indentation of accept() code directly in place vs. forking it out to a separate function (was patch #10, now patch #9). Rebuilt and re-ran tests just to ensure nothing odd happened. Original v1 text follows, updated pull information follows that. --------- Here is another batch of TIPC changes. The most interesting thing is probably the non-blocking socket connect - I'm told there were several users looking forward to seeing this. Also there were some resource limitation changes that had the right intent back in 2005, but were now apparently causing needless limitations to people's real use cases; those have been relaxed/removed. There is a lockdep splat fix, but no need for a stable backport, since it is virtually impossible to trigger in mainline; you have to essentially modify code to force the probabilities in your favour to see it. The rest can largely be categorized as general cleanup of things seen in the process of getting the above changes done. Tested between 64 and 32 bit nodes with the test suite. I've also compile tested all the individual commits on the chain. I'd originally figured on this queue not being ready for 3.8, but the extended stabilization window of 3.7 has changed that. On the other hand, this can still be 3.9 material, if that simply works better for folks - no problem for me to defer it to 2013. If anyone spots any problems then I'll definitely defer it, rather than rush a last minute respin. =================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud