03 Jan, 2009

11 commits

  • The PCI-card identified as "Oxford Semiconductor Ltd EXSYS EX-41092 Dual
    16950 Serial adapter" is only usable with other devices (i.e. not the same
    card) after doing a "setserial /dev/ttyS baud_base 115200". This
    baud_base should be default for this card.

    Signed-off-by: Niels de Vos
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Niels de Vos
     
  • Again this is a lot of common code we can unify

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • Start sucking more commonality out of the drivers into a single piece of
    core code.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • This helps set the basis for moving block_til_ready into common code. We also
    introduce a tty_port_hangup helper as this will also be generally needed.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • This moves another per device special out of what should be shared open
    wait paths into private methods

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • This is the first step to generalising the various pieces of waiting logic
    duplicated in all sorts of serial drivers.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • this happening again by making use of 'const'.

    Signed-off-by: Russell King
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Russell King
     
  • We have special case logic for resizing pty/tty pairs. We also have a per
    driver resize method so for the pty case we should use it.

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • Fixes the loss of echoed (and other ldisc-generated characters) when
    the tty is stopped or when the driver output buffer is full (happens
    frequently for input during continuous program output, such as ^C)
    and removes the Big Kernel Lock from the N_TTY line discipline.

    Adds an "echo buffer" to the N_TTY line discipline that handles all
    ldisc-generated output (including echoed characters). Along with the
    loss of characters, this also fixes the associated loss of sync between
    tty output and the ldisc state when characters cannot be immediately
    written to the tty driver.

    The echo buffer stores (in addition to characters) state operations that need
    to be done at the time of character output (like management of the column
    position). This allows echo to cooperate correctly with program output,
    since the ldisc state remains consistent with actual characters written.

    Since the echo buffer code now isolates the tty column state code
    to the process_out* and process_echoes functions, we can remove the
    Big Kernel Lock (BKL) and replace it with mutex locks.

    Highlights are:

    * Handles echo (and other ldisc output) when tty driver buffer is full
    - continuous program output can block echo
    * Saves echo when tty is in stopped state (e.g. ^S)
    - (e.g.: ^Q will correctly cause held characters to be released for output)
    * Control character pairs (e.g. "^C") are treated atomically and not
    split up by interleaved program output
    * Line discipline state is kept consistent with characters sent to
    the tty driver
    * Remove the big kernel lock (BKL) from N_TTY line discipline

    Signed-off-by: Joe Peterson
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Joe Peterson
     

01 Jan, 2009

12 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (34 commits)
    nfsd race fixes: jfs
    nfsd race fixes: reiserfs
    nfsd race fixes: ext4
    nfsd race fixes: ext3
    nfsd race fixes: ext2
    nfsd/create race fixes, infrastructure
    filesystem notification: create fs/notify to contain all fs notification
    fs/block_dev.c: __read_mostly improvement and sb_is_blkdev_sb utilization
    kill ->dir_notify()
    filp_cachep can be static in fs/file_table.c
    fix f_count description in Documentation/filesystems/files.txt
    make INIT_FS use the __RW_LOCK_UNLOCKED initialization
    take init_fs to saner place
    kill vfs_permission
    pass a struct path * to may_open
    kill walk_init_root
    remove incorrect comment in inode_permission
    expand some comments (d_path / seq_path)
    correct wrong function name of d_put in kernel document and source comment
    fix switch_names() breakage in short-to-short case
    ...

    Linus Torvalds
     
  • new helpers - insert_inode_locked() and insert_inode_locked4().
    Hash new inode, making sure that there's no such inode in icache
    already. If there is and it does not end up unhashed (as would
    happen if we have nfsd trying to resolve a bogus fhandle), fail.
    Otherwise insert our inode into hash and succeed.

    In either case have i_state set to new+locked; cleanup ends up
    being simpler with such calling conventions.

    Signed-off-by: Al Viro

    Al Viro
     
  • Remove the hopelessly misguided ->dir_notify(). The only instance (cifs)
    has been broken by design from the very beginning; the objects it creates
    are never destroyed, keep references to struct file they can outlive, nothing
    that could possibly evict them exists on close(2) path *and* no locking
    whatsoever is done to prevent races with close(), should the previous, er,
    deficiencies someday be dealt with.

    Signed-off-by: Al Viro

    Al Viro
     
  • Instead of creating the "filp" kmem_cache in vfs_caches_init(),
    we can do it a litle be later in files_init(), so that filp_cachep
    is static to fs/file_table.c

    Acked-by: Paul E. McKenney

    Signed-off-by: Eric Dumazet
    Signed-off-by: Al Viro

    Eric Dumazet
     
  • Signed-off-by: Al Viro

    Al Viro
     
  • With all the nameidata removal there's no point anymore for this helper.
    Of the three callers left two will go away with the next lookup series
    anyway.

    Also add proper kerneldoc to inode_permission as this is the main
    permission check routine now.

    Signed-off-by: Christoph Hellwig
    Signed-off-by: Al Viro

    Christoph Hellwig
     
  • No need for the nameidata in may_open - a struct path is enough.

    Signed-off-by: Christoph Hellwig
    Signed-off-by: Al Viro

    Christoph Hellwig
     
  • A number of filesystems were potentially triggering kernel bugs due to
    corrupted symlink names on disk. This function helps safely terminate
    the names.

    Cc: Al Viro
    Cc: Andrew Morton
    Signed-off-by: Duane Griffin
    Signed-off-by: Al Viro

    Duane Griffin
     
  • include/linux/fs.h contains externs for a bunch of variables. That obviously
    belongs under ifdef __KERNEL__.

    Signed-off-by: Jan Engelhardt
    Cc: Al Viro
    Signed-off-by: Andrew Morton
    Signed-off-by: Al Viro

    Jan Engelhardt
     
  • struct dentry is one of the most critical structures in the kernel. So it's
    sad to see it going neglected.

    With CONFIG_PROFILING turned on (which is probably the common case at least
    for distros and kernel developers), sizeof(struct dcache) == 208 here
    (64-bit). This gives 19 objects per slab.

    I packed d_mounted into a hole, and took another 4 bytes off the inline
    name length to take the padding out from the end of the structure. This
    shinks it to 200 bytes. I could have gone the other way and increased the
    length to 40, but I'm aiming for a magic number, read on...

    I then got rid of the d_cookie pointer. This shrinks it to 192 bytes. Rant:
    why was this ever a good idea? The cookie system should increase its hash
    size or use a tree or something if lookups are a problem. Also the "fast
    dcookie lookups" in oprofile should be moved into the dcookie code -- how
    can oprofile possibly care about the dcookie_mutex? It gets dropped after
    get_dcookie() returns so it can't be providing any sort of protection.

    At 192 bytes, 21 objects fit into a 4K page, saving about 3MB on my system
    with ~140 000 entries allocated. 192 is also a multiple of 64, so we get
    nice cacheline alignment on 64 and 32 byte line systems -- any given dentry
    will now require 3 cachelines to touch all fields wheras previously it
    would require 4.

    I know the inline name size was chosen quite carefully, however with the
    reduction in cacheline footprint, it should actually be just about as fast
    to do a name lookup for a 36 character name as it was before the patch (and
    faster for other sizes). The memory footprint savings for names which are
    36 bytes long should more than make up for the memory cost for
    33-36 byte names.

    Performance is a feature...

    Signed-off-by: Al Viro

    Nick Piggin
     
  • Add new LSM hooks for path-based checks. Call them on directory-modifying
    operations at the points where we still know the vfsmount involved.

    Signed-off-by: Kentaro Takeda
    Signed-off-by: Tetsuo Handa
    Signed-off-by: Toshiharu Harada
    Signed-off-by: Al Viro

    Kentaro Takeda
     
  • …l/git/tip/linux-2.6-tip

    * 'irq-fixes-for-linus-4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sparseirq: move __weak symbols into separate compilation unit
    sparseirq: work around __weak alias bug
    sparseirq: fix hang with !SPARSE_IRQ
    sparseirq: set lock_class for legacy irq when sparse_irq is selected
    sparseirq: work around compiler optimizing away __weak functions
    sparseirq: fix desc->lock init
    sparseirq: do not printk when migrating IRQ descriptors
    sparseirq: remove duplicated arch_early_irq_init()
    irq: simplify for_each_irq_desc() usage
    proc: remove ifdef CONFIG_SPARSE_IRQ from stat.c
    irq: for_each_irq_desc() move to irqnr.h
    hrtimer: remove #include <linux/irq.h>

    Linus Torvalds
     

31 Dec, 2008

17 commits

  • * 'for-linus' of git://oss.sgi.com/xfs/xfs: (184 commits)
    [XFS] Fix race in xfs_write() between direct and buffered I/O with DMAPI
    [XFS] handle unaligned data in xfs_bmbt_disk_get_all
    [XFS] avoid memory allocations in xfs_fs_vcmn_err
    [XFS] Fix speculative allocation beyond eof
    [XFS] Remove XFS_BUF_SHUT() and friends
    [XFS] Use the incore inode size in xfs_file_readdir()
    [XFS] set b_error from bio error in xfs_buf_bio_end_io
    [XFS] use inode_change_ok for setattr permission checking
    [XFS] add a FMODE flag to make XFS invisible I/O less hacky
    [XFS] resync headers with libxfs
    [XFS] simplify projid check in xfs_rename
    [XFS] replace b_fspriv with b_mount
    [XFS] Remove unused tracing code
    [XFS] Remove unnecessary assertion
    [XFS] Remove unused variable in ktrace_free()
    [XFS] Check return value of xfs_buf_get_noaddr()
    [XFS] Fix hang after disallowed rename across directory quota domains
    [XFS] Fix compile with CONFIG_COMPAT enabled
    move inode tracing out of xfs_vnode.
    move vn_iowait / vn_iowake into xfs_aops.c
    ...

    Linus Torvalds
     
  • * git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (70 commits)
    fs/nfs/nfs4proc.c: make nfs4_map_errors() static
    rpc: add service field to new upcall
    rpc: add target field to new upcall
    nfsd: support callbacks with gss flavors
    rpc: allow gss callbacks to client
    rpc: pass target name down to rpc level on callbacks
    nfsd: pass client principal name in rsc downcall
    rpc: implement new upcall
    rpc: store pointer to pipe inode in gss upcall message
    rpc: use count of pipe openers to wait for first open
    rpc: track number of users of the gss upcall pipe
    rpc: call release_pipe only on last close
    rpc: add an rpc_pipe_open method
    rpc: minor gss_alloc_msg cleanup
    rpc: factor out warning code from gss_pipe_destroy_msg
    rpc: remove unnecessary assignment
    NFS: remove unused status from encode routines
    NFS: increment number of operations in each encode routine
    NFS: fix comment placement in nfs4xdr.c
    NFS: fix tabs in nfs4xdr.c
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (104 commits)
    [SCSI] fcoe: fix configuration problems
    [SCSI] cxgb3i: fix select/depend problem
    [SCSI] fcoe: fix incorrect use of struct module
    [SCSI] cxgb3i: remove use of skb->sp
    [SCSI] cxgb3i: Add cxgb3i iSCSI driver.
    [SCSI] zfcp: Remove unnecessary warning message
    [SCSI] zfcp: Add support for unchained FSF requests
    [SCSI] zfcp: Remove busid macro
    [SCSI] zfcp: remove DID_DID flag
    [SCSI] zfcp: Simplify mask lookups for incoming RSCNs
    [SCSI] zfcp: Remove initial device data from zfcp_data
    [SCSI] zfcp: fix compile warning
    [SCSI] zfcp: Remove adapter list
    [SCSI] zfcp: Simplify SBAL allocation to fix sparse warnings
    [SCSI] zfcp: register with SCSI layer on ccw registration
    [SCSI] zfcp: Fix message line break
    [SCSI] qla2xxx: changes in multiq code
    [SCSI] eata: fix the data buffer accessors conversion regression
    [SCSI] ibmvfc: Improve async event handling
    [SCSI] lpfc : correct printk types on PPC compiles
    ...

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (583 commits)
    V4L/DVB (10130): use USB API functions rather than constants
    V4L/DVB (10129): dvb: remove deprecated use of RW_LOCK_UNLOCKED in frontends
    V4L/DVB (10128): modify V4L documentation to be a valid XHTML
    V4L/DVB (10127): stv06xx: Avoid having y unitialized
    V4L/DVB (10125): em28xx: Don't do AC97 vendor detection for i2s audio devices
    V4L/DVB (10124): em28xx: expand output formats available
    V4L/DVB (10123): em28xx: fix reversed definitions of I2S audio modes
    V4L/DVB (10122): em28xx: don't load em28xx-alsa for em2870 based devices
    V4L/DVB (10121): em28xx: remove worthless Pinnacle PCTV HD Mini 80e device profile
    V4L/DVB (10120): em28xx: remove redundant Pinnacle Dazzle DVC 100 profile
    V4L/DVB (10119): em28xx: fix corrupted XCLK value
    V4L/DVB (10118): zoran: fix warning for a variable not used
    V4L/DVB (10116): af9013: Fix gcc false warnings
    V4L/DVB (10111a): usbvideo.h: remove an useless blank line
    V4L/DVB (10111): quickcam_messenger.c: fix a warning
    V4L/DVB (10110): v4l2-ioctl: Fix warnings when using .unlocked_ioctl = __video_ioctl2
    V4L/DVB (10109): anysee: Fix usage of an unitialized function
    V4L/DVB (10104): uvcvideo: Add support for video output devices
    V4L/DVB (10102): uvcvideo: Ignore interrupt endpoint for built-in iSight webcams.
    V4L/DVB (10101): uvcvideo: Fix bulk URB processing when the header is erroneous
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
    lguest: struct device - replace bus_id with dev_name()
    lguest: move the initial guest page table creation code to the host
    kvm-s390: implement config_changed for virtio on s390
    virtio_console: support console resizing
    virtio: add PCI device release() function
    virtio_blk: fix type warning
    virtio: block: dynamic maximum segments
    virtio: set max_segment_size and max_sectors to infinite.
    virtio: avoid implicit use of Linux page size in balloon interface
    virtio: hand virtio ring alignment as argument to vring_new_virtqueue
    virtio: use KVM_S390_VIRTIO_RING_ALIGN instead of relying on pagesize
    virtio: use LGUEST_VRING_ALIGN instead of relying on pagesize
    virtio: Don't use PAGE_SIZE for vring alignment in virtio_pci.
    virtio: rename 'pagesize' arg to vring_init/vring_size
    virtio: Don't use PAGE_SIZE in virtio_pci.c
    virtio: struct device - replace bus_id with dev_name(), dev_set_name()
    virtio-pci queue allocation not page-aligned

    Linus Torvalds
     
  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
    [ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
    [ARM] pxafb: cleanup of the timing checking code
    [ARM] pxafb: cleanup of the color format manipulation code
    [ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
    [ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
    [ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
    [ARM] pxafb: allow video memory size to be configurable
    [ARM] pxa: add document on the MFP design and how to use it
    [ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
    [ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
    [ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
    [ARM] pxa: Update eseries defconfig
    [ARM] 5352/1: add w90p910-plat config file
    [ARM] s3c: S3C options should depend on PLAT_S3C
    [ARM] mv78xx0: implement GPIO and GPIO interrupt support
    [ARM] Kirkwood: implement GPIO and GPIO interrupt support
    [ARM] Orion: share GPIO IRQ handling code
    [ARM] Orion: share GPIO handling code
    [ARM] s3c: define __io using the typesafe version
    [ARM] S3C64XX: Ensure CPU_V6 is selected
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (33 commits)
    ide-cd: remove dead dsc_overlap setting
    ide: push local_irq_{save,restore}() to do_identify()
    ide: remove superfluous local_irq_{save,restore}() from ide_dump_status()
    ide: move legacy ISA/VLB ports handling to ide-legacy.c (v2)
    ide: move Power Management support to ide-pm.c
    ide: use ATA_DMA_* defines in ide-dma-sff.c
    ide: checkpatch.pl fixes for ide-lib.c
    ide: remove inline tags from ide-probe.c
    ide: remove redundant code from ide_end_drive_cmd()
    ide: struct device - replace bus_id with dev_name(), dev_set_name()
    ide: rework handling of serialized ports (v2)
    cy82c693: remove superfluous ide_cy82c693 chipset type
    trm290: add IDE_HFLAG_TRM290 host flag
    ide: add ->max_sectors field to struct ide_port_info
    rz1000: apply chipset quirks early (v2)
    ide: always set nIEN on idle devices
    ide: fix ->quirk_list checking in ide_do_request()
    gayle: set IDE_HFLAG_SERIALIZE explictly
    cmd64x: set IDE_HFLAG_SERIALIZE explictly for CMD646
    ali14xx: doesn't use shared IRQs
    ...

    Linus Torvalds
     
  • * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
    sata_sil: add Large Block Transfer support
    [libata] ata_piix: cleanup dmi strings checking
    DMI: add dmi_match
    libata: blacklist NCQ on OCZ CORE 2 SSD (resend)
    [libata] Update kernel-doc comments to match source code
    libata: perform port detach in EH
    libata: when restoring SControl during detach do the PMP links first
    libata: beef up iterators

    Linus Torvalds
     
  • * 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    oprofile: select RING_BUFFER
    ring_buffer: adding EXPORT_SYMBOLs
    oprofile: fix lost sample counter
    oprofile: remove nr_available_slots()
    oprofile: port to the new ring_buffer
    ring_buffer: add remaining cpu functions to ring_buffer.h
    oprofile: moving cpu_buffer_reset() to cpu_buffer.h
    oprofile: adding cpu_buffer_entries()
    oprofile: adding cpu_buffer_write_commit()
    oprofile: adding cpu buffer r/w access functions
    ftrace: remove unused function arg in trace_iterator_increment()
    ring_buffer: update description for ring_buffer_alloc()
    oprofile: set values to default when creating oprofilefs
    oprofile: implement switch/case in buffer_sync.c
    x86/oprofile: cleanup IBS init/exit functions in op_model_amd.c
    x86/oprofile: reordering IBS code in op_model_amd.c
    oprofile: fix typo
    oprofile: whitspace changes only
    oprofile: update comment for oprofile_add_sample()
    oprofile: comment cleanup

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
    slub: avoid leaking caches or refcounts on sysfs error
    slab: Fix comment on #endif
    slab: remove GFP_THISNODE clearing from alloc_slabmgmt()
    slub: Add might_sleep_if() to slab_alloc()
    SLUB: failslab support
    slub: Fix incorrect use of loose
    slab: Update the kmem_cache_create documentation regarding the name parameter
    slub: make early_kmem_cache_node_alloc void
    slab: unsigned slabp->inuse cannot be less than 0
    slub - fix get_object_page comment
    SLUB: Replace __builtin_return_address(0) with _RET_IP_.
    SLUB: cleanup - define macros instead of hardcoded numbers

    Linus Torvalds
     
  • * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (37 commits)
    drm/i915: fix modeset devname allocation + agp init return check.
    drm/i915: Remove redundant test in error path.
    drm: Add a debug node for vblank state.
    drm: Avoid use-before-null-test on dev in drm_cleanup().
    drm/i915: Don't print to dmesg when taking signal during object_pin.
    drm: pin new and unpin old buffer when setting a mode.
    drm/i915: un-EXPORT and make 'intelfb_panic' static
    drm/i915: Delete unused, pointless i915_driver_firstopen.
    drm/i915: fix sparse warnings: returning void-valued expression
    drm/i915: fix sparse warnings: move 'extern' decls to header file
    drm/i915: fix sparse warnings: make symbols static
    drm/i915: fix sparse warnings: declare one-bit bitfield as unsigned
    drm/i915: Don't double-unpin buffers if we take a signal in evict_everything().
    drm/i915: Fix fbcon setup to align display pitch to 64b.
    drm/i915: Add missing userland definitions for gem init/execbuffer.
    i915/drm: provide compat defines for userspace for certain struct members.
    drm: drop DRM_IOCTL_MODE_REPLACEFB, add+remove works just as well.
    drm: sanitise drm modesetting API + remove unused hotplug
    drm: fix allowing master ioctls on non-master fds.
    drm/radeon: use locked rmmap to remove sarea mapping.
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (98 commits)
    sparc: move select of ARCH_SUPPORTS_MSI
    sparc: drop SUN_IO
    sparc: unify sections.h
    sparc: use .data.init_task section for init_thread_union
    sparc: fix array overrun check in of_device_64.c
    sparc: unify module.c
    sparc64: prepare module_64.c for unification
    sparc64: use bit neutral Elf symbols
    sparc: unify module.h
    sparc: introduce CONFIG_BITS
    sparc: fix hardirq.h removal fallout
    sparc64: do not export pus_fs_struct
    sparc: use sparc64 version of scatterlist.h
    sparc: Commonize memcmp assembler.
    sparc: Unify strlen assembler.
    sparc: Add asm/asm.h
    sparc: Kill memcmp_32.S code which has been ifdef'd out for centuries.
    sparc: replace for_each_cpu_mask_nr with for_each_cpu
    sparc: fix sparse warnings in irq_32.c
    sparc: add include guards to kernel.h
    ...

    Linus Torvalds
     
  • * 'for-2.6.29' of git://git.kernel.dk/linux-2.6-block: (43 commits)
    bio: get rid of bio_vec clearing
    bounce: don't rely on a zeroed bio_vec list
    cciss: simplify parameters to deregister_disk function
    cfq-iosched: fix race between exiting queue and exiting task
    loop: Do not call loop_unplug for not configured loop device.
    loop: Flush possible running bios when loop device is released.
    alpha: remove dead BIO_VMERGE_BOUNDARY
    Get rid of CONFIG_LSF
    block: make blk_softirq_init() static
    block: use min_not_zero in blk_queue_stack_limits
    block: add one-hit cache for disk partition lookup
    cfq-iosched: remove limit of dispatch depth of max 4 times quantum
    nbd: tell the block layer that it is not a rotational device
    block: get rid of elevator_t typedef
    aio: make the lookup_ioctx() lockless
    bio: add support for inlining a number of bio_vecs inside the bio
    bio: allow individual slabs in the bio_set
    bio: move the slab pointer inside the bio_set
    bio: only mempool back the largest bio_vec slab cache
    block: don't use plugging on SSD devices
    ...

    Linus Torvalds
     
  • * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, sparseirq: clean up Kconfig entry
    x86: turn CONFIG_SPARSE_IRQ off by default
    sparseirq: fix numa_migrate_irq_desc dependency and comments
    sparseirq: add kernel-doc notation for new member in irq_desc, -v2
    locking, irq: enclose irq_desc_lock_class in CONFIG_LOCKDEP
    sparseirq, xen: make sure irq_desc is allocated for interrupts
    sparseirq: fix !SMP building, #2
    x86, sparseirq: move irq_desc according to smp_affinity, v7
    proc: enclose desc variable of show_stat() in CONFIG_SPARSE_IRQ
    sparse irqs: add irqnr.h to the user headers list
    sparse irqs: handle !GENIRQ platforms
    sparseirq: fix !SMP && !PCI_MSI && !HT_IRQ build
    sparseirq: fix Alpha build failure
    sparseirq: fix typo in !CONFIG_IO_APIC case
    x86, MSI: pass irq_cfg and irq_desc
    x86: MSI start irq numbering from nr_irqs_gsi
    x86: use NR_IRQS_LEGACY
    sparse irq_desc[] array: core kernel and x86 changes
    genirq: record IRQ_LEVEL in irq_desc[]
    irq.h: remove padding from irq_desc on 64bits

    Linus Torvalds
     
  • …l/git/tip/linux-2.6-tip

    * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    hrtimers: fix warning in kernel/hrtimer.c
    x86: make sure we really have an hpet mapping before using it
    x86: enable HPET on Fujitsu u9200
    linux/timex.h: cleanup for userspace
    posix-timers: simplify de_thread()->exit_itimers() path
    posix-timers: check ->it_signal instead of ->it_pid to validate the timer
    posix-timers: use "struct pid*" instead of "struct task_struct*"
    nohz: suppress needless timer reprogramming
    clocksource, acpi_pm.c: put acpi_pm_read_slow() under CONFIG_PCI
    nohz: no softirq pending warnings for offline cpus
    hrtimer: removing all ur callback modes, fix
    hrtimer: removing all ur callback modes, fix hotplug
    hrtimer: removing all ur callback modes
    x86: correct link to HPET timer specification
    rtc-cmos: export second NVRAM bank

    Fixed up conflicts in sound/drivers/pcsp/pcsp.c and sound/core/hrtimer.c
    manually.

    Linus Torvalds
     
  • * 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (63 commits)
    stacktrace: provide save_stack_trace_tsk() weak alias
    rcu: provide RCU options on non-preempt architectures too
    printk: fix discarding message when recursion_bug
    futex: clean up futex_(un)lock_pi fault handling
    "Tree RCU": scalable classic RCU implementation
    futex: rename field in futex_q to clarify single waiter semantics
    x86/swiotlb: add default swiotlb_arch_range_needs_mapping
    x86/swiotlb: add default physbus conversion
    x86: unify pci iommu setup and allow swiotlb to compile for 32 bit
    x86: add swiotlb allocation functions
    swiotlb: consolidate swiotlb info message printing
    swiotlb: support bouncing of HighMem pages
    swiotlb: factor out copy to/from device
    swiotlb: add arch hook to force mapping
    swiotlb: allow architectures to override physbusphys conversions
    swiotlb: add comment where we handle the overflow of a dma mask on 32 bit
    rcu: fix rcutorture behavior during reboot
    resources: skip sanity check of busy resources
    swiotlb: move some definitions to header
    swiotlb: allow architectures to override swiotlb pool allocation
    ...

    Fix up trivial conflicts in
    arch/x86/kernel/Makefile
    arch/x86/mm/init_32.c
    include/linux/hardirq.h
    as per Ingo's suggestions.

    Linus Torvalds
     
  • Trond Myklebust