projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 82094b55 AF |
1 | From: Greg Kroah-Hartman <gregkh@suse.de> |
| 2 | Subject: Linux 2.6.27.31 | |
| 3 | ||
| 4 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 5 | ||
| 6 | diff --git a/Makefile b/Makefile | |
| 7 | index 0eef388..fa0d21e 100644 | |
| 8 | --- a/Makefile | |
| 9 | +++ b/Makefile | |
| 10 | @@ -1,7 +1,7 @@ | |
| 11 | VERSION = 2 | |
| 12 | PATCHLEVEL = 6 | |
| 13 | SUBLEVEL = 27 | |
| 14 | -EXTRAVERSION = .30 | |
| 15 | +EXTRAVERSION = .31 | |
| 16 | NAME = Trembling Tortoise | |
| 17 | ||
| 18 | # *DOCUMENTATION* | |
| 19 | diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c | |
| 20 | index 994ca87..61cb48f 100644 | |
| 21 | --- a/fs/compat_ioctl.c | |
| 22 | +++ b/fs/compat_ioctl.c | |
| 23 | @@ -1910,7 +1910,6 @@ COMPATIBLE_IOCTL(FIONCLEX) | |
| 24 | COMPATIBLE_IOCTL(FIOASYNC) | |
| 25 | COMPATIBLE_IOCTL(FIONBIO) | |
| 26 | COMPATIBLE_IOCTL(FIONREAD) /* This is also TIOCINQ */ | |
| 27 | -COMPATIBLE_IOCTL(FS_IOC_FIEMAP) | |
| 28 | /* 0x00 */ | |
| 29 | COMPATIBLE_IOCTL(FIBMAP) | |
| 30 | COMPATIBLE_IOCTL(FIGETBSZ) |