1. 19 Jul, 2007 10 commits
    • Linus Torvalds's avatar
      Merge branch 'isdn-fix' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 · 589f1e81
      Linus Torvalds authored
      * 'isdn-fix' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
        ISDN HiSax: uninitialized return in hisax_cs_setup
      589f1e81
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · ce524c83
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        eHEA: Fix bonding support
        Blackfin ethernet driver: on chip ethernet MAC controller driver
        fix wrong argument of tc35815_read_plat_dev_addr()
        ARM/ETHER3: Handle multicast frames.
        SAA9730: Handle multicast frames.
        NI5010: Handle multicast frames.
        NS83820: Handle multicast frames.
        Fix RGMII-ID handling in gianfar
        Fix Vitesse RGMII-ID support
        Add phy-connection-type to gianfar nodes
        Fix Vitesse 824x PHY interrupt acking
        [PATCH] zd1211rw: Add ID for Siemens Gigaset USB Stick 54
        [PATCH] zd1211rw: Add ID for Planex GW-US54GXS
        [PATCH] Update version ipw2200 stamp to 1.2.2
        [PATCH] ipw2200: Fix ipw_isr() comments error on shared IRQ
        [PATCH] Fix ipw2200 set wrong power parameter causing firmware error
        [PATCH] ipw2100: Fix `iwpriv set_power` error
        [PATCH] softmac: Channel is listed twice in scan output
      ce524c83
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 789c56b7
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (24 commits)
        [CIFS] merge conflict in fs/cifs/export.c
        [CIFS] Allow disabling CIFS Unix Extensions as mount option
        [CIFS] More whitespace/formatting fixes (noticed by checkpatch)
        [CIFS] Typo in previous patch
        [CIFS] zero_user_page() conversions
        [CIFS] use simple_prepare_write to zero page data
        [CIFS] Fix build break - inet.h not included when experimental ifdef off
        [CIFS] Add support for new POSIX unlink
        [CIFS] whitespace/formatting fixes
        [CIFS] Fix oops in cifs_create when nfsd server exports cifs mount
        [CIFS] whitespace cleanup
        [CIFS] Fix packet signatures for NTLMv2 case
        [CIFS] more whitespace fixes
        [CIFS] more whitespace cleanup
        [CIFS] whitespace cleanup
        [CIFS] whitespace cleanup
        [CIFS] ipv6 support no longer experimental
        [CIFS] Mount should fail if server signing off but client mount option requires it
        [CIFS] whitespace fixes
        [CIFS] Fix sign mount option and sign proc config setting
        ...
      789c56b7
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/docs-2.6 · 7209a1dc
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/docs-2.6:
        zh_CN/HOWTO: update URLs of git trees
        Chinese translation of Documentation/stable_api_nonsense.txt
        HOWTO: add Chinese translation of Documentation/HOWTO
        Documentation: add Japanese translated stable_api_nonsense.txt
        HOWTO: add Japanese translation of Documentation/HOWTO
      7209a1dc
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 29e7ee37
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        sysfs: cosmetic clean up on node creation failure paths
        sysfs: kill an extra put in sysfs_create_link() failure path
        Driver core: check return code of sysfs_create_link()
        HOWTO: Add the knwon_regression URI to the documentation
        dev_vdbg() documentation
        dev_vdbg(), available with -DVERBOSE_DEBUG
        sysfs: make sysfs_init_inode() static
        sysfs: fix sysfs root inode nlink accounting
        Documentation fix devres.txt: lib/iomap.c -> lib/devres.c
        sysfs: avoid kmem_cache_free(NULL)
        PM: remove deprecated dpm_runtime_* routines
        PM: Remove deprecated sysfs files
        Driver core: accept all valid action-strings in uevent-trigger
        debugfs: remove rmdir() non-empty complaint
      29e7ee37
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6 · fc15bc81
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/uio-2.6:
        UIO: Hilscher CIF card driver
        UIO: Documentation
        UIO: Add the User IO core code
      fc15bc81
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux · a8dcf12f
      Linus Torvalds authored
      * 'for-linus' of git://linux-nfs.org/~bfields/linux:
        locks: fix vfs_test_lock() comment
        locks: make posix_test_lock() interface more consistent
        nfs: disable leases over NFS
        gfs2: stop giving out non-cluster-coherent leases
        locks: export setlease to filesystems
        locks: provide a file lease method enabling cluster-coherent leases
        locks: rename lease functions to reflect locks.c conventions
        locks: share more common lease code
        locks: clean up lease_alloc()
        locks: convert an -EINVAL return to a BUG
        leases: minor break_lease() comment clarification
      a8dcf12f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · d796e641
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: (29 commits)
        IB/mthca: Simplify use of size0 in work request posting
        IB/mthca: Factor out setting WQE UD segment entries
        IB/mthca: Factor out setting WQE remote address and atomic segment entries
        IB/mlx4: Factor out setting other WQE segments
        IB/mlx4: Factor out setting WQE data segment entries
        IB/mthca: Factor out setting WQE data segment entries
        IB/mlx4: Return receive queue sizes for userspace QPs from query QP
        IB/mlx4: Increase max outstanding RDMA reads as target
        RDMA/cma: Remove local write permission from QP access flags
        IB/mthca: Use uninitialized_var() for f0
        IB/cm: Make internal function cm_get_ack_delay() static
        IB/ipath: Remove ipath_get_user_pages_nocopy()
        IB/ipath: Make a few functions static
        mlx4_core: Reset device when internal error is detected
        IB/iser: Make a couple of functions static
        IB/mthca: Fix printk format used for firmware version in warning
        IB/mthca: Schedule MSI support for removal
        IB/ehca: Fix warnings issued by checkpatch.pl
        IB/ehca: Restructure ehca_set_pagebuf()
        IB/ehca: MR/MW structure refactoring
        ...
      d796e641
    • Steve French's avatar
      Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 · 1ff8392c
      Steve French authored
      Conflicts:
      
      	fs/cifs/export.c
      1ff8392c
    • Steve French's avatar
      [CIFS] merge conflict in fs/cifs/export.c · 70b315b0
      Steve French authored
      Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
      70b315b0
  2. 18 Jul, 2007 30 commits