1. 12 10月, 2009 12 次提交
    • F
      kbuild: fix warning when domainname is not available · 9c3049c0
      Felipe Contreras 提交于
      Otherwise we get:
      "dnsdomainname: Unknown host"
      Signed-off-by: NFelipe Contreras <felipe.contreras@gmail.com>
      Acked-by: NWANG Cong <xiyou.wangcong@gmail.com>
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      9c3049c0
    • A
      kbuild: Fix size_append issue for bzip2/lzma kernel · 58242b2b
      Alek Du 提交于
      The Makefile.lib will call "echo -ne" to append uncompressed kernel size to
      bzip2/lzma kernel image.
      The "echo" here depends on the shell that /bin/sh pointing to.
      On Ubuntu system, the /bin/sh is pointing to dash, which does not support
      "echo -e" at all. Use /bin/echo instead of shell echo should always be safe.
      Signed-off-by: NAlek Du <alek.du@intel.com>
      Acked-by: NWANG Cong <xiyou.wangcong@gmail.com>
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      58242b2b
    • A
      kbuild,scripts: use non-builtin echo for '-e' · a3ee9470
      Amerigo Wang 提交于
      Alek reported that on Ubuntu, where dash is used, 'echo -e'
      can't work, so let's use non-builtin echo in this case.
      Reported-by: NAlek Du <alek.du@intel.com>
      Signed-off-by: NWANG Cong <xiyou.wangcong@gmail.com>
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      a3ee9470
    • F
      kbuild: fix the binrpm-pkg target to work with KBUILD_OUTPUT set · db9038c8
      Frans Pop 提交于
      The binrpm-pkg target (binary RPM only) fails when called with
      KBUILD_OUTPUT set. This patch makes it work.
      
      For the rpm-pkg target (source + binary RPM), building with
      KBUILD_OUTPUT set is not possible and also not needed as the
      actual build is done in a temporary directory anyway, so check
      that KBUILD_OUTPUT is not set in that case to avoid later errors.
      Signed-off-by: NFrans Pop <elendil@planet.nl>
      Signed-off-by: NSam Ravnborg <sam@ravnborg.org>
      db9038c8
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · f144c78e
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (21 commits)
        [S390] dasd: fix race condition in resume code
        [S390] Add EX_TABLE for addressing exception in usercopy functions.
        [S390] 64-bit register support for 31-bit processes
        [S390] hibernate: Use correct place for CPU address in lowcore
        [S390] pm: ignore time spend in suspended state
        [S390] zcrypt: Improve some comments
        [S390] zcrypt: Fix sparse warning.
        [S390] perf_counter: fix vdso detection
        [S390] ftrace: drop nmi protection
        [S390] compat: fix truncate system call wrapper
        [S390] Provide arch specific mdelay implementation.
        [S390] Fix enabled udelay for short delays.
        [S390] cio: allow setting boxed devices offline
        [S390] cio: make not operational handling consistent
        [S390] cio: make disconnected handling consistent
        [S390] Fix memory leak in /proc/cio_ignore
        [S390] cio: channel path memory leak
        [S390] module: fix memory leak in s390 module loader
        [S390] Enable kmemleak on s390.
        [S390] 3270 console build fix
        ...
      f144c78e
    • B
      ROMFS: fix length used with romfs_dev_strnlen() function · ef1f7a7e
      Bernd Schmidt 提交于
      An interestingly corrupted romfs file system exposed a problem with the
      romfs_dev_strnlen function: it's passing the wrong value to its helpers.
      Rather than limit the string to the length passed in by the callers, it
      uses the size of the device as the limit.
      Signed-off-by: NBernd Schmidt <bernds_cb1@t-online.de>
      Signed-off-by: NMike Frysinger <vapier@gentoo.org>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ef1f7a7e
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · c6c59927
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (32 commits)
        USB: serial: no unnecessary GFP_ATOMIC in oti6858
        USB: serial: fix race between unthrottle and completion handler in visor
        USB: serial: fix assumption that throttle/unthrottle cannot sleep
        USB: serial: fix race between unthrottle and completion handler in symbolserial
        USB: serial: fix race between unthrottle and completion handler in opticon
        USB: ehci: Fix isoc scheduling boundary checking.
        USB: storage: When a device returns no sense data, call it a Hardware Error
        USB: small fix in error case of suspend in generic usbserial code
        USB: visor: fix trivial accounting bug in visor driver
        USB: Fix throttling in generic usbserial driver
        USB: cp210x: Add support for the DW700 UART
        USB: ipaq: fix oops when device is plugged in
        USB: isp1362: fix build warnings on 64-bit systems
        USB: gadget: imx_udc: Use resource size
        USB: storage: iRiver P7 UNUSUAL_DEV patch
        USB: musb: make HAVE_CLK support optional
        USB: xhci: Fix dropping endpoints from the xHC schedule.
        USB: xhci: Don't wait for a disable slot cmd when HC dies.
        USB: xhci: Handle canceled URBs when HC dies.
        USB: xhci: Stop debugging polling loop when HC dies.
        ...
      c6c59927
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · ff945afb
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
        Staging: comedi: fix build on arches that don't want comedi drivers
        Staging: comedi: pcmcia irq fixes
        Staging: comedi: ni_pcimio: Added device id for pxi-6225.
        Staging: comedi: ni_65xx.c: fix output inversion problem.
        Staging: comedi: ni_65xx.c: fix insn_bits shift calculation.
        Staging: comedi: s526: fixes for pulse generator
        Staging: comedi: s526: Take account of arch's byte order.
        Staging: comedi: s526: Get rid of global variable 'cmReg'.
        Staging: comedi: s526: Fix number of channels on DIO subdevice
        Staging: comedi: cb_pcidio: fix "section mismatch" error
        Staging: comedi: jr3_pci: Initialize transf variable fully in jr3_pci_poll_subdevice().
        Staging: comedi: Corrected type of a printk argument in resize_async_buffer().
        Staging: p9auth: a few fixes
        Staging: rtl8192e: Add #include <linux/vmalloc.h>
        Staging: iio: Don't build on s390
        Staging: winbond: implement prepare_multicast and fix API usage
        Staging: w35und: Fix ->beacon_int breakage
        Staging: remove cowloop driver
        Staging: remove agnx driver
        Staging: comedi: serial2002: fix include build issue
      ff945afb
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 4c274fff
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (s3c-hwmon) Disable build for S3C64xx
        MAINTAINERS: Fix Riku Voipio's address
        hwmon: (asus_atk0110) Enable the EC
        hwmon: (asus_atk0110) Refactor the code
        hwmon: (sht15) Fix spurious section mismatch warning
      4c274fff
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · 474a503d
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
        Btrfs: fix file clone ioctl for bookend extents
        Btrfs: fix uninit compiler warning in cow_file_range_nocow
        Btrfs: constify dentry_operations
        Btrfs: optimize back reference update during btrfs_drop_snapshot
        Btrfs: remove negative dentry when deleting subvolumne
        Btrfs: optimize fsync for the single writer case
        Btrfs: async delalloc flushing under space pressure
        Btrfs: release delalloc reservations on extent item insertion
        Btrfs: delay clearing EXTENT_DELALLOC for compressed extents
        Btrfs: cleanup extent_clear_unlock_delalloc flags
        Btrfs: fix possible softlockup in the allocator
        Btrfs: fix deadlock on async thread startup
      474a503d
    • A
      headers: remove sched.h from interrupt.h · d43c36dc
      Alexey Dobriyan 提交于
      After m68k's task_thread_info() doesn't refer to current,
      it's possible to remove sched.h from interrupt.h and not break m68k!
      Many thanks to Heiko Carstens for allowing this.
      Signed-off-by: NAlexey Dobriyan <adobriyan@gmail.com>
      d43c36dc
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · 69585dd6
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (34 commits)
        [SCSI] qla2xxx: Fix NULL ptr deref bug in fail path during queue create
        [SCSI] st: fix possible memory use after free after MTSETBLK ioctl
        [SCSI] be2iscsi: Moving to pci_pools v3
        [SCSI] libiscsi: iscsi_session_setup to allow for private space
        [SCSI] be2iscsi: add 10Gbps iSCSI - BladeEngine 2 driver
        [SCSI] zfcp: Fix hang when offlining device with offline chpid
        [SCSI] zfcp: Fix lockdep warning when offlining device with offline chpid
        [SCSI] zfcp: Fix oops during shutdown of offline device
        [SCSI] zfcp: Fix initial device and cfdc for delayed adapter allocation
        [SCSI] zfcp: correctly initialize unchained requests
        [SCSI] mpt2sas: Bump version 02.100.03.00
        [SCSI] mpt2sas: Support dev remove when phy status is MPI2_EVENT_SAS_TOPO_PHYSTATUS_VACANT
        [SCSI] mpt2sas: Timeout occurred within the HANDSHAKE logic while waiting on firmware to ACK.
        [SCSI] mpt2sas: Call init_completion on a per request basis.
        [SCSI] mpt2sas: Target Reset will be issued from Interrupt context.
        [SCSI] mpt2sas: Added SCSIIO, Internal and high priority memory pools to support multiple TM
        [SCSI] mpt2sas: Copyright change to 2009.
        [SCSI] mpt2sas: Added mpi2_history.txt for MPI2 headers.
        [SCSI] mpt2sas: Update driver to MPI2 REV K headers.
        [SCSI] bfa: Brocade BFA FC SCSI driver
        ...
      69585dd6
  2. 10 10月, 2009 28 次提交