1. 15 8月, 2006 3 次提交
  2. 10 8月, 2006 18 次提交
  3. 09 8月, 2006 10 次提交
  4. 07 8月, 2006 4 次提交
    • J
      Merge branch 'master' into upstream · 38ebb1e0
      Jeff Garzik 提交于
      38ebb1e0
    • L
      Linux v2.6.18-rc4 · 9f737633
      Linus Torvalds 提交于
      9f737633
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input · 6e1e6325
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: (24 commits)
        Input: ati_remote - use msec instead of jiffies
        Input: ati_remote - add missing input_sync()
        Input: ati_remote - relax permissions sysfs module parameters
        Input: ati_remote - make filter time a module parameter
        Input: atkbd - restore repeat rate when resuming
        Input: trackpoint - activate protocol when resuming
        Input: logips2pp - fix button mapping for MX300
        Input: keyboard - change to use kzalloc
        Input: serio/gameport - check whether driver core calls succeeded
        Input: spaceball - make 4000FLX Lefty work
        Input: keyboard - simplify emulate_raw() implementation
        Input: keyboard - remove static variable and clean up initialization
        Input: hiddev - use standard list implementation
        Input: add missing handler->start() call
        Input: HID - fix potential out-of-bound array access
        Input: fix list iteration in input_release_device()
        Input: iforce - add Trust Force Feedback Race Master support
        Input: iforce - check array bounds before accessing elements
        Input: libps2 - warn instead of oopsing when passed bad arguments
        Input: fm801-gp - fix use after free
        ...
      6e1e6325
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa · a05ef8bf
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
        [ALSA] Don't reject O_RDWR at opening PCM OSS with read/write-only device
        [ALSA] snd-emu10k1: Implement support for Audigy 2 ZS [SB0353]
        [ALSA] add MAINTAINERS entry for snd-aoa
        [ALSA] aoa: platform function gpio: ignore errors from functions that don't exist
        [ALSA] make snd-powermac load even when it can't bind the device
        [ALSA] aoa: fix toonie codec
        [ALSA] aoa: feature gpio layer: fix IRQ access
        [ALSA] Conversions from kmalloc+memset to k(z|c)alloc
        [ALSA] snd-emu10k1: Fixes ALSA bug#2190
      a05ef8bf
  5. 06 8月, 2006 5 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · cb3f1e7b
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [LAPB]: Fix windowsize check
        [TCP]: Fixes IW > 2 cases when TCP is application limited
        [PKT_SCHED] RED: Fix overflow in calculation of queue average
        [LLX]: SOCK_DGRAM interface fixes
        [PKT_SCHED]: Return ENOENT if qdisc module is unavailable
        [BRIDGE]: netlink status fix
      cb3f1e7b
    • D
      [PATCH] SCX200_ACB: eliminate spurious timeout errors · 3e3183ba
      David Woodhouse 提交于
      While busy-waiting for completion, check the hardware after scheduling;
      don't schedule and then immediately check the _timeout_.  If the yield()
      took a long time (as it does on my OLPC prototype board when it's busy),
      we'd report a timeout even though the hardware was now ready.
      
      This fixes it, and also switches the yield() for a cond_resched() because
      we don't actually want to be _that_ nice about it.  I see nice
      tightly-packed SMBus transactions now, rather than waiting for milliseconds
      between successive phases.
      
      Actually, we shouldn't be busy-waiting here at all.  We should be using
      interrupts.  That's an exercise for another day though.
      Signed-off-by: NDavid Woodhouse <dwmw2@infradead.org>
      Cc: Christer Weinigel <wingel@nano-system.com>
      Cc: <Jordan.Crouse@amd.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      3e3183ba
    • E
      [PATCH] udf: initialize parts of inode earlier in create · 225add61
      Eric Sandeen 提交于
      I saw an oops down this path when trying to create a new file on a UDF
      filesystem which was internally marked as readonly, but mounted rw:
      
      udf_create
              udf_new_inode
                      new_inode
                              alloc_inode
                              	udf_alloc_inode
                      udf_new_block
                              returns EIO due to readonlyness
                      iput (on error)
                              udf_put_inode
                                      udf_discard_prealloc
                                              udf_next_aext
                                                      udf_current_aext
                                                              udf_get_fileshortad
                                                                      OOPS
      
      the udf_discard_prealloc() path was examining uninitialized fields of the
      udf inode.
      
      udf_discard_prealloc() already has this code to short-circuit the discard
      path if no extents are preallocated:
      
              if (UDF_I_ALLOCTYPE(inode) == ICBTAG_FLAG_AD_IN_ICB ||
                      inode->i_size == UDF_I_LENEXTENTS(inode))
              {
                      return;
              }
      
      so if we initialize UDF_I_LENEXTENTS(inode) = 0 earlier in udf_new_inode,
      we won't try to free the (not) preallocated blocks, since this will match
      the i_size = 0 set when the inode was initialized.
      Signed-off-by: NEric Sandeen <sandeen@sandeen.net>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      225add61
    • T
      [PATCH] futex: Apply recent futex fixes to futex_compat · ce2c6b53
      Thomas Gleixner 提交于
      The recent fixups in futex.c need to be applied to futex_compat.c too.  Fixes
      a hang reported by Olaf.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Cc: Olaf Hering <olh@suse.de>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      ce2c6b53
    • M
      [PATCH] pnpacpi: reject ACPI_PRODUCER resources · 2b8de5f5
      matthieu castet 提交于
      A patch in -mm kernel correct the parsing of "address resources" of pnpacpi.
      Before we assumed it was memory only, but it could be also IO.
      
      But this change show an hidden bug : some resources could be producer type
      that are not handled by pnp layer.  So we should ignore the producer
      resources.
      
      This patch fixes bug 6292 (http://bugzilla.kernel.org/show_bug.cgi?id=6292).
      Some devices like PNP0A03 have 0xd00-0xffff and 0x0-0xcf7 as IO producer
      resources.
      
      Before correcting "address resources" parsing, it was seen as memory and was
      harmless, because nobody tried to reserve this memory range as it should be
      IO.
      
      With the correction it become IO resources, and make failed all others device
      that want to register IO in this range and use pnp layer (like a ISA sound
      card).
      
      The solution is to ignore producer resources
      Signed-off-by: NMatthieu CASTET <castet.matthieu@free.fr>
      Signed-off-by: NUwe Bugla <uwe.bugla@gmx.de>
      Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
      Cc: Adam Belay <ambx1@neo.rr.com>
      Cc: "Brown, Len" <len.brown@intel.com>
      Acked-by: NShaohua Li <shaohua.li@intel.com>
      Signed-off-by: NAndrew Morton <akpm@osdl.org>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      2b8de5f5