• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 394efd19
    David S. Miller authored
    Conflicts:
    	drivers/net/ethernet/emulex/benet/be.h
    	drivers/net/netconsole.c
    	net/bridge/br_private.h
    
    Three mostly trivial conflicts.
    
    The net/bridge/br_private.h conflict was a function signature (argument
    addition) change overlapping with the extern removals from Joe Perches.
    
    In drivers/net/netconsole.c we had one change adjusting a printk message
    whilst another changed "printk(KERN_INFO" into "pr_info(".
    
    Lastly, the emulex change was a new inline function addition overlapping
    with Joe Perches's extern removals.
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    394efd19
xfrm_ipcomp.c 7.63 KB