1. 02 4月, 2009 11 次提交
    • L
      qeth: properly delete empty files. · 972dd435
      Linus Torvalds 提交于
      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: NAndrew Price <andy@andrewprice.me.uk>
      Cc: Frank Blaschka <frank.blaschka@de.ibm.com>
      Cc: David S. Miller <davem@davemloft.net>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      972dd435
    • L
      Merge branch 'x86/setup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 9c9cb143
      Linus Torvalds 提交于
      * '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
      9c9cb143
    • L
      Merge branch 'for-linus' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 4fe70410
      Linus Torvalds 提交于
      * '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: Remove CONFIG_SUNRPC_REGISTER_V4
        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()
        ...
      4fe70410
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 395d7341
      Linus Torvalds 提交于
      * '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
        ...
      395d7341
    • T
      Merge branch 'devel' into for-linus · cc859061
      Trond Myklebust 提交于
      cc859061
    • T
      SUNRPC: Ensure IPV6_V6ONLY is set on the socket before binding to a port · c69da774
      Trond Myklebust 提交于
      Also ensure that we use the protocol family instead of the address
      family when calling sock_create_kern().
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      c69da774
    • M
      NSM: Fix unaligned accesses in nsm_init_private() · ad5b365c
      Mans Rullgard 提交于
      This fixes unaligned accesses in nsm_init_private() when
      creating nlm_reboot keys.
      Signed-off-by: NMans Rullgard <mans@mansr.com>
      Reviewed-by: NChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
      ad5b365c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · c226fd65
      Linus Torvalds 提交于
      * 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
      c226fd65
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · c09bca78
      Linus Torvalds 提交于
      * 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
        ...
      c09bca78
    • L
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · e76e5b2c
      Linus Torvalds 提交于
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (88 commits)
        PCI: fix HT MSI mapping fix
        PCI: don't enable too much HT MSI mapping
        x86/PCI: make pci=lastbus=255 work when acpi is on
        PCI: save and restore PCIe 2.0 registers
        PCI: update fakephp for bus_id removal
        PCI: fix kernel oops on bridge removal
        PCI: fix conflict between SR-IOV and config space sizing
        powerpc/PCI: include pci.h in powerpc MSI implementation
        PCI Hotplug: schedule fakephp for feature removal
        PCI Hotplug: rename legacy_fakephp to fakephp
        PCI Hotplug: restore fakephp interface with complete reimplementation
        PCI: Introduce /sys/bus/pci/devices/.../rescan
        PCI: Introduce /sys/bus/pci/devices/.../remove
        PCI: Introduce /sys/bus/pci/rescan
        PCI: Introduce pci_rescan_bus()
        PCI: do not enable bridges more than once
        PCI: do not initialize bridges more than once
        PCI: always scan child buses
        PCI: pci_scan_slot() returns newly found devices
        PCI: don't scan existing devices
        ...
      
      Fix trivial append-only conflict in Documentation/feature-removal-schedule.txt
      e76e5b2c
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 32527bc0
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
        [S390] cio: online_store - trigger recognition for boxed devices
        [S390] cio: disallow online setting of device in transient state
        [S390] cio: introduce notifier for boxed state
        [S390] cio: introduce ccw_device_schedule_sch_unregister
        [S390] cio: wake up on failed recognition
        [S390] fix hypfs build failure
        [PATCH] sysrq: include interrupt.h instead of irq.h
      32527bc0
  2. 01 4月, 2009 29 次提交