1. 19 1月, 2010 4 次提交
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 8888be69
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: Move cpu hotplug driver lock from pseries to powerpc
        powerpc: Move /proc/ppc64 to /proc/powerpc update
        powerpc/8xx: Fix user space TLB walk in dcbX fixup
        powerpc: Fix decrementer setup on 1GHz boards
        powerpc/iseries: Initialise on-stack completion
        powerpc/hvc: Driver build breaks with !HVC_CONSOLE
        serial/pmac_zilog: Workaround problem due to interrupt on closed port
        powerpc/macintosh: Make Open Firmware device id constant
        powerpc: Use helpers for rlimits
        powerpc: cpumask_of_node() should handle -1 as a node
        powerpc/pseries: Fix dlpar compile warning without CONFIG_PROC_DEVICETREE
        powerpc/pseries: Fix xics interrupt affinity
        powerpc/swsusp_32: Fix TLB invalidation
        powerpc/8xx: Always pin kernel instruction TLB
        powerpc: 2.6.33 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx
        powerpc: Use scripts/mkuboot.sh instead of 'mkimage'
        powerpc/5200: update defconfigs
      8888be69
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 1e868d8e
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: xfs_swap_extents needs to handle dynamic fork offsets
        xfs: fix missing error check in xfs_rtfree_range
        xfs: fix stale inode flush avoidance
        xfs: Remove inode iolock held check during allocation
        xfs: reclaim all inodes by background tree walks
        xfs: Avoid inodes in reclaim when flushing from inode cache
        xfs: reclaim inodes under a write lock
      1e868d8e
    • L
      Merge branch 'mantis' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 2faae422
      Linus Torvalds 提交于
      * 'mantis' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (117 commits)
        V4L/DVB (13851): Fix Input dependency for Mantis
        V4L/DVB(13824a): mantis: Fix __devexit bad annotations
        V4L/DVB (13808b): mantis: replace DMA_nnBIT_MASK to DMA_BIT_MASK(32)
        V4L/DVB (13808): [Mantis/Hopper] Build update for Mantis/Hopper based cards
        V4L/DVB(13808a): mantis: convert it to the new ir-core register/unregister functions
        V4L/DVB (13812): [Mantis/Hopper] Update Copyright header
        V4L/DVB (13811): [MB86A16] Update Copyright header
        V4L/DVB (13810): [MB86A16] Use DVB_* macros
        V4L/DVB (13809): Fix Checkpatch violations
        V4L/DVB (13807): Fix: Free device in the device registration failure case
        V4L/DVB (13806): Register and Initialize Remote control
        V4L/DVB (13805): Fix: Unregister the frontend before detaching
        V4L/DVB (13804): Remove unused I2C Adapter ID
        V4L/DVB (13803): Remove unused dependency on CU1216
        V4L/DVB (13802): [Mantis/Hopper] Fix all build related warnings
        V4L/DVB (13801): [MB86A16] Use the search callback
        V4L/DVB (13800): [Mantis] I2C optimization. Required delay is much lesser than 1mS.
        V4L/DVB (13799): [Mantis] Unregister frontend
        V4L/DVB (13798): [Mantis] Enable power for all cards, use byte mode only on relevant devices
        V4L/DVB (13797): [Mantis/Hopper/TDA665x] Large overhaul,
        ...
      2faae422
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 630ca048
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (23 commits)
        V4L/DVB (13966): DVB-T regression fix for saa7134 cards
        V4L/DVB (13955): cx25821: fix double unlock in medusa_video_init()
        MAINTAINERS: ivtv-devel is moderated
        MAINTAINERS: Andy Walls is the new ivtv maintainer
        V4L/DVB (13941): rj54n1cb0c: remove compiler warning
        V4L/DVB sh_mobile_ceu: don't check platform_get_irq's return value against zero
        V4L/DVB mx1_camera: don't check platform_get_irq's return value against zero
        V4L/DVB (13934): tda8290: Fix FM radio easy programming standard selection for TDA8295
        V4L/DVB (13900): gspca - sunplus: Fix bridge exchanges.
        V4L/DVB (13887): tda8290: add autodetection support for TDA8295c2
        V4L/DVB (13882): gspca - stv06xx-vv6410: Ensure register STV_SCAN_RATE is zero
        V4L/DVB (13880): gspca - m5602-s5k4aa: Add vflip quirk for the Amilo Xi 2428
        V4L/DVB (13875): gspca - vc032x: Fix a possible crash with the vc0321 bridge.
        V4L/DVB (13868): gspca - sn9c20x: Fix test of unsigned.
        V4L/DVB (13858): ir-keytable: use the right header
        feature-removal-schedule: Add v4l1 drivers obsoleted by gspca sub drivers
        V4L/DVB (13622): gspca - ov534: Fix a compilation warning.
        V4L/DVB (13834): dib8000: fix compilation if !DVB_DIB8000
        V4L/DVB (13831): uvcvideo: Fix oops caused by a race condition in buffer dequeuing
        V4L/DVB (13829): uvcvideo: Fix alternate setting selection in isochronous mode
        ...
      630ca048
  2. 18 1月, 2010 2 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 7dc9c484
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
        do_add_mount() should sanitize mnt_flags
        CIFS shouldn't make mountpoints shrinkable
        mnt_flags fixes in do_remount()
        attach_recursive_mnt() needs to hold vfsmount_lock over set_mnt_shared()
        may_umount() needs namespace_sem
        Fix configfs leak
        Fix the -ESTALE handling in do_filp_open()
        ecryptfs: Fix refcnt leak on ecryptfs_follow_link() error path
        Fix ACC_MODE() for real
        Unrot uml mconsole a bit
        hppfs: handle ->put_link()
        Kill 9p readlink()
        fix autofs/afs/etc. magic mountpoint breakage
      7dc9c484
    • M
      modpost: fix segfault in sym_is() with prefixed arches · 3a5dd791
      Mike Frysinger 提交于
      The sym_is() compares a symbol in an attempt to automatically skip symbol
      prefixes.  It does this first by searching the real symbol with the normal
      unprefixed symbol.  But then it uses the length of the original symbol to
      check the end of the substring instead of the length of the symbol it is
      looking for.  On non-prefixed arches, this is effectively the same thing,
      so there is no problem.  On prefixed-arches, since this is exceeds by just
      one byte, a crash is rare and it is usually a NUL byte anyways.  But every
      once in a blue moon, you get the right page alignment and it segfaults.
      
      For example, on the Blackfin arch, sym_is() will be called with the real
      symbol "___mod_usb_device_table" as "symbol" when looking for the normal
      symbol "__mod_usb_device_table" as "name".  The substring will thus return
      one byte into "symbol" and store it into "match".  But then "match" will
      be indexed with the length of "symbol" instead of "name" and so we will
      exceed the storage.  i.e. the code ends up doing:
      	char foo[] = "abc"; return foo[strlen(foo)+1] == '\0';
      Signed-off-by: NMike Frysinger <vapier@gentoo.org>
      Signed-off-by: NRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3a5dd791
  3. 17 1月, 2010 34 次提交