On Wed, Jan 10, 2018 at 1:51 PM, Marcelo Ricardo Leitner
wrote:
> On Wed, Jan 10, 2018 at 11:39:45AM -0500, Paul Moore wrote:
>> On Sat, Dec 30, 2017 at 12:18 PM, Richard Haines
>> wrote:
>> > Note: Some conflicts are expected when merging with current net-next due to
>> > Interleaving Data (I-DA
On Wed, Jan 10, 2018 at 11:39:45AM -0500, Paul Moore wrote:
> On Sat, Dec 30, 2017 at 12:18 PM, Richard Haines
> wrote:
> > Note: Some conflicts are expected when merging with current net-next due to
> > Interleaving Data (I-DATA) sets of patches:
> > PATCH 2/4 - Where 'sctp_datachk_len(&asoc->str
On Sat, Dec 30, 2017 at 12:18 PM, Richard Haines
wrote:
> Note: Some conflicts are expected when merging with current net-next due to
> Interleaving Data (I-DATA) sets of patches:
> PATCH 2/4 - Where 'sctp_datachk_len(&asoc->stream)' has replaced
> 'sizeof(struct sctp_data_chunk)' in include/net/s
Note: Some conflicts are expected when merging with current net-next due to
Interleaving Data (I-DATA) sets of patches:
PATCH 2/4 - Where 'sctp_datachk_len(&asoc->stream)' has replaced
'sizeof(struct sctp_data_chunk)' in include/net/sctp/sctp.h,
net/sctp/chunk.c and net/sctp/socket.c
PATCH 3/4 -