summaryrefslogtreecommitdiffstats
path: root/fs/orangefs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-12-15 01:07:29 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2016-12-15 01:07:29 -0500
commitc4364f837caf618c2fdb51a2e132cf29dfd1fffa (patch)
treeb24f7bb6f36f6086086f485478995fc5007ce99b /fs/orangefs
parent1d0fd57a50aa372dd2e84b16711023cbcd826cb8 (diff)
parent8f64fb1ccef331077a96cbfc3c23f91cbe563fd0 (diff)
parentad5cb123fd0e4d929b36f0f9bbdec14cb6229ad7 (diff)
parent0b62fca2623e4633c8819e89946d0da446a5846b (diff)
downloadlinux-c4364f837caf618c2fdb51a2e132cf29dfd1fffa.tar.bz2
Merge branches 'work.namei', 'work.dcache' and 'work.iov_iter' into for-linus