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 <davem@davemloft.net>
Showing
- include/linux/tipc_config.h 2 additions, 2 deletionsinclude/linux/tipc_config.h
- net/tipc/Kconfig 0 additions, 25 deletionsnet/tipc/Kconfig
- net/tipc/bcast.c 30 additions, 35 deletionsnet/tipc/bcast.c
- net/tipc/bearer.c 34 additions, 28 deletionsnet/tipc/bearer.c
- net/tipc/bearer.h 1 addition, 1 deletionnet/tipc/bearer.h
- net/tipc/config.c 23 additions, 18 deletionsnet/tipc/config.c
- net/tipc/core.c 5 additions, 13 deletionsnet/tipc/core.c
- net/tipc/core.h 5 additions, 60 deletionsnet/tipc/core.h
- net/tipc/discover.c 4 additions, 6 deletionsnet/tipc/discover.c
- net/tipc/handler.c 2 additions, 2 deletionsnet/tipc/handler.c
- net/tipc/link.c 133 additions, 171 deletionsnet/tipc/link.c
- net/tipc/link.h 32 additions, 31 deletionsnet/tipc/link.h
- net/tipc/log.c 10 additions, 292 deletionsnet/tipc/log.c
- net/tipc/log.h 0 additions, 66 deletionsnet/tipc/log.h
- net/tipc/msg.c 0 additions, 242 deletionsnet/tipc/msg.c
- net/tipc/name_distr.c 13 additions, 12 deletionsnet/tipc/name_distr.c
- net/tipc/name_table.c 74 additions, 58 deletionsnet/tipc/name_table.c
- net/tipc/net.c 4 additions, 4 deletionsnet/tipc/net.c
- net/tipc/netlink.c 1 addition, 1 deletionnet/tipc/netlink.c
- net/tipc/node.c 11 additions, 11 deletionsnet/tipc/node.c
Please register or sign in to comment