OSDN Git Service

Merge branch 'tipc-next'
authorDavid S. Miller <davem@davemloft.net>
Thu, 7 Apr 2016 21:00:14 +0000 (17:00 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 7 Apr 2016 21:00:14 +0000 (17:00 -0400)
commit889750bd2e08a94d52a116056d462b3a8e5616a7
tree4c48098cd2b13be2819e1e6a4918b4dced748ab1
parentba35855e24d12d872e6173692bc34d48d96db39c
parent5b7066c3dd24c7d538e5ee402eb24bb182c16dab
Merge branch 'tipc-next'

Jon Maloy says:

====================
tipc: some small fixes

When fix a minor buffer leak, and ensure that bearers filter packets
correctly while they are being shut down.

v2: Corrected typos in commit #3, as per feedback from S. Shtylyov
v3: Removed commit #3 from the series. Improved version will be
    re-submitted later.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>