Skip to contentSkip to conversation

mutex subsystem, semaphore to mutex: automatic conversion of simpler cases

PATCH Andrew Morton 2 participants 3 messages Jan 7, 2006 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

2 out of 7 hunks FAILED -- saving rejects to file drivers/md/dm.c.rej
1 out of 4 hunks FAILED -- saving rejects to file drivers/md/md.c.rej
2 out of 20 hunks FAILED -- saving rejects to file drivers/pcmcia/rsrc_nonstatic.c.rej 1 out of 5 hunks FAILED -- saving rejects to file fs/nfs/callback.c.rej 1 out of 10 hunks FAILED -- saving rejects to file security/selinux/selinuxfs.c.rej 2 out of 6 hunks FAILED -- saving rejects to file sound/arm/pxa2xx-ac97.c.rej 6 out of 9 hunks FAILED -- saving rejects to file sound/core/hwdep.c.rej 1 out of 8 hunks FAILED -- saving rejects to file sound/core/info.c.rej 5 out of 13 hunks FAILED -- saving rejects to file sound/core/pcm.c.rej 5 out of 8 hunks FAILED -- saving rejects to file sound/core/rawmidi.c.rej 1 out of 7 hunks FAILED -- saving rejects to file sound/core/seq/oss/seq_oss.c.rej 3 out of 10 hunks FAILED -- saving rejects to file sound/core/seq/seq_device.c.rej 1 out of 8 hunks FAILED -- saving rejects to file sound/core/seq/seq_midi.c.rej 5 out of 8 hunks FAILED -- saving rejects to file sound/core/sound.c.rej 6 out of 8 hunks FAILED -- saving rejects to file sound/core/sound_oss.c.rej 1 out of 22 hunks FAILED -- saving rejects to file sound/core/timer.c.rej 1 out of 6 hunks FAILED -- saving rejects to file sound/usb/usbaudio.c.rej

I think I'll duck this one for now.

Perhaps it should be split up a bit?

#2 lore raw
Quoted 3 lines · Andrew Morton

I think I'll duck this one for now.

Perhaps it should be split up a bit?

yeah, i'll merge it tomorrow and will split it up into per-driver patches. Could you upload an x.bz2 i should merge against - or is Linus-curr OK?

Ingo

#3 lore raw
Quoted 4 lines · Ingo Molnar

* Andrew Morton <[email protected]> wrote:

Quoted 8 lines
Quoted 3 lines

I think I'll duck this one for now.

Perhaps it should be split up a bit?

yeah, i'll merge it tomorrow and will split it up into per-driver patches. Could you upload an x.bz2 i should merge against - or is Linus-curr OK?

The old x.bz2 would be better please, because I'm going to have to do fixups for various -mm-only things like dlm, asfs, reiser4, etc.

http://www.zip.com.au/~akpm/linux/patches/stuff/up-to-mutex-series.bz2

Is everything up to and including the mutex series. That's a suitable insertion point for new stuff.

http://www.zip.com.au/~akpm/linux/patches/stuff/everything.bz2 is the whole kit. It includes additional things which'll need fixups if you're feeling keen.

Sorry for the hassle - there are still great gobs of stuff to merge, and we're basically twiddling thumbs until things like nfs, powerpc, usb get merged.