/proc
Linus, please, pull from
git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git proc
to get
a) oops fix for rare race condition
b) /proc/*/personality files
c) removal of kernel.maps_protect sysctl which stopped controlling anything since 2.6.24-rc7 (effectively was always turned on)
and misc cleanups not worth mentioning.
Documentation/filesystems/proc.txt | 7 ------- arch/arm/kernel/dma.c | 17 ----------------- arch/sparc/include/asm/dma_32.h | 1 - fs/proc/Kconfig | 10 ++++++++++ fs/proc/array.c | 7 ------- fs/proc/base.c | 21 ++++++++++----------- fs/proc/inode.c | 2 +- fs/proc/internal.h | 2 -- fs/proc/proc_misc.c | 1 - fs/proc/proc_sysctl.c | 6 +++--- fs/proc/task_mmu.c | 16 +--------------- fs/proc/task_nommu.c | 5 ----- fs/proc/vmcore.c | 6 ------ init/Kconfig | 10 ---------- kernel/sched_debug.c | 2 -- kernel/sysctl.c | 11 ----------- 16 files changed, 25 insertions(+), 99 deletions(-)
From: Alexey Dobriyan <[email protected]>
Date: Mon, 13 Oct 2008 12:19:08 +0400
Quoted 3 lines
Linus, please, pull from
git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.gitproc
It doesn't merge without conflicts:
davem@sunset:~/src/GIT/linux-2.6$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git proc remote: Counting objects: 100, done. remote: Compressing objects: 100% (17/17), done. remote: Total 71 (delta 60), reused 64 (delta 53) Unpacking objects: 100% (71/71), done.
Quoted 1 line
From
git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc
* branch proc -> FETCH_HEAD
Auto-merged Documentation/filesystems/proc.txt
CONFLICT (delete/modify): arch/sparc/include/asm/dma_32.h deleted in HEAD and modified in 3bbfe0596746e1590888a6e1e6a07583265238b7. Version 3bbfe0596746e1590888a6e1e6a07583265238b7 of arch/sparc/include/asm/dma_32.h left in tree. Auto-merged kernel/sysctl.c
Automatic merge failed; fix conflicts and then commit the result.
davem@sunset:~/src/GIT/linux-2.6$
This is caused by my sparc merge that Linux took in mid-day Sunday.
Quoted 8 lines · David Miller
From: Alexey Dobriyan <[email protected]>
Date: Mon, 13 Oct 2008 12:19:08 +0400Quoted 3 lines
Linus, please, pull from
git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.gitprocIt doesn't merge without conflicts:
So be it. Linus should just rm arch/sparc/include/asm/dma_32.h and commit.
Quoted 14 lines
davem@sunset:~/src/GIT/linux-2.6$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc.git proc remote: Counting objects: 100, done. remote: Compressing objects: 100% (17/17), done. remote: Total 71 (delta 60), reused 64 (delta 53) Unpacking objects: 100% (71/71), done. From git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc * branch proc -> FETCH_HEAD Auto-merged Documentation/filesystems/proc.txt CONFLICT (delete/modify): arch/sparc/include/asm/dma_32.h deleted in HEAD and modified in 3bbfe0596746e1590888a6e1e6a07583265238b7. Version 3bbfe0596746e1590888a6e1e6a07583265238b7 of arch/sparc/include/asm/dma_32.h left in tree. Auto-merged kernel/sysctl.c Automatic merge failed; fix conflicts and then commit the result. davem@sunset:~/src/GIT/linux-2.6$This is caused by my sparc merge that Linux took in mid-day Sunday.