commit f0ad886be1b6b2288cfa100c317dc6e5ceb93fd9 Author: Chris Wright Date: Sun Mar 5 11:07:54 2006 -0800 Linux 2.6.15.6 commit b74ed9233e914d8b76216168e475a9df62c28ac2 Author: Dave Jones Date: Wed Mar 1 23:10:31 2006 -0500 [PATCH] mempolicy.c compile fix, make sure BITS_PER_BYTE is defined Gar.. mm/mempolicy.c: In function 'get_nodes': mm/mempolicy.c:527: error: 'BITS_PER_BYTE' undeclared (first use in this function) mm/mempolicy.c:527: error: (Each undeclared identifier is reported only once mm/mempolicy.c:527: error: for each function it appears in.) About to retry a build with the below patch which should do the trick. (How did this *ever* build?) Signed-off-by: Dave Jones Signed-off-by: Chris Wright commit 166f00bf649517bb377b23e668b3fd52497f63d0 Author: Chris Wright Date: Wed Mar 1 23:19:25 2006 -0800 [PATCH] fs/nfs/direct.c compile fix Compile fix: fs/nfs/direct.c: In function 'nfs_get_user_pages': fs/nfs/direct.c:110: warning: implicit declaration of function 'nfs_free_user_pages' fs/nfs/direct.c: At top level: fs/nfs/direct.c:127: warning: conflicting types for 'nfs_free_user_pages' fs/nfs/direct.c:127: error: static declaration of 'nfs_free_user_pages' follows non-static declaration fs/nfs/direct.c:110: error: previous implicit declaration of 'nfs_free_user_pages' was here This should now be the same as fix that's going upstream. Signed-off-by: Chris Wright Acked-by: Trond Myklebust commit e8dc2c9e3c9ca640742630481329abb727f2dc6b Author: Tony Luck Date: Mon Feb 27 16:18:58 2006 -0800 [PATCH] die_if_kernel() can return (CVE-2006-0742) arch/ia64/kernel/unaligned.c erroneously marked die_if_kernel() with a "noreturn" attribute ... which is silly (it returns whenever the argument regs say that the fault happened in user mode, as one might expect given the "if_kernel" part of its name!). Thanks to Alan and Gareth for pointing this out. Signed-off-by: Tony Luck Signed-off-by: Chris Wright commit 5a6a280d035bae8752c7bd00671132357eba0a02 Author: Arnaldo Carvalho de Melo Date: Mon Feb 27 18:28:00 2006 -0800 [PATCH] Don't reset rskq_defer_accept in reqsk_queue_alloc In 295f7324ff8d9ea58b4d3ec93b1aaa1d80e048a9 I moved defer_accept from tcp_sock to request_queue and mistakingly reset it at reqsl_queue_alloc, causing calls to setsockopt(TCP_DEFER_ACCEPT ) to be lost after bind, the fix is to remove the zeroing of rskq_defer_accept from reqsl_queue_alloc. Thanks to Alexandra N. Kossovsky for reporting and testing the suggested fix. Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Chris Wright