• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 4fbef95a
    David S. Miller authored
    Conflicts:
    	drivers/net/ethernet/emulex/benet/be.h
    	drivers/net/usb/qmi_wwan.c
    	drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
    	include/net/netfilter/nf_conntrack_synproxy.h
    	include/net/secure_seq.h
    
    The conflicts are of two varieties:
    
    1) Conflicts with Joe Perches's 'extern' removal from header file
       function declarations.  Usually it's an argument signature change
       or a function being added/removed.  The resolutions are trivial.
    
    2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds
       a new value, another changes an existing value.  That sort of
       thing.
    Signed-off-by: 's avatarDavid S. Miller <davem@davemloft.net>
    4fbef95a
mrp.h 2.99 KB