1. 13 11月, 2010 18 次提交
    • L
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 80ef913f
      Linus Torvalds 提交于
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        drivers/ata/pata_octeon_cf.c: delete double assignment
        pata_legacy: fix CONFIG_PATA_WINBOND_VLB_MODULE test
        libata: fix NULL sdev dereference race in atapi_qc_complete()
      80ef913f
    • L
      Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 1c32ca9f
      Linus Torvalds 提交于
      * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (38 commits)
        Revert "staging: tidspbridge: replace iommu custom for opensource implementation"
        Revert "staging: tidspbridge - move shared memory iommu maps to tiomap3430.c"
        Revert "staging: tidspbridge - rename bridge_brd_mem_map/unmap to a proper name"
        Revert "staging: tidspbridge - remove custom mmu code from tiomap3430.c"
        Revert "staging: tidspbridge - fix mmufault support"
        Revert "staging: tidspbridge - remove hw directory"
        Revert "staging: tidspbridge - move all iommu related code to a new file"
        Revert "staging: tidspbridge: remove dw_dmmu_base from cfg_hostres struct"
        Revert "staging: tidspbridge - remove reserved memory clean up"
        Revert "staging: tidspbridge - deprecate reserve/unreserve_memory funtions"
        Revert "staging: tidspbridge - remove dmm custom module"
        Revert "staging: tidspbridge - update Kconfig to select IOMMU module"
        staging: tidspbridge: hardcode SCM macros while fix is upstreamed
        Staging: keucr driver: fix uninitialized variable & proper memset length
        omap: dsp: remove shm from normal memory
        Staging: wlan-ng: Fix wrong #ifdef #endif sequence
        Staging: Update parameters for cfg80211 key management operation
        Staging: ath6kl: Fix pointer casts on 64-bit architectures
        Staging: batman-adv: suppress false warning when changing the mac address
        Staging: batman-adv: fix interface alternating and bonding reggression
        ...
      1c32ca9f
    • L
      Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 00dad7fa
      Linus Torvalds 提交于
      * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (28 commits)
        Revert "USB: xhci: Use GFP_ATOMIC under spin_lock"
        USB: ohci-jz4740: Fix spelling in MODULE_ALIAS
        UWB: Return UWB_RSV_ALLOC_NOT_FOUND rather than crashing on NULL dereference if kzalloc fails
        usb: core: fix information leak to userland
        usb: misc: iowarrior: fix information leak to userland
        usb: misc: sisusbvga: fix information leak to userland
        usb: subtle increased memory usage in u_serial
        USB: option: fix when the driver is loaded incorrectly for some Huawei devices.
        USB: xhci: Use GFP_ATOMIC under spin_lock
        usb: gadget: goku_udc: add registered flag bit, fixing build
        USB: ehci/mxc: compile fix
        USB: Fix FSL USB driver on non Open Firmware systems
        USB: the development of the usb tree is now in git
        usb: musb: fail unaligned DMA transfers on v1.8 and above
        USB: ftdi_sio: add device IDs for Milkymist One JTAG/serial
        usb.h: fix ioctl kernel-doc info
        usb: musb: gadget: kill duplicate code in musb_gadget_queue()
        usb: musb: Fix handling of spurious SESSREQ
        usb: musb: fix kernel oops when loading musb_hdrc module for the 2nd time
        USB: musb: blackfin: push clkin value to platform resources
        ...
      00dad7fa
    • L
      Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · edaa4d66
      Linus Torvalds 提交于
      * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
        n_gsm: Fix length handling
        n_gsm: Copy n2 over when configuring via ioctl interface
        serial: bfin_5xx: grab port lock before making port termios changes
        serial: bfin_5xx: disable CON_PRINTBUFFER for consoles
        serial: bfin_5xx: remove redundant SSYNC to improve TX speed
        serial: bfin_5xx: always include DMA headers
        vcs: make proper usage of the poll flags
        amiserial: Remove unused variable icount
        8250: Fix tcsetattr to avoid ioctl(TIOCMIWAIT) hang
        tty_ldisc: Fix BUG() on hangup
        TTY: restore tty_ldisc_wait_idle
        SERIAL: blacklist si3052 chip
        drivers/serial/bfin_5xx.c: Fix line continuation defects
        tty: prevent DOS in the flush_to_ldisc
        8250: add support for Kouwell KW-L221N-2
        nozomi: Fix warning from the previous TIOCGCOUNT changes
        tty: fix warning in synclink driver
        tty: Fix formatting in tty.h
        tty: the development tree is now done in git
      edaa4d66
    • L
      Merge branch 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen · 891cbd30
      Linus Torvalds 提交于
      * 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
        xen: do not release any memory under 1M in domain 0
        xen: events: do not unmask event channels on resume
        xen: correct size of level2_kernel_pgt
      891cbd30
    • L
      Merge branch 'stable/xen-pcifront-fixes' of... · b5c55104
      Linus Torvalds 提交于
      Merge branch 'stable/xen-pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/xen-pcifront-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        MAINTAINERS: Mark XEN lists as moderated
        xen-pcifront: fix PCI reference leak
        xen-pcifront: Remove duplicate inclusion of headers.
        xen: fix memory leak in Xen PCI MSI/MSI-X allocator.
        MAINTAINERS: Update mailing list name for Xen pieces.
      b5c55104
    • J
      drivers/ata/pata_octeon_cf.c: delete double assignment · f2543790
      Julia Lawall 提交于
      Delete successive assignments to the same location.
      
      A simplified version of the semantic match that finds this problem is as
      follows: (http://coccinelle.lip6.fr/)
      
      // <smpl>
      @@
      expression i;
      @@
      
      *i = ...;
       i = ...;
      // </smpl>
      Signed-off-by: NJulia Lawall <julia@diku.dk>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      f2543790
    • T
      pata_legacy: fix CONFIG_PATA_WINBOND_VLB_MODULE test · f60215a1
      Tejun Heo 提交于
      pata_legacy is incorrectly testing PATA_WINBOND_VLB_MODULE instead of
      CONFIG_PATA_WINBOND_VLB_MODULE.  Fix it.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Reported-by: N"Robert P. J. Day" <rpjday@crashcourse.ca>
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      f60215a1
    • T
      libata: fix NULL sdev dereference race in atapi_qc_complete() · 2a5f07b5
      Tejun Heo 提交于
      SCSI commands may be issued between __scsi_add_device() and dev->sdev
      assignment, so it's unsafe for ata_qc_complete() to dereference
      dev->sdev->locked without checking whether it's NULL or not.  Fix it.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Cc: stable@kernel.org
      Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
      2a5f07b5
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · a0a6da1a
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        ARM: GIC: don't disable software generated interrupts
        ARM: 6472/1: vexpress ct-ca9x4: only set twd_base if local timers are being used
        ARM: arch/arm/kernel/traps.c: Convert sprintf_symbol to %pS
        ARM: arch/arm/kernel/hw_breakpoint.c: Convert WARN_ON to WARN
        ARM: 6462/1: EP93xx: Document DMA M2P API
        ARM: 6470/1: atomic64: use generic implementation for OABI configurations
        ARM: 6469/1: perf-events: squash compiler warning
        ARM: 6468/1: backtrace: fix calculation of thread stack base
        ARM: Fix DMA coherent allocator alignment
        ARM: orion5x/kirkwood/mv78xx0: fix MPP configuration corner cases
        [ARM] TS-78xxx NAND resource type should be IORESOURCE_MEM
        ARM: pxa/saar: fix the building failure caused by typo
        ARM: pxa/cm-x2xx: remove duplicate call to pxa27x_init_irq
        ARM: pxa: fix the missing definition of IRQ_BOARD_END
        ARM: mmp: fix cpuid detection on mmp2
        [ARM] Kirkwood: restrict the scope of the PCIe reset workaround
        [ARM] Kirkwood: fix timer initialization for LaCie boards
        [ARM] Kirkwood: enhance TCLK detection
      a0a6da1a
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 7803c054
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: do not pass injected events back to the originating handler
        Input: pcf8574_keypad - fix error handling in pcf8574_kp_probe
        Input: acecad - fix a memory leak in usb_acecad_probe error path
        Input: atkbd - add 'terminal' parameter for IBM Terminal keyboards
        Input: i8042 - add Sony VAIOs to MUX blacklist
        kgdboc: reset input devices (keyboards) when exiting debugger
        Input: export input_reset_device() for use in KGDB
        Input: adp5588-keys - unify common header defines
      7803c054
    • L
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging · 522a9914
      Linus Torvalds 提交于
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
        hwmon: (gpio-fan) Fix fan_ctrl_init error path
        hwmon: (ad7414) Return proper error code for ad7414_probe()
        hwmon: (adt7470) Return proper error code for adt7470_probe()
      522a9914
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 8a9f772c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block: (27 commits)
        block: remove unused copy_io_context()
        Documentation: remove anticipatory scheduler info
        block: remove REQ_HARDBARRIER
        ioprio: rcu_read_lock/unlock protect find_task_by_vpid call (V2)
        ioprio: fix RCU locking around task dereference
        block: ioctl: fix information leak to userland
        block: read i_size with i_size_read()
        cciss: fix proc warning on attempt to remove non-existant directory
        bio: take care not overflow page count when mapping/copying user data
        block: limit vec count in bio_kmalloc() and bio_alloc_map_data()
        block: take care not to overflow when calculating total iov length
        block: check for proper length of iov entries in blk_rq_map_user_iov()
        cciss: remove controllers supported by hpsa
        cciss: use usleep_range not msleep for small sleeps
        cciss: limit commands allocated on reset_devices
        cciss: Use kernel provided PCI state save and restore functions
        cciss: fix board status waiting code
        drbd: Removed checks for REQ_HARDBARRIER on incomming BIOs
        drbd: REQ_HARDBARRIER -> REQ_FUA transition for meta data accesses
        drbd: Removed the BIO_RW_BARRIER support form the receiver/epoch code
        ...
      8a9f772c
    • L
      Merge branch 'x86-fixes-for-linus' of... · 25a34554
      Linus Torvalds 提交于
      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, pvclock: Remove leftover scale_delta() function
        x86, apic: Remove double #include
        x86: Adjust section annotations in AMD Fam10 MMCONF enabling code
        x86, UV: Update node controller MMRs
        x86: Remove unnecessary casts of void ptr returning alloc function return values
        x86: Address gcc4.6 "set but not used" warnings in apic.h
        x86, mm: Fix section mismatch in tlb.c
      25a34554
    • L
      Merge branch 'perf-fixes-for-linus' of... · 28397bab
      Linus Torvalds 提交于
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf, amd: Use kmalloc_node(,__GFP_ZERO) for northbridge structure allocation
        perf_events: Fix time tracking in samples
        perf trace: update usage
        perf trace: update Documentation with new perf trace variants
        perf trace: live-mode command-line cleanup
        perf trace record: handle commands correctly
        perf record: make the record options available outside perf record
        perf trace scripting: remove system-wide param from shell scripts
        perf trace scripting: fix some small memory leaks and missing error checks
        perf: Fix usages of profile_cpu in builtin-top.c to use cpu_list
        perf, ui: Eliminate stack-smashing protection compiler complaint
      28397bab
    • L
      Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 99efb936
      Linus Torvalds 提交于
      * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (39 commits)
        drm/ttm: Be consistent on ttm_bo_init() failures
        drm/radeon/kms: Fix retrying ttm_bo_init() after it failed once.
        drm/radeon/kms: fix thermal sensor reporting on rv6xx
        drm/radeon/kms: fix bugs in ddc and cd path router code
        drm/radeon/kms: add support for clock/data path routers
        drm: vmwgfx: fix information leak to userland
        drivers/gpu: Use vzalloc
        drm/vmwgfx: Fix oops on failing bo pin
        drm/ttm: Remove the CAP_SYS_ADMIN requirement for bo pinning
        drm/ttm: Make sure a sync object doesn't disappear while we use it
        drm/radeon/kms: don't disable shared encoders on pre-DCE3 display blocks
        drivers/gpu/drm: Update WARN uses
        drivers/gpu/drm/vmwgfx: Fix k.alloc switched arguments
        DRM: ignore invalid EDID extensions
        drm/radeon/kms: make the connector code less verbose
        drm/ttm: remove failed ttm binding error printout
        drm/ttm: Add a barrier when unreserving
        drm/ttm: Remove mm init error printouts and checks
        drm/ttm: Remove pointless list_empty check
        drm/ttm: Use private locks for the default bo range manager
        ...
      99efb936
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · fb1cb7b2
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: remove incorrect assert in xfs_vm_writepage
        xfs: use hlist_add_fake
        xfs: fix a few compiler warnings with CONFIG_XFS_QUOTA=n
        xfs: tell lockdep about parent iolock usage in filestreams
        xfs: move delayed write buffer trace
        xfs: fix per-ag reference counting in inode reclaim tree walking
        xfs: xfs_ioctl: fix information leak to userland
        xfs: remove experimental tag from the delaylog option
      fb1cb7b2
    • L
      Merge branch 'for-linus' of... · fe7e96f6
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
        APPARMOR: Fix memory leak of apparmor_init()
        APPARMOR: Fix memory leak of alloc_namespace()
      fe7e96f6
  2. 12 11月, 2010 22 次提交