diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-25 13:06:12 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-25 13:10:36 -0400 |
commit | 7b0cfee1a24efdfe0235bac62e53f686fe8a8e24 (patch) | |
tree | eeeb8cc3bf7be5ec0e54b7c4f3808ef88ecca012 /fs/nfs/internal.h | |
parent | 9756fe38d10b2bf90c81dc4d2f17d5632e135364 (diff) | |
parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) |
Merge tag 'v3.5-rc4' into drm-intel-next-queued
I want to merge the "no more fake agp on gen6+" patches into
drm-intel-next (well, the last pieces). But a patch in 3.5-rc4 also
adds a new use of dev->agp. Hence the backmarge to sort this out, for
otherwise drm-intel-next merged into Linus' tree would conflict in the
relevant code, things would compile but nicely OOPS at driver load :(
Conflicts in this merge are just simple cases of "both branches
changed/added lines at the same place". The only tricky part is to
keep the order correct wrt the unwind code in case of errors in
intel_ringbuffer.c (and the MI_DISPLAY_FLIP #defines in i915_reg.h
together, obviously).
Conflicts:
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_ringbuffer.c
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'fs/nfs/internal.h')
-rw-r--r-- | fs/nfs/internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 1848a7275592..18f99ef71343 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h | |||
@@ -369,6 +369,10 @@ extern int nfs_migrate_page(struct address_space *, | |||
369 | /* direct.c */ | 369 | /* direct.c */ |
370 | void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, | 370 | void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, |
371 | struct nfs_direct_req *dreq); | 371 | struct nfs_direct_req *dreq); |
372 | static inline void nfs_inode_dio_wait(struct inode *inode) | ||
373 | { | ||
374 | inode_dio_wait(inode); | ||
375 | } | ||
372 | 376 | ||
373 | /* nfs4proc.c */ | 377 | /* nfs4proc.c */ |
374 | extern void __nfs4_read_done_cb(struct nfs_read_data *); | 378 | extern void __nfs4_read_done_cb(struct nfs_read_data *); |