• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 0fa74a4b
    David S. Miller authored
    Conflicts:
    	drivers/net/ethernet/emulex/benet/be_main.c
    	net/core/sysctl_net_core.c
    	net/ipv4/inet_diag.c
    
    The be_main.c conflict resolution was really tricky.  The conflict
    hunks generated by GIT were very unhelpful, to say the least.  It
    split functions in half and moved them around, when the real actual
    conflict only existed solely inside of one function, that being
    be_map_pci_bars().
    
    So instead, to resolve this, I checked out be_main.c from the top
    of net-next, then I applied the be_main.c changes from 'net' since
    the last time I merged.  And this worked beautifully.
    
    The inet_diag.c and sysctl_net_core.c conflicts were simple
    overlapping changes, and were easily to resolve.
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    0fa74a4b
caif_socket.c 26.5 KB