1. 26 Oct, 2010 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux · 4390110f
      Linus Torvalds authored
      * 'for-2.6.37' of git://linux-nfs.org/~bfields/linux: (99 commits)
        svcrpc: svc_tcp_sendto XPT_DEAD check is redundant
        svcrpc: no need for XPT_DEAD check in svc_xprt_enqueue
        svcrpc: assume svc_delete_xprt() called only once
        svcrpc: never clear XPT_BUSY on dead xprt
        nfsd4: fix connection allocation in sequence()
        nfsd4: only require krb5 principal for NFSv4.0 callbacks
        nfsd4: move minorversion to client
        nfsd4: delay session removal till free_client
        nfsd4: separate callback change and callback probe
        nfsd4: callback program number is per-session
        nfsd4: track backchannel connections
        nfsd4: confirm only on succesful create_session
        nfsd4: make backchannel sequence number per-session
        nfsd4: use client pointer to backchannel session
        nfsd4: move callback setup into session init code
        nfsd4: don't cache seq_misordered replies
        SUNRPC: Properly initialize sock_xprt.srcaddr in all cases
        SUNRPC: Use conventional switch statement when reclassifying sockets
        sunrpc/xprtrdma: clean up workqueue usage
        sunrpc: Turn list_for_each-s into the ..._entry-s
        ...
      
      Fix up trivial conflicts (two different deprecation notices added in
      separate branches) in Documentation/feature-removal-schedule.txt
      4390110f
    • Linus Torvalds's avatar
      Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · a4dd8dce
      Linus Torvalds authored
      * 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        net/sunrpc: Use static const char arrays
        nfs4: fix channel attribute sanity-checks
        NFSv4.1: Use more sensible names for 'initialize_mountpoint'
        NFSv4.1: pnfs: filelayout: add driver's LAYOUTGET and GETDEVICEINFO infrastructure
        NFSv4.1: pnfs: add LAYOUTGET and GETDEVICEINFO infrastructure
        NFS: client needs to maintain list of inodes with active layouts
        NFS: create and destroy inode's layout cache
        NFSv4.1: pnfs: filelayout: introduce minimal file layout driver
        NFSv4.1: pnfs: full mount/umount infrastructure
        NFS: set layout driver
        NFS: ask for layouttypes during v4 fsinfo call
        NFS: change stateid to be a union
        NFSv4.1: pnfsd, pnfs: protocol level pnfs constants
        SUNRPC: define xdr_decode_opaque_fixed
        NFSD: remove duplicate NFS4_STATEID_SIZE
      a4dd8dce
    • Joe Perches's avatar
      411b5e05
    • J. Bruce Fields's avatar
      nfs4: fix channel attribute sanity-checks · 43c2e885
      J. Bruce Fields authored
      The sanity checks here are incorrect; in the worst case they allow
      values that crash the client.
      
      They're also over-reliant on the preprocessor.
      Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      43c2e885
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://android.git.kernel.org/kernel/tegra · b18cae42
      Linus Torvalds authored
      * 'for-next' of git://android.git.kernel.org/kernel/tegra:
        spi: tegra: fix error setting on timeout
        spi: add spi_tegra driver
        tegra: harmony: enable PCI Express
        tegra: add PCI Express support
        tegra: add PCI Express clocks
        [ARM] tegra: Add APB DMA support
        [ARM] tegra: Add cpufreq support
        [ARM] tegra: common: Update common clock init table
        [ARM] tegra: clock: Add dvfs support, bug fixes, and cleanups
        [ARM] tegra: Add support for reading fuses
        [ARM] tegra: gpio: Add suspend and wake support
        [ARM] tegra: pinmux: add safe values, move tegra2, add suspend
        [ARM] tegra: add suspend and mirror irqs to legacy controller
        [ARM] tegra: Add legacy irq support
        [ARM] tegra: update iomap
      b18cae42
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 4833c16d
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
        Blackfin: fix inverted anomaly 05000481 logic
        Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK
        Blackfin: ppi/spi/twi headers: add missing __BFP undef
        Blackfin: update defconfigs
        Blackfin: bfin_twi.h: start a common TWI header
        netdev: bfin_mac: push settings to platform resources
      4833c16d
  2. 25 Oct, 2010 34 commits