1. 03 Apr, 2009 27 commits
  2. 01 Apr, 2009 13 commits
    • Alexey Dobriyan's avatar
      serial: fixup /proc/tty/driver/serial after proc_fops conversion · 833bb304
      Alexey Dobriyan authored
      "struct tty_driver *" lies in m->private not in v which is
      SEQ_TOKEN_START which is 1 which is enough to trigger NULL dereference
      next line:
      	BUG: unable to handle kernel NULL pointer dereference at 000000ad
      	IP: [<c040d689>] uart_proc_show+0xe/0x2b0
      Noticed by Linus.
      Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 8b53ef33
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: (29 commits)
        [IA64] BUG to BUG_ON changes
        [IA64] Fix typo/thinko in arch/ia64/sn/kernel/sn2/sn2_smp.c
        ia64: remove some warnings.
        ia64/xen: fix the link error.
        ia64/pv_ops/bp/xen: implemented binary patchable pv_cpu_ops.
        ia64/pv_ops/binary patch: define paravirt_dv_serialize_data() and suppress false positive warning.
        ia64/pv_ops/bp/module: support binary patching for kernel module.
        ia64/pv_ops: implement binary patching optimization for native.
        ia64/pv_op/binarypatch: add helper functions to support binary patching for paravirt_ops.
        ia64/pv_ops/xen/gate.S: xen gate page paravirtualization
        ia64/pv_ops: paravirtualize gate.S.
        ia64/pv_ops: move down __kernel_syscall_via_epc.
        ia64/pv_ops/xen: define xen specific gate page.
        ia64/pv_ops: gate page paravirtualization.
        ia64/pv_ops/xen/pv_time_ops: implement sched_clock.
        ia64/pv_ops/pv_time_ops: add sched_clock hook.
        ia64/pv_ops/xen: paravirtualize read/write ar.itc and ar.itm
        ia64/pv_ops: paravirtualize mov = ar.itc.
        ia64/pv_ops/pvchecker: support mov = ar.itc paravirtualization
        ia64/pv_ops: paravirtualize fsys.S.
    • Linus Torvalds's avatar
      Merge branch 'x86-setup-for-linus' of... · ef5ddd3d
      Linus Torvalds authored
      Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      * 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, setup: guard against pre-ACPI 3 e820 code not updating %ecx
    • Linus Torvalds's avatar
      qeth: properly delete empty files. · 972dd435
      Linus Torvalds authored
      Commit 64ef8957 ("qeth: remove EDDP")
      removed the qeth_core_offl.[hc] files, but ended up doing so by just
      patching them to zero size, rather than removing them properly.
      Actually remove the files.
      Reported-by: default avatarAndrew Price <andy@andrewprice.me.uk>
      Cc: Frank Blaschka <frank.blaschka@de.ibm.com>
      Cc: David S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • H. Peter Anvin's avatar
      x86, setup: guard against pre-ACPI 3 e820 code not updating %ecx · cd670599
      H. Peter Anvin authored
      Impact: BIOS bug safety
      For pre-ACPI 3 BIOSes, pre-initialize the end of the e820 buffer just
      in case the BIOS returns an unchanged %ecx but without actually
      touching the ACPI 3 extended flags field.
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
    • Linus Torvalds's avatar
      Merge branch 'x86/setup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 9c9cb143
      Linus Torvalds authored
      * 'x86/setup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, setup: ACPI 3, BIOS workaround for E820-probing code
        x86, setup: preemptively save/restore edi and ebp around INT 15 E820
        x86, setup: mark %esi as clobbered in E820 BIOS call
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 4fe70410
      Linus Torvalds authored
      * 'for-linus' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (58 commits)
        SUNRPC: Ensure IPV6_V6ONLY is set on the socket before binding to a port
        NSM: Fix unaligned accesses in nsm_init_private()
        NFS: Simplify logic to compare socket addresses in client.c
        NFS: Start PF_INET6 callback listener only if IPv6 support is available
        lockd: Start PF_INET6 listener only if IPv6 support is available
        SUNRPC: rpcb_register() should handle errors silently
        SUNRPC: Simplify kernel RPC service registration
        SUNRPC: Simplify svc_unregister()
        SUNRPC: Allow callers to pass rpcb_v4_register a NULL address
        SUNRPC: rpcbind actually interprets r_owner string
        SUNRPC: Clean up address type casts in rpcb_v4_register()
        SUNRPC: Don't return EPROTONOSUPPORT in svc_register()'s helpers
        SUNRPC: Use IPv4 loopback for registering AF_INET6 kernel RPC services
        SUNRPC: Set IPV6ONLY flag on PF_INET6 RPC listener sockets
        NFS: Revert creation of IPv6 listeners for lockd and NFSv4 callbacks
        SUNRPC: Remove @family argument from svc_create() and svc_create_pooled()
        SUNRPC: Change svc_create_xprt() to take a @family argument
        SUNRPC: svc_setup_socket() gets protocol family from socket
        SUNRPC: Pass a family argument to svc_register()
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 395d7341
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (33 commits)
        ext4: Regularize mount options
        ext4: fix locking typo in mballoc which could cause soft lockup hangs
        ext4: fix typo which causes a memory leak on error path
        jbd2: Update locking coments
        ext4: Rename pa_linear to pa_type
        ext4: add checks of block references for non-extent inodes
        ext4: Check for an valid i_mode when reading the inode from disk
        ext4: Use WRITE_SYNC for commits which are caused by fsync()
        ext4: Add auto_da_alloc mount option
        ext4: Use struct flex_groups to calculate get_orlov_stats()
        ext4: Use atomic_t's in struct flex_groups
        ext4: remove /proc tuning knobs
        ext4: Add sysfs support
        ext4: Track lifetime disk writes
        ext4: Fix discard of inode prealloc space with delayed allocation.
        ext4: Automatically allocate delay allocated blocks on rename
        ext4: Automatically allocate delay allocated blocks on close
        ext4: add EXT4_IOC_ALLOC_DA_BLKS ioctl
        ext4: Simplify delalloc code by removing mpage_da_writepages()
        ext4: Save stack space by removing fake buffer heads
    • Trond Myklebust's avatar
      Merge branch 'devel' into for-linus · cc859061
      Trond Myklebust authored
    • Trond Myklebust's avatar
      SUNRPC: Ensure IPV6_V6ONLY is set on the socket before binding to a port · c69da774
      Trond Myklebust authored
      Also ensure that we use the protocol family instead of the address
      family when calling sock_create_kern().
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
    • Mans Rullgard's avatar
      NSM: Fix unaligned accesses in nsm_init_private() · ad5b365c
      Mans Rullgard authored
      This fixes unaligned accesses in nsm_init_private() when
      creating nlm_reboot keys.
      Signed-off-by: default avatarMans Rullgard <mans@mansr.com>
      Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · c226fd65
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
        Btrfs: try to free metadata pages when we free btree blocks
        Btrfs: add extra flushing for renames and truncates
        Btrfs: make sure btrfs_update_delayed_ref doesn't increase ref_mod
        Btrfs: optimize fsyncs on old files
        Btrfs: tree logging unlink/rename fixes
        Btrfs: Make sure i_nlink doesn't hit zero too soon during log replay
        Btrfs: limit balancing work while flushing delayed refs
        Btrfs: readahead checksums during btrfs_finish_ordered_io
        Btrfs: leave btree locks spinning more often
        Btrfs: Only let very young transactions grow during commit
        Btrfs: Check for a blocking lock before taking the spin
        Btrfs: reduce stack in cow_file_range
        Btrfs: reduce stalls during transaction commit
        Btrfs: process the delayed reference queue in clusters
        Btrfs: try to cleanup delayed refs while freeing extents
        Btrfs: reduce stack usage in some crucial tree balancing functions
        Btrfs: do extent allocation and reference count updates in the background
        Btrfs: don't preallocate metadata blocks during btrfs_search_slot
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · c09bca78
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (59 commits)
        ide-floppy: do not complete rq's prematurely
        ide: be able to build pmac driver without IDE built-in
        ide-pmac: IDE cable detection on Apple PowerBook
        ide: inline SELECT_DRIVE()
        ide: turn selectproc() method into dev_select() method (take 5)
        MAINTAINERS: move old ide-{floppy,tape} entries to CREDITS (take 2)
        ide: move data register access out of tf_{read|load}() methods (take 2)
        ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2)
        ide-io-std: shorten ide_{in|out}put_data()
        ide: rename IDE_TFLAG_IN_[HOB_]FEATURE
        ide: turn set_irq() method into write_devctl() method
        ide: use ATA_HOB
        ide-disk: use ATA_ERR
        ide: add support for CFA specified transfer modes (take 3)
        ide-iops: only clear DMA words on setting DMA mode
        ide: identify data word 53 bit 1 doesn't cover words 62 and 63 (take 3)
        au1xxx-ide: auide_{in|out}sw() should be static
        ide-floppy: use ide_pio_bytes()
        ide-{floppy,tape}: fix padding for PIO transfers
        ide: remove CONFIG_BLK_DEV_IDEDOUBLER config option