1. 23 Sep, 2009 32 commits
  2. 14 Sep, 2009 8 commits
    • Linus Torvalds's avatar
      Merge branch 'osync_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 4142e0d1
      Linus Torvalds authored
      * 'osync_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        fsync: wait for data writeout completion before calling ->fsync
        vfs: Remove generic_osync_inode() and sync_page_range{_nolock}()
        fat: Opencode sync_page_range_nolock()
        pohmelfs: Use new syncing helper
        xfs: Convert sync_page_range() to simple filemap_write_and_wait_range()
        ocfs2: Update syncing after splicing to match generic version
        ntfs: Use new syncing helpers and update comments
        ext4: Remove syncing logic from ext4_file_write
        ext3: Remove syncing logic from ext3_file_write
        ext2: Update comment about generic_osync_inode
        vfs: Introduce new helpers for syncing after writing to O_SYNC file or IS_SYNC inode
        vfs: Rename generic_file_aio_write_nolock
        ocfs2: Use __generic_file_aio_write instead of generic_file_aio_write_nolock
        pohmelfs: Use __generic_file_aio_write instead of generic_file_aio_write_nolock
        vfs: Remove syncing from generic_file_direct_write() and generic_file_buffered_write()
        vfs: Export __generic_file_aio_write() and add some comments
        vfs: Introduce filemap_fdatawait_range
      4142e0d1
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw · 33f1de69
      Linus Torvalds authored
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw:
        GFS2: Whitespace fixes
        GFS2: Remove unused sysfs file
        GFS2: Be extra careful about deallocating inodes
        GFS2: Remove no_formal_ino generating code
        GFS2: Rename eattr.[ch] as xattr.[ch]
        GFS2: Clean up of extended attribute support
        GFS2: Add explanation of extended attr on-disk format
        GFS2: Add "-o errors=panic|withdraw" mount options
        GFS2: jumping to wrong label?
        GFS2: free disk inode which is deleted by remote node -V2
        GFS2: Add a document explaining GFS2's uevents
        GFS2: Add sysfs link to device
        GFS2: Replace assertion with proper error handling
        GFS2: Improve error handling in inode allocation
        GFS2: Add some more info to uevents
        GFS2: Add online uevent to GFS2
      33f1de69
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 · 041d6d0b
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
        udf: Fix possible corruption when close races with write
        udf: Perform preallocation only for regular files
        udf: Remove wrong assignment in udf_symlink
        udf: Remove dead code
      041d6d0b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · af8cb8aa
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: (21 commits)
        fs/Kconfig: move nilfs2 outside misc filesystems
        nilfs2: convert nilfs_bmap_lookup to an inline function
        nilfs2: allow btree code to directly call dat operations
        nilfs2: add update functions of virtual block address to dat
        nilfs2: remove individual gfp constants for each metadata file
        nilfs2: stop zero-fill of btree path just before free it
        nilfs2: remove unused btree argument from btree functions
        nilfs2: remove nilfs_dat_abort_start and nilfs_dat_abort_free
        nilfs2: shorten freeze period due to GC in write operation v3
        nilfs2: add more check routines in mount process
        nilfs2: An unassigned variable is assigned to a never used structure member
        nilfs2: use GFP_NOIO for bio_alloc instead of GFP_NOWAIT
        nilfs2: stop using periodic write_super callback
        nilfs2: clean up nilfs_write_super
        nilfs2: fix disorder of nilfs_write_super in nilfs_sync_fs
        nilfs2: remove redundant super block commit
        nilfs2: implement nilfs_show_options to display mount options in /proc/mounts
        nilfs2: always lookup disk block address before reading metadata block
        nilfs2: use semaphore to protect pointer to a writable FS-instance
        nilfs2: fix format string compile warning (ino_t)
        ...
      af8cb8aa
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 6cdb5930
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: consolidate reconnect logic in smb_init routines
        cifs: Replace wrtPending with a real reference count
        cifs: protect GlobalOplock_Q with its own spinlock
        cifs: use tcon pointer in cifs_show_options
        cifs: send IPv6 addr in upcall with colon delimiters
        [CIFS] Fix checkpatch warnings
        PATCH] cifs: fix broken mounts when a SSH tunnel is used (try #4)
        [CIFS] Memory leak in ntlmv2 hash calculation
        [CIFS] potential NULL dereference in parse_DFS_referrals()
      6cdb5930
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 · 99bc4706
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (21 commits)
        sparc64: Initial niagara2 perf counter support.
        sparc64: Perf counter 'nop' event is not constant.
        sparc64: Provide a way to specify a perf counter overflow IRQ enable bit.
        sparc64: Provide hypervisor tracing bit support for perf counters.
        sparc64: Initial hw perf counter support.
        sparc64: Implement a real set_perf_counter_pending().
        sparc64: Use nmi_enter() and nmi_exit(), as needed.
        sparc64: Provide extern decls for sparc_??u_type strings.
        sparc64: Make touch_nmi_watchdog() actually work.
        sparc64: Kill unnecessary cast in profile_timer_exceptions_notify().
        sparc64: Manage NMI watchdog enabling like x86.
        sparc: add basic support for 'perf'
        sparc: convert /proc/io_map, /proc/dvma_map to seq_file
        sparc, leon: sparc-leon specific SRMMU initialization and bootup fixes.
        sparc,leon: Added support for AMBAPP bus.
        sparc,leon: Introduce the sparc-leon CPU type.
        sparc,leon: Redefine MMU register access asi if CONFIG_LEON
        sparc,leon: CONFIG_SPARC_LEON option and leon specific files.
        sparc64: cheaper asm/uaccess.h inclusion
        SPARC: fix duplicate declaration
        ...
      99bc4706
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · d7e9660a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits)
        netxen: update copyright
        netxen: fix tx timeout recovery
        netxen: fix file firmware leak
        netxen: improve pci memory access
        netxen: change firmware write size
        tg3: Fix return ring size breakage
        netxen: build fix for INET=n
        cdc-phonet: autoconfigure Phonet address
        Phonet: back-end for autoconfigured addresses
        Phonet: fix netlink address dump error handling
        ipv6: Add IFA_F_DADFAILED flag
        net: Add DEVTYPE support for Ethernet based devices
        mv643xx_eth.c: remove unused txq_set_wrr()
        ucc_geth: Fix hangs after switching from full to half duplex
        ucc_geth: Rearrange some code to avoid forward declarations
        phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs
        drivers/net/phy: introduce missing kfree
        drivers/net/wan: introduce missing kfree
        net: force bridge module(s) to be GPL
        Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded
        ...
      
      Fixed up trivial conflicts:
      
       - arch/x86/include/asm/socket.h
      
         converted to <asm-generic/socket.h> in the x86 tree.  The generic
         header has the same new #define's, so that works out fine.
      
       - drivers/net/tun.c
      
         fix conflict between 89f56d1e ("tun: reuse struct sock fields") that
         switched over to using 'tun->socket.sk' instead of the redundantly
         available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks
         to the TUN driver") which added a new 'tun->sk' use.
      
         Noted in 'next' by Stephen Rothwell.
      d7e9660a
    • Linus Torvalds's avatar
      Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · b8cb48aa
      Linus Torvalds authored
      * 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: split __phys_addr out into separate file
        xen: use stronger barrier after unlocking lock
        xen: only enable interrupts while actually blocking for spinlock
        xen: make -fstack-protector work under Xen
      b8cb48aa