1. 13 Jun, 2009 5 commits
    • Randy Dunlap's avatar
      [SCSI] cnic: fix undefined reference to `ip6_route_output' · faea56c9
      Randy Dunlap authored
      Fix cnic build for case of CONFIG_INET=n.
      Fix cnic build for case of CONFIG_IPV6=m and CONFIG_CNIC=y.
      
      Fixes these build errors:
      
      cnic.c:(.text+0x236a1d): undefined reference to `ip_route_output_key'
      cnic.c:(.text+0x15a8e8): undefined reference to `ip6_route_output'
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
      faea56c9
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs · f3ad1165
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs:
        configfs: Rework configfs_depend_item() locking and make lockdep happy
        configfs: Silence lockdep on mkdir() and rmdir()
      f3ad1165
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · d645727b
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (30 commits)
        [S390] wire up sys_perf_counter_open
        [S390] wire up sys_rt_tgsigqueueinfo
        [S390] ftrace: add system call tracer support
        [S390] ftrace: add function graph tracer support
        [S390] ftrace: add function trace mcount test support
        [S390] ftrace: add dynamic ftrace support
        [S390] kprobes: use probe_kernel_write
        [S390] maccess: arch specific probe_kernel_write() implementation
        [S390] maccess: add weak attribute to probe_kernel_write
        [S390] profile_tick called twice
        [S390] dasd: forward internal errors to dasd_sleep_on caller
        [S390] dasd: sync after async probe
        [S390] dasd: check_characteristics cleanup
        [S390] dasd: no High Performance FICON in 31-bit mode
        [S390] dcssblk: revert devt conversion
        [S390] qdio: fix access beyond ARRAY_SIZE of irq_ptr->{in,out}put_qs
        [S390] vmalloc: add vmalloc kernel parameter support
        [S390] uaccess: use might_fault() instead of might_sleep()
        [S390] 3270: lock dependency fixes
        [S390] 3270: do not register with tty_register_device
        ...
      d645727b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · cd166bd0
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        add generic lib/checksum.c
        asm-generic: add a generic uaccess.h
        asm-generic: add generic NOMMU versions of some headers
        asm-generic: add generic atomic.h and io.h
        asm-generic: add legacy I/O header files
        asm-generic: add generic versions of common headers
        asm-generic: make bitops.h usable
        asm-generic: make pci.h usable directly
        asm-generic: make get_rtc_time overridable
        asm-generic: rename page.h and uaccess.h
        asm-generic: rename atomic.h to atomic-long.h
        asm-generic: add a generic unistd.h
        asm-generic: add generic ABI headers
        asm-generic: add generic sysv ipc headers
        asm-generic: introduce asm/bitsperlong.h
        asm-generic: rename termios.h, signal.h and mman.h
      cd166bd0
    • Linus Torvalds's avatar
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 6b702462
      Linus Torvalds authored
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (50 commits)
        drm: include kernel list header file in hashtab header
        drm: Export hash table functionality.
        drm: Split out the mm declarations in a separate header. Add atomic operations.
        drm/radeon: add support for RV790.
        drm/radeon: add rv740 drm support.
        drm_calloc_large: check right size, check integer overflow, use GFP_ZERO
        drm: Eliminate magic I2C frobbing when reading EDID
        drm/i915: duplicate desired mode for use by fbcon.
        drm/via: vfree() no need checking before calling it
        drm: Replace DRM_DEBUG with DRM_DEBUG_DRIVER in i915 driver
        drm: Replace DRM_DEBUG with DRM_DEBUG_MODE in drm_mode
        drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS in intel_sdvo
        drm/i915: replace DRM_DEBUG with DRM_DEBUG_KMS in intel_lvds
        drm: add separate drm debugging levels
        radeon: remove _DRM_DRIVER from the preadded sarea map
        drm: don't associate _DRM_DRIVER maps with a master
        drm: simplify kcalloc() call to kzalloc().
        intelfb: fix spelling of "CLOCK"
        drm: fix LOCK_TEST_WITH_RETURN macro
        drm/i915: Hook connector to encoder during load detection (fixes tv/vga detect)
        ...
      6b702462
  2. 12 Jun, 2009 35 commits