1 diff --git a/Makefile b/Makefile
2 index d001959..2a69b9b 100644
9 -EXTRAVERSION = .23-op1
10 +EXTRAVERSION = .24-op1
11 NAME = Holy Dancing Manatees, Batman!
14 diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
15 index 4ffecd1..d295ed1 100644
16 --- a/drivers/acpi/power.c
17 +++ b/drivers/acpi/power.c
18 @@ -116,7 +116,7 @@ acpi_power_get_context(acpi_handle handle,
21 *resource = acpi_driver_data(device);
27 diff --git a/fs/dnotify.c b/fs/dnotify.c
28 index 936409f..91b9753 100644
32 #include <linux/init.h>
33 #include <linux/spinlock.h>
34 #include <linux/slab.h>
35 +#include <linux/file.h>
37 int dir_notify_enable __read_mostly = 1;
39 @@ -66,6 +67,7 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
40 struct dnotify_struct **prev;
42 fl_owner_t id = current->files;
46 if ((arg & ~DN_MULTISHOT) == 0) {
47 @@ -92,6 +94,15 @@ int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
54 + /* we'd lost the race with close(), sod off silently */
55 + /* note that inode->i_lock prevents reordering problems
56 + * between accesses to descriptor table and ->i_dnotify */
60 error = __f_setown(filp, task_pid(current), PIDTYPE_PID, 0);