1. 27 May, 2011 27 commits
  2. 26 May, 2011 13 commits
    • Serge E. Hallyn's avatar
      Set cred->user_ns in key_replace_session_keyring · f7285b5d
      Serge E. Hallyn authored
      Since this cred was not created with copy_creds(), it needs to get
      initialized.  Otherwise use of syscall(__NR_keyctl, KEYCTL_SESSION_TO_PARENT);
      can lead to a NULL deref.  Thanks to Robert for finding this.
      
      But introduced by commit 47a150ed ("Cache user_ns in struct cred").
      Signed-off-by: default avatarSerge E. Hallyn <serge.hallyn@canonical.com>
      Reported-by: default avatarRobert Święcki <robert@swiecki.net>
      Cc: David Howells <dhowells@redhat.com>
      Cc: stable@kernel.org (2.6.39)
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f7285b5d
    • Linus Torvalds's avatar
      Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · b7c2f036
      Linus Torvalds authored
      * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        gfs2: Drop __TIME__ usage
        isdn/diva: Drop __TIME__ usage
        atm: Drop __TIME__ usage
        dlm: Drop __TIME__ usage
        wan/pc300: Drop __TIME__ usage
        parport: Drop __TIME__ usage
        hdlcdrv: Drop __TIME__ usage
        baycom: Drop __TIME__ usage
        pmcraid: Drop __DATE__ usage
        edac: Drop __DATE__ usage
        rio: Drop __DATE__ usage
        scsi/wd33c93: Drop __TIME__ usage
        scsi/in2000: Drop __TIME__ usage
        aacraid: Drop __TIME__ usage
        media/cx231xx: Drop __TIME__ usage
        media/radio-maxiradio: Drop __TIME__ usage
        nozomi: Drop __TIME__ usage
        cyclades: Drop __TIME__ usage
      b7c2f036
    • Linus Torvalds's avatar
      Merge branch 'x86-vdso-for-linus' of... · 14587a2a
      Linus Torvalds authored
      Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: vdso: Remove unused variable
        x86-64: Optimize vDSO time()
        x86-64: Add time to vDSO
        x86-64: Turn off -pg and turn on -foptimize-sibling-calls for vDSO
        x86-64: Move vread_tsc into a new file with sensible options
        x86-64: Vclock_gettime(CLOCK_MONOTONIC) can't ever see nsec < 0
        x86-64: Don't generate cmov in vread_tsc
        x86-64: Remove unnecessary barrier in vread_tsc
        x86-64: Clean up vdso/kernel shared variables
      14587a2a
    • Linus Torvalds's avatar
      Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of... · fce637e3
      Linus Torvalds authored
      Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        seqlock: Get rid of SEQLOCK_UNLOCKED
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        irq: Remove smp_affinity_list when unregister irq proc
      fce637e3
    • Linus Torvalds's avatar
      Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 · 8b29336f
      Linus Torvalds authored
      * 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
        gpio/via: rename VIA local config struct
        basic_mmio_gpio: split into a gpio library and platform device
        gpio: remove some legacy comments in build files
        gpio: add trace events for setting direction and value
        gpio/pca953x: Use handle_simple_irq instead of handle_edge_irq
        gpiolib: export gpiochip_find
        gpio: remove redundant Kconfig depends on GPIOLIB
        basic_mmio_gpio: convert to non-__raw* accessors
        basic_mmio_gpio: support direction registers
        basic_mmio_gpio: support different input/output registers
        basic_mmio_gpio: detect output method at probe time
        basic_mmio_gpio: request register regions
        basic_mmio_gpio: allow overriding number of gpio
        basic_mmio_gpio: convert to platform_{get,set}_drvdata()
        basic_mmio_gpio: remove runtime width/endianness evaluation
      8b29336f
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 · 9f1912c4
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (57 commits)
        regulator: Fix 88pm8607.c printk format warning
        input: Add support for Qualcomm PMIC8XXX power key
        input: Add Qualcomm pm8xxx keypad controller driver
        mfd: Add omap-usbhs runtime PM support
        mfd: Fix ASIC3 SD Host Controller Configuration size
        mfd: Fix omap_usbhs_alloc_children error handling
        mfd: Fix omap usbhs crash when rmmoding ehci or ohci
        mfd: Add ASIC3 LED support
        leds: Add ASIC3 LED support
        mfd: Update twl4030-code maintainer e-mail address
        mfd: Correct the name and bitmask for ab8500-gpadc BTempPullUp
        mfd: Add manual ab8500-gpadc batt temp activation for AB8500 3.0
        mfd: Provide ab8500-core enumerators for chip cuts
        mfd: Check twl4030-power remove script error condition after i2cwrite
        mfd: Fix twl6030 irq definitions
        mfd: Add phoenix lite (twl6025) support to twl6030
        mfd: Avoid to use constraint name in 88pm860x regulator driver
        mfd: Remove checking on max8925 regulator[0]
        mfd: Remove unused parameter from 88pm860x API
        mfd: Avoid to allocate 88pm860x static platform data
        ...
      9f1912c4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 4c171acc
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        RDMA/cma: Save PID of ID's owner
        RDMA/cma: Add support for netlink statistics export
        RDMA/cma: Pass QP type into rdma_create_id()
        RDMA: Update exported headers list
        RDMA/cma: Export enum cma_state in <rdma/rdma_cm.h>
        RDMA/nes: Add a check for strict_strtoul()
        RDMA/cxgb3: Don't post zero-byte read if endpoint is going away
        RDMA/cxgb4: Use completion objects for event blocking
        IB/srp: Fix integer -> pointer cast warnings
        IB: Add devnode methods to cm_class and umad_class
        IB/mad: Return EPROTONOSUPPORT when an RDMA device lacks the QP required
        IB/uverbs: Add devnode method to set path/mode
        RDMA/ucma: Add .nodename/.mode to tell userspace where to create device node
        RDMA: Add netlink infrastructure
        RDMA: Add error handling to ib_core_init()
      4c171acc
    • Linus Torvalds's avatar
      Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 · 20e0ec11
      Linus Torvalds authored
      * 'spi/next' of git://git.secretlab.ca/git/linux-2.6:
        spi/amba-pl022: work in polling or interrupt mode if pl022_dma_probe fails
        spi/spi_s3c24xx: Use spi_bitbang_stop instead of spi_unregister_master in s3c24xx_spi_remove
        spi/spi_nuc900: Use spi_bitbang_stop instead of spi_unregister_master in nuc900_spi_remove
        spi/spi_tegra: use spi_unregister_master() instead of spi_master_put()
        spi/spi_sh: use spi_unregister_master instead of spi_master_put in remove path
        spi: Use void pointers for data in simple SPI I/O operations
        spi/pl022: use cpu_relax in the busy loop
        spi/pl022: mark driver non-experimental
        spi/pl022: timeout on polled transfer v2
        spi/dw_spi: improve the interrupt mode with the batch ops
        spi/dw_spi: change poll mode transfer from byte ops to batch ops
        spi/dw_spi: remove the un-necessary flush()
        spi/dw_spi: unify the low level read/write routines
      20e0ec11
    • Linus Torvalds's avatar
      Merge branch 'omap-for-linus' of... · 829ae273
      Linus Torvalds authored
      Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
      
      * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (33 commits)
        OMAP3: PM: Boot message is not an error, and not helpful, remove it
        OMAP3: cpuidle: change the power domains modes determination logic
        OMAP3: cpuidle: code rework for improved readability
        OMAP3: cpuidle: re-organize the C-states data
        OMAP3: clean-up mach specific cpuidle data structures
        OMAP3 cpuidle: remove useless SDP specific timings
        usb: otg: OMAP4430: Powerdown the internal PHY when USB is disabled
        usb: otg: OMAP4430: Fixing the omap4430_phy_init function
        usb: musb: am35x: fix compile error when building am35x
        usb: musb: OMAP4430: Power down the PHY during board init
        omap: drop board-igep0030.c
        omap: igep0020: add support for IGEP3
        omap: igep0020: minor refactoring
        omap: igep0020: name refactoring for future merge with IGEP3
        omap: Remove support for omap2evm
        arm: omap2plus: GPIO cleanup
        omap: musb: introduce default board config
        omap: move detection of NAND CS to common-board-devices
        omap: use common initialization for PMIC i2c bus
        omap: consolidate touch screen initialization among different boards
        ...
      829ae273
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 6ddb4518
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/4xx: Adding PCIe MSI support
        powerpc: Fix irq_free_virt by adjusting bounds before loop
        powerpc/irq: Protect irq_radix_revmap_lookup against irq_free_virt
        powerpc/irq: Check desc in handle_one_irq and expand generic_handle_irq
        powerpc/irq: Always free duplicate IRQ_LEGACY hosts
        powerpc/irq: Remove stale and misleading comment
        powerpc/cell: Rename ipi functions to match current abstractions
        powerpc/cell: Use common smp ipi actions
        Remove unused MSG_ flags in linux/smp.h
        powerpc/pseries: Update MAX_HCALL_OPCODE to reflect page coalescing
        powerpc/oprofile: Handle events that raise an exception without overflowing
        powerpc/ftrace: Implement raw syscall tracepoints on PowerPC
      6ddb4518
    • Linus Torvalds's avatar
      Fix build with !HUGETLBFS · be93d8cf
      Linus Torvalds authored
      I stupidly broke the case of CONFIG_HUGETLBFS=n when doing the
      conversion to vm_flags_t in commit ca16d140 ("mm: don't access
      vm_flags as 'int'").  And my 'allyesconfig' build didn't find it, for
      obvious reasons..
      
      Include <linux/mm_types.h> in <linux/hugetlb.h>.  The problem could have
      been avoided by just turning the hugetlb_file_setup() error wrapper into
      a macro, but mm_types.h is a reasonable include in this file.
      Reported-by: default avatarRichard -rw- Weinberger <richard.weinberger@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      be93d8cf
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · a74b81b0
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (28 commits)
        Ocfs2: Teach local-mounted ocfs2 to handle unwritten_extents correctly.
        ocfs2/dlm: Do not migrate resource to a node that is leaving the domain
        ocfs2/dlm: Add new dlm message DLM_BEGIN_EXIT_DOMAIN_MSG
        Ocfs2/move_extents: Set several trivial constraints for threshold.
        Ocfs2/move_extents: Let defrag handle partial extent moving.
        Ocfs2/move_extents: move/defrag extents within a certain range.
        Ocfs2/move_extents: helper to calculate the defraging length in one run.
        Ocfs2/move_extents: move entire/partial extent.
        Ocfs2/move_extents: helpers to update the group descriptor and global bitmap inode.
        Ocfs2/move_extents: helper to probe a proper region to move in an alloc group.
        Ocfs2/move_extents: helper to validate and adjust moving goal.
        Ocfs2/move_extents: find the victim alloc group, where the given #blk fits.
        Ocfs2/move_extents: defrag a range of extent.
        Ocfs2/move_extents: move a range of extent.
        Ocfs2/move_extents: lock allocators and reserve metadata blocks and data clusters for extents moving.
        Ocfs2/move_extents: Add basic framework and source files for extent moving.
        Ocfs2/move_extents: Adding new ioctl code 'OCFS2_IOC_MOVE_EXT' to ocfs2.
        Ocfs2/refcounttree: Publicize couple of funcs from refcounttree.c
        Ocfs2: Add a new code 'OCFS2_INFO_FREEFRAG' for o2info ioctl.
        Ocfs2: Add a new code 'OCFS2_INFO_FREEINODE' for o2info ioctl.
        ...
      a74b81b0
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem · f8d613e2
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:
        xen: cleancache shim to Xen Transcendent Memory
        ocfs2: add cleancache support
        ext4: add cleancache support
        btrfs: add cleancache support
        ext3: add cleancache support
        mm/fs: add hooks to support cleancache
        mm: cleancache core ops functions and config
        fs: add field to superblock to support cleancache
        mm/fs: cleancache documentation
      
      Fix up trivial conflict in fs/btrfs/extent_io.c due to includes
      f8d613e2