linux-next: manual merge of the afs tree with the net tree

linux-next: manual merge of the afs tree with the net tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 877 bytes --]

Hi all,

Today's linux-next merge of the afs tree got conflicts in:

  net/rxrpc/input.c

between commits:

  730c5fd42c1e ("rxrpc: Fix local endpoint refcounting")
  e8c3af6bb33a ("rxrpc: Don't bother generating maxSkew in the ACK packet")

from the net tree and commits:

  5c2833938bf5 ("rxrpc: Fix local endpoint refcounting")
  49bbdebb23f2 ("rxrpc: Don't bother generating maxSkew in the ACK packet")

from the afs tree.

I fixed it up (I just used the latter versions) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the afs tree with the net tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 878 bytes --]

Hi all,

Today's linux-next merge of the afs tree got conflicts in:

  include/trace/events/rxrpc.h
  net/rxrpc/ar-internal.h
  net/rxrpc/call_object.c
  net/rxrpc/conn_client.c
  net/rxrpc/input.c
  net/rxrpc/recvmsg.c
  net/rxrpc/skbuff.c

between various commits from the net tree and similar commits from the
afs tree.

I fixed it up (I just dropped the afs tree for today) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.

It looks like the afs tree has older versions fo some commits in the
net tree ... plus some more.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]