|
Revision tags: v2.6.23-rc1 |
|
| #
1ff8392c |
| 19-Jul-2007 |
Steve French <sfrench@us.ibm.com> |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
|
| #
e4c4bf99 |
| 16-Jul-2007 |
Jeff Dike <jdike@addtoit.com> |
uml: Eliminate kernel allocator wrappers
UML had two wrapper procedures for kmalloc, um_kmalloc and um_kmalloc_atomic
because the flag constants weren't available in userspace code.
kern_constants.h
uml: Eliminate kernel allocator wrappers
UML had two wrapper procedures for kmalloc, um_kmalloc and um_kmalloc_atomic
because the flag constants weren't available in userspace code.
kern_constants.h had made kernel constants available for a long time, so there
is no need for these wrappers any more. Rather, userspace code calls kmalloc
directly with the userspace versions of the gfp flags.
kmalloc isn't a real procedure, so I had to essentially copy the inline
wrapper around __kmalloc.
vmalloc also had its own wrapper for no good reason. This is now gone.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
| #
c4399016 |
| 16-Jul-2007 |
Jeff Dike <jdike@addtoit.com> |
uml: simplify helper stack handling
run_helper and run_helper_thread had arguments which were the same in all
callers. run_helper's stack_out was always NULL and run_helper_thread's
stack_order was
uml: simplify helper stack handling
run_helper and run_helper_thread had arguments which were the same in all
callers. run_helper's stack_out was always NULL and run_helper_thread's
stack_order was always 0. These are now gone, and the constants folded
into the code.
Also fixed leaks of the helper stack in the AIO and SIGIO code.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
|
Revision tags: v2.6.22, v2.6.22-rc7, v2.6.22-rc6, v2.6.22-rc5, v2.6.22-rc4, v2.6.22-rc3, v2.6.22-rc2, v2.6.22-rc1 |
|
| #
5c34202b |
| 11-May-2007 |
Wim Van Sebroeck <wim@iguana.be> |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
334d0dd8 |
| 08-May-2007 |
Dmitry Torokhov <dtor@insightbb.com> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
02bbc0f0 |
| 08-May-2007 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'linux-2.6'
|
| #
9218b171 |
| 06-May-2007 |
Jeff Dike <jdike@addtoit.com> |
uml: remove user_util.h
user_util.h isn't needed any more, so delete it and remove all includes of it.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorbl
uml: remove user_util.h
user_util.h isn't needed any more, so delete it and remove all includes of it.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
|
Revision tags: v2.6.21, v2.6.21-rc7, v2.6.21-rc6, v2.6.21-rc5, v2.6.21-rc4, v2.6.21-rc3, v2.6.21-rc2, v2.6.21-rc1 |
|
| #
5a84d159 |
| 20-Feb-2007 |
Russell King <rmk@dyn-67.arm.linux.org.uk> |
Merge ARM fixes
|
| #
48c871c1 |
| 17-Feb-2007 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
|
| #
d9bc125c |
| 13-Feb-2007 |
Trond Myklebust <Trond.Myklebust@netapp.com> |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix con
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
show more ...
|
| #
54c66f6d |
| 13-Feb-2007 |
Kumar Gala <galak@kernel.crashing.org> |
Merge branch 'master' into 85xx
|
| #
cbe56159 |
| 13-Feb-2007 |
Kumar Gala <galak@kernel.crashing.org> |
Merge branch 'master' into 83xx
|
| #
7baca6ad |
| 13-Feb-2007 |
Kumar Gala <galak@kernel.crashing.org> |
Merge branch 'master' into for_paulus
|
| #
67608e0c |
| 10-Feb-2007 |
Jeff Dike <jdike@addtoit.com> |
[PATCH] uml: port driver formatting
Whitespace and style fixes.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton
[PATCH] uml: port driver formatting
Whitespace and style fixes.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
show more ...
|
|
Revision tags: v2.6.20, v2.6.20-rc7, v2.6.20-rc6, v2.6.20-rc5, v2.6.20-rc4, v2.6.20-rc3, v2.6.20-rc2, v2.6.20-rc1 |
|
| #
f0eef253 |
| 13-Dec-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
|
| #
c4366889 |
| 12-Dec-2006 |
Dave Jones <davej@redhat.com> |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
|
| #
79acbb3f |
| 04-Dec-2006 |
Paul Mackerras <paulus@samba.org> |
Merge branch 'linux-2.6' into for-linus
|
|
Revision tags: v2.6.19 |
|
| #
0bd2af46 |
| 22-Nov-2006 |
James Bottomley <jejb@mulgrave.il.steeleye.com> |
Merge ../scsi-rc-fixes-2.6
|
|
Revision tags: v2.6.19-rc6, v2.6.19-rc5 |
|
| #
752c58a4 |
| 05-Nov-2006 |
Dmitry Torokhov <dtor@insightbb.com> |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
|
Revision tags: v2.6.19-rc4, v2.6.19-rc3 |
|
| #
513b046c |
| 21-Oct-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
|
| #
c13e5690 |
| 20-Oct-2006 |
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> |
[PATCH] uml: split memory allocation prototypes out of user.h
user.h is too generic a header name. I've split out allocation routines from
it.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaiso
[PATCH] uml: split memory allocation prototypes out of user.h
user.h is too generic a header name. I've split out allocation routines from
it.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show more ...
|
|
Revision tags: v2.6.19-rc2, v2.6.19-rc1 |
|
| #
8a84fc15 |
| 01-Oct-2006 |
David Woodhouse <dwmw2@infradead.org> |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
|
| #
185a257f |
| 28-Sep-2006 |
Steven Whitehouse <swhiteho@redhat.com> |
Merge branch 'master' into gfs2
|
| #
3b9f6cb8 |
| 28-Sep-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|
| #
aebb1153 |
| 28-Sep-2006 |
Jeff Garzik <jeff@garzik.org> |
Merge branch 'master' into upstream
|