aboutsummaryrefslogtreecommitdiff
path: root/net/mpls
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-25 12:40:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-25 12:40:36 -0700
commitdb1003f23189cdbb2d450dff1edbc8e318797344 (patch)
tree5e304a271618ae987b556ac48fcbc841755d8e11 /net/mpls
parentef0d2c1686aa256a5f7a4a5f55415563c1ab184c (diff)
parent656f88ddf1ec3abf2cd20b8b4028c44e8e95f56d (diff)
Merge branch 'afs' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
Pull AFS fixes and cleanups from David Howells: "Here are some patches to the AFS filesystem: 1) Fix problems in the clean-up parts of the cache manager service handler. 2) Split afs_end_call() introduced in (1) and replace some identical code elsewhere with a call to the first half of the split function. 3) Fix an error introduced in the workqueue PREPARE_WORK() elimination commits. 4) Clean up argument passing to functions called from the workqueue as there's now an insulating layer between them and the workqueue. This is possible from (3)" * 'afs' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs: AFS: Pass an afs_call* to call->async_workfn() instead of a work_struct* AFS: Fix kafs module unloading AFS: Part of afs_end_call() is identical to code elsewhere, so split it AFS: Fix cache manager service handlers
Diffstat (limited to 'net/mpls')
0 files changed, 0 insertions, 0 deletions