Hi all,
Today's linux-next merge of the gfs2 tree got a conflict in:
net/core/secure_seq.c
between commit:
28ee1b746f49 ("secure_seq: downgrade to per-host timestamp offsets")
from the net tree and commit:
a30aad50c26c ("tcp: rename *_sequence_number() to *_seq_and_tsoff()")
from the g
Hi all,
Today's linux-next merge of the gfs2 tree got a conflict in:
drivers/net/usb/r8152.c
between commit:
2f25abe6bac5 ("r8152: prevent the driver from transmitting packets with
carrier off")
from the net tree and commit:
ce594e9824ab ("r8152: simply the arguments")
from the gfs2 a
