From: David S. Miller Date: Tue, 17 Jul 2012 05:33:32 +0000 (-0700) Subject: Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg... X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=07689b0a5c26176c528d7864b93188045439f49b;p=~shefty%2Frdma-dev.git Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux Paul Gortmaker says: ==================== This is the same eight commits as sent for review last week[1], with just the incorporation of the pr_fmt change as suggested by JoeP. There was no additional change requests, so unless you can see something else you'd like me to change, please pull. ... Erik Hugne (5): tipc: use standard printk shortcut macros (pr_err etc.) tipc: remove TIPC packet debugging functions and macros tipc: simplify print buffer handling in tipc_printf tipc: phase out most of the struct print_buf usage tipc: remove print_buf and deprecated log buffer code Paul Gortmaker (3): tipc: factor stats struct out of the larger link struct tipc: limit error messages relating to memory leak to one line tipc: simplify link_print by divorcing it from using tipc_printf ==================== Signed-off-by: David S. Miller --- 07689b0a5c26176c528d7864b93188045439f49b