1. 28 Jul, 2009 31 commits
  2. 27 Jul, 2009 9 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify · fc013a58
      Linus Torvalds authored
      * 'for-linus' of git://git.infradead.org/users/eparis/notify:
        inotify: use GFP_NOFS under potential memory pressure
        fsnotify: fix inotify tail drop check with path entries
        inotify: check filename before dropping repeat events
        fsnotify: use def_bool in kconfig instead of letting the user choose
        inotify: fix error paths in inotify_update_watch
        inotify: do not leak inode marks in inotify_add_watch
        inotify: drop user watch count when a watch is removed
      fc013a58
    • Alan Cox's avatar
      pty: quickfix for the pty ENXIO timing problems · 3a542974
      Alan Cox authored
      This also makes close stall in the normal case which is apparently
      needed to fix emacs
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3a542974
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · f1462147
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
        cnic: Fix ISCSI_KEVENT_IF_DOWN message handling.
        net: irda: init spinlock after memcpy
        ixgbe: fix for 82599 errata marking UDP checksum errors
        r8169: WakeOnLan fix for the 8168
        netxen: reset ring consumer during cleanup
        net/bridge: use kobject_put to release kobject in br_add_if error path
        smc91x.h: add config for Nomadik evaluation kit
        NET: ROSE: Don't use static buffer.
        eepro: Read buffer overflow
        tokenring: Read buffer overflow
        at1700: Read buffer overflow
        fealnx: Write outside array bounds
        ixgbe: remove unnecessary call to device_init_wakeup
        ixgbe: Don't priority tag control frames in DCB mode
        ixgbe: Enable FCoE offload when DCB is enabled for 82599
        net: Rework mdio-ofgpio driver to use of_mdio infrastructure
        register at91_ether using platform_driver_probe
        skge: Enable WoL by default if supported
        net: KS8851 needs to depend on MII
        be2net: Bug fix in the non-lro path. Size of received packet was not updated in statistics properly.
        ...
      f1462147
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · e00b95de
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        amd64_edac: read the right F2 maskoffset reg
      e00b95de
    • Alan Cox's avatar
      tty: Fix a USB serial crash/scribble · b68f2fb9
      Alan Cox authored
      The port lock is used to protect the port state. However the port structure
      is freed on a hangup, then the lock taken on a close. The right fix is to
      drop the port on tty->shutdown() but we can't yet do that due to sleep v
      non-sleeping rules. Instead do the next best thing and fix it up when we are
      not in -rc season.
      Reported-by: default avatarDaniel Mack <daniel@caiaq.de>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      Tested-by: default avatarDaniel Mack <daniel@caiaq.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b68f2fb9
    • Linus Torvalds's avatar
      Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze · 6a31d4ae
      Linus Torvalds authored
      * 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Makefile cleanup
        microblaze: Typo fix for cpu param inconsistency
        microblaze: Add support for R_MICROBLAZE_64_NONE
        microblaze: Get module loading working
        microblaze: remove sys_ipc
        microblaze: Support unaligned address for put/get_user macros
        microblaze: Detect new Microblaze 7.20 versions
        microblaze: Fix do_page_fault for no context
        microblaze: Add _PAGE_FILE macros to pgtable.h
        microblaze: Fix put_user macro for 64bits arguments
        microblaze: Clear print messages for DTB passing via r7
        microblaze: Not to clear r7 after copying DTB to kernel
        microblaze: Add messages about FDT blob
        microblaze: Final support for statically linked DTB
        microblaze: remove duplicated #include
        microblaze: Define tlb_flush macro
      6a31d4ae
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · ca597a02
      Linus Torvalds authored
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: geode: Mark mfgpt irq IRQF_TIMER to prevent resume failure
        x86, amd: Don't probe for extended APIC ID if APICs are disabled
        x86, mce: Rename incorrect macro name "CONFIG_X86_THRESHOLD"
        x86-64: Fix bad_srat() to clear all state
        x86, mce: Fix set_trigger() accessor
        x86: Fix movq immediate operand constraints in uaccess.h
        x86: Fix movq immediate operand constraints in uaccess_64.h
        x86: Add reboot fixup for SBC-fitPC2
        x86: Include all of .data.* sections in _edata on 64-bit
        x86: Add quirk for Intel DG45ID board to avoid low memory corruption
      ca597a02
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · b54c3835
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: hda - Fix mute control with some ALC262 models
        ALSA: snd_usb_caiaq: add support for Audio2DJ
        ALSA: pcm - Fix hwptr buffer-size overlap bug
        ALSA: pcm - Fix warnings in debug loggings
        ALSA: pcm - Add logging of hwptr updates and interrupt updates
        ASoC: tlv320aic3x: Enable PLL when not bypassed
        ALSA: hda - Restore GPIO1 properly at resume with AD1984A
        ALSA: ctxfi - Fix uninitialized error checks
        ALSA: hda - Use snprintf() to be safer
        ALSA: usb-audio - Volume control quirk for QuickCam E 3500
        ALSA: pcm - Fix regressions with VMware
      b54c3835
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 04fc0a40
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (34 commits)
        V4L/DVB (12303): cx23885: check pointers before dereferencing in dprintk macro
        V4L/DVB (12302): cx23885-417: fix broken IOCTL handling
        V4L/DVB (12300): bttv: fix regression: tvaudio must be loaded before tuner
        V4L/DVB (12291): b2c2: fix frontends compiled into kernel
        V4L/DVB (12286): sn9c20x: reorder includes to be like other drivers
        V4L/DVB (12284): gspca - jpeg subdrivers: Check the result of kmalloc(jpeg header).
        V4L/DVB (12283): gspca - sn9c20x: New subdriver for sn9c201 and sn9c202 bridges.
        V4L/DVB (12282): gspca - main: Support for vidioc_g_chip_ident and vidioc_g/s_register.
        V4L/DVB (12269): af9013: auto-detect parameters in case of garbage given by app
        V4L/DVB (12267): gspca - sonixj: Bad sensor init of non ov76xx sensors.
        V4L/DVB (12265): em28xx: fix tuning problem in HVR-900 (R1)
        V4L/DVB (12263): em28xx: set demod profile for Pinnacle Hybrid Pro 320e
        V4L/DVB (12262): em28xx: Make sure the tuner is initialized if generic empia USB id was used
        V4L/DVB (12261): em28xx: set GPIO properly for Pinnacle Hybrid Pro analog support
        V4L/DVB (12260): em28xx: make support work for the Pinnacle Hybrid Pro (eb1a:2881)
        V4L/DVB (12258): em28xx: fix typo in mt352 init sequence for Terratec Cinergy T XS USB
        V4L/DVB (12257): em28xx: make tuning work for Terratec Cinergy T XS USB (mt352 variant)
        V4L/DVB (12245): em28xx: add support for mt9m001 webcams
        V4L/DVB (12244): em28xx: adjust vinmode/vinctl based on the stream input format
        V4L/DVB (12243): em28xx: allow specifying sensor xtal frequency
        ...
      04fc0a40