Hi all,
On Fri, 12 Oct 2018 10:53:29 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/rxrpc/input.c
>
> between commit:
>
> 5271953cad31 ("rxrpc: Use the UDP encap_rcv hook")
>
> from the net tree and commit:
>
> d2944b1c66a5 ("rxrpc: Use rxrpc_free_skb() rather than rxrpc_lose_skb()")
>
> from the net-next tree.
>
> I fixed it up (I used the net tree version) and can carry the fix as
Just to be clear, I did not use the whole file from the net tree, just
the net tree version of the conflicting hunks. There are other non
conflicting changes on both sides.
--
Cheers,
Stephen Rothwell
Attachment:
pgpxT7qwAUgdi.pgp
Description: OpenPGP digital signature
