lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Browse Source 
Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.
This commit is contained in:
Trond Myklebust
2006-06-20 20:46:21 -04:00
parent d59bf96cdd 077e98945d
commit 70ac4385a1
1170 changed files with 25359 additions and 10569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/lockd/lockd.h
View File

@ -11,7 +11,6 @@
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/in.h>
#include <linux/fs.h>
#include <linux/kref.h>

1
include/linux/lockd/nlm.h
View File

@ -9,7 +9,6 @@
#ifndef LINUX_LOCKD_NLM_H
#define LINUX_LOCKD_NLM_H
#include <linux/config.h>
/* Maximum file offset in file_lock.fl_end */
# define NLM_OFFSET_MAX ((s32) 0x7fffffff)