apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity
18,216 Commits 2 Branches 0 Tags
8b87e1baff24e586c3fe6c168843d213119bf4dd
Commit Graph

18216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Linus Torvalds 8b87e1baff Merge master.kernel.org:/home/rmk/linux-2.6-serial 2006-01-12 12:23:03 -08:00
Linus Torvalds a2b421fee3 Merge master.kernel.org:/home/rmk/linux-2.6-mmc 2006-01-12 12:22:17 -08:00
Jens Axboe ba027def7b [PATCH] Revert ide softirq handling 
There's a problem with the REQ_BLOCK_PC handling as well (bad ->data_len
handling) where it could actually complete a request ahead of time.  I
suggest we just back this out for now, I will resubmit it later when I'm
fully confident in it.

This reverts commit 8672d57138

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 12:00:47 -08:00
Arjan van de Ven f392ecfa12 [SERIAL] turn serial semaphores into mutexes 
Turn several drivers/serial/ semaphores-used-as-mutex into mutexes

Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2006-01-12 18:44:32 +00:00
Arjan van de Ven a621aaed69 [MMC+MFD] Convert mmc to mutexes 
convert mfd and mmc to mutexes

Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 2006-01-12 18:43:35 +00:00
Linus Torvalds 661dd5c840 Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/hrtimer-2.6 2006-01-12 10:22:11 -08:00
Linus Torvalds 45bfe98bd7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge 
Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's
gone, gone, gone).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 10:21:22 -08:00
Linus Torvalds 9f5974c873 Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 2006-01-12 09:10:34 -08:00
Al Viro a2d823bf13 [PATCH] m68k: console code in head.S needs framebuffer support built in 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:06 -08:00
Al Viro 3c9757b7c2 [PATCH] m68k: fix PIO case in esp 
we always set ->SCp.ptr to physical address of buffer; for DMA that's
just what we need, but we end up using it as virtual address in PIO
case of esp_do_data(), with obvious breakage as soon as memory mapping
becomes non-trivial.  The fix is obvious.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:05 -08:00
Al Viro ed1705afb9 [PATCH] m68k: fix macfb init 
To be used by module_init() function should return int; same for functions
that have "return -ENODEV;" in them, actually ;-)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:05 -08:00
Al Viro 54a5a6eb58 [PATCH] m68k: fix reference to init_task in vmlinux-sun3.lds 
it's *(.data.init_task), not init_task...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:05 -08:00
Al Viro a763be5c1a [PATCH] m68k: fix use of void foo(void) asm("bar") in traps.c 
with gcc4 these have file scope, so having them different in different
blocks doesn't work anymore

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:05 -08:00
Al Viro 639074354b [PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:05 -08:00
Al Viro 0c79358b87 [PATCH] m68k: Moved initialisation of conswitchp from subarches to global arch setup 
Signed-off-by: Kars de Jong <jongk@linux-m68k.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:05 -08:00
Al Viro 35efbcabdc [PATCH] m68k: cast in strnlen switched to unsigned long 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:04 -08:00
Al Viro a5d361fc24 [PATCH] m68k: NULL noise removal 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:04 -08:00
Al Viro 031eb4cdde [PATCH] m68k: dmasound __user annotations 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:04 -08:00
Al Viro d998265feb [PATCH] m68k: zorro __user annotations 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:04 -08:00
Al Viro 3728d254de [PATCH] m68k: amifb __user annotations 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:04 -08:00
Al Viro d85f6891aa [PATCH] m68k: dsp56k __user annotations 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:04 -08:00
Al Viro ab14caec7a [PATCH] m68k: amiserial __user annotations 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:03 -08:00
Al Viro 2c7af51129 [PATCH] m68k: ataflop __user annotations, NULL noise removal 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:03 -08:00
Al Viro 8a423e542b [PATCH] m68k: amiflop __user annotations 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:03 -08:00
Al Viro 6225d85f17 [PATCH] m68k: checksum __user annotations 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 2006-01-12 09:09:03 -08:00