08 Aug, 2010

13 commits

  • * 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
    do_coredump: Do not take BKL
    init: Remove the BKL from startup code

    Linus Torvalds
     
  • …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
    SELINUX: Fix build error.

    Linus Torvalds
     
  • * 'for-2.6.36' of git://linux-nfs.org/~bfields/linux: (34 commits)
    nfsd4: fix file open accounting for RDWR opens
    nfsd: don't allow setting maxblksize after svc created
    nfsd: initialize nfsd versions before creating svc
    net: sunrpc: removed duplicated #include
    nfsd41: Fix a crash when a callback is retried
    nfsd: fix startup/shutdown order bug
    nfsd: minor nfsd read api cleanup
    gcc-4.6: nfsd: fix initialized but not read warnings
    nfsd4: share file descriptors between stateid's
    nfsd4: fix openmode checking on IO using lock stateid
    nfsd4: miscellaneous process_open2 cleanup
    nfsd4: don't pretend to support write delegations
    nfsd: bypass readahead cache when have struct file
    nfsd: minor nfsd_svc() cleanup
    nfsd: move more into nfsd_startup()
    nfsd: just keep single lockd reference for nfsd
    nfsd: clean up nfsd_create_serv error handling
    nfsd: fix error handling in __write_ports_addxprt
    nfsd: fix error handling when starting nfsd with rpcbind down
    nfsd4: fix v4 state shutdown error paths
    ...

    Linus Torvalds
     
  • Fix the module init error handling. There are a bunch of goto labels for
    aborting the init procedure at different points and just undoing what needs
    undoing - they aren't all in the right places, however.

    This can lead to an oops like the following:

    BUG: unable to handle kernel NULL pointer dereference at 0000000000000020
    IP: [] destroy_workqueue+0x17/0xc0
    ...
    Modules linked in: kafs(+) dns_resolver rxkad af_rxrpc fscache

    Pid: 2171, comm: insmod Not tainted 2.6.35-cachefs+ #319 DG965RY/
    ...
    Process insmod (pid: 2171, threadinfo ffff88003ca6a000, task ffff88003dcc3050)
    ...
    Call Trace:
    [] afs_callback_update_kill+0x10/0x12 [kafs]
    [] afs_init+0x190/0x1ce [kafs]
    [] ? afs_init+0x0/0x1ce [kafs]
    [] do_one_initcall+0x59/0x14e
    [] sys_init_module+0x9c/0x1de
    [] system_call_fastpath+0x16/0x1b

    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    David Howells
     
  • * 'nfs-for-2.6.36' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (42 commits)
    NFS: NFSv4.1 is no longer a "developer only" feature
    NFS: NFS_V4 is no longer an EXPERIMENTAL feature
    NFS: Fix /proc/mount for legacy binary interface
    NFS: Fix the locking in nfs4_callback_getattr
    SUNRPC: Defer deleting the security context until gss_do_free_ctx()
    SUNRPC: prevent task_cleanup running on freed xprt
    SUNRPC: Reduce asynchronous RPC task stack usage
    SUNRPC: Move the bound cred to struct rpc_rqst
    SUNRPC: Clean up of rpc_bindcred()
    SUNRPC: Move remaining RPC client related task initialisation into clnt.c
    SUNRPC: Ensure that rpc_exit() always wakes up a sleeping task
    SUNRPC: Make the credential cache hashtable size configurable
    SUNRPC: Store the hashtable size in struct rpc_cred_cache
    NFS: Ensure the AUTH_UNIX credcache is allocated dynamically
    NFS: Fix the NFS users of rpc_restart_call()
    SUNRPC: The function rpc_restart_call() should return success/failure
    NFSv4: Get rid of the bogus RPC_ASSASSINATED(task) checks
    NFSv4: Clean up the process of renewing the NFSv4 lease
    NFSv4.1: Handle NFS4ERR_DELAY on SEQUENCE correctly
    NFS: nfs_rename() should not have to flush out writebacks
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
    fuse: add retrieve request
    fuse: add store request
    fuse: don't use atomic kmap

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: (45 commits)
    nilfs2: reject filesystem with unsupported block size
    nilfs2: avoid rec_len overflow with 64KB block size
    nilfs2: simplify nilfs_get_page function
    nilfs2: reject incompatible filesystem
    nilfs2: add feature set fields to super block
    nilfs2: clarify byte offset in super block format
    nilfs2: apply read-ahead for nilfs_btree_lookup_contig
    nilfs2: introduce check flag to btree node buffer
    nilfs2: add btree get block function with readahead option
    nilfs2: add read ahead mode to nilfs_btnode_submit_block
    nilfs2: fix buffer head leak in nilfs_btnode_submit_block
    nilfs2: eliminate inline keywords in btree implementation
    nilfs2: get maximum number of child nodes from bmap object
    nilfs2: reduce repetitive calculation of max number of child nodes
    nilfs2: optimize calculation of min/max number of btree node children
    nilfs2: remove redundant pointer checks in bmap lookup functions
    nilfs2: get rid of nilfs_bmap_union
    nilfs2: unify bmap set_target_v operations
    nilfs2: get rid of nilfs_btree uses
    nilfs2: get rid of nilfs_direct uses
    ...

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (40 commits)
    ext4: Adding error check after calling ext4_mb_regular_allocator()
    ext4: Fix dirtying of journalled buffers in data=journal mode
    ext4: re-inline ext4_rec_len_(to|from)_disk functions
    jbd2: Remove t_handle_lock from start_this_handle()
    jbd2: Change j_state_lock to be a rwlock_t
    jbd2: Use atomic variables to avoid taking t_handle_lock in jbd2_journal_stop
    ext4: Add mount options in superblock
    ext4: force block allocation on quota_off
    ext4: fix freeze deadlock under IO
    ext4: drop inode from orphan list if ext4_delete_inode() fails
    ext4: check to make make sure bd_dev is set before dereferencing it
    jbd2: Make barrier messages less scary
    ext4: don't print scary messages for allocation failures post-abort
    ext4: fix EFBIG edge case when writing to large non-extent file
    ext4: fix ext4_get_blocks references
    ext4: Always journal quota file modifications
    ext4: Fix potential memory leak in ext4_fill_super
    ext4: Don't error out the fs if the user tries to make a file too big
    ext4: allocate stripe-multiple IOs on stripe boundaries
    ext4: move aio completion after unwritten extent conversion
    ...

    Fix up conflicts in fs/ext4/inode.c as per Ted.

    Fix up xfs conflicts as per earlier xfs merge.

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
    ext3: Fix dirtying of journalled buffers in data=journal mode
    ext3: default to ordered mode
    quota: Use mark_inode_dirty_sync instead of mark_inode_dirty
    quota: Change quota error message to print out disk and function name
    MAINTAINERS: Update entries of ext2 and ext3
    MAINTAINERS: Update address of Andreas Dilger
    ext3: Avoid filesystem corruption after a crash under heavy delete load
    ext3: remove vestiges of nobh support
    ext3: Fix set but unused variables
    quota: clean up quota active checks
    quota: Clean up the namespace in dqblk_xfs.h
    quota: check quota reservation on remove_dquot_ref

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
    fs/dlm: Drop unnecessary null test
    dlm: use genl_register_family_with_ops()

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
    udf: super.c Fix warning: variable 'sbi' set but not used
    udf: remove duplicated #include

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
    [DNS RESOLVER] Minor typo correction
    DNS: Fixes for the DNS query module
    cifs: Include linux/err.h for IS_ERR and PTR_ERR
    DNS: Make AFS go to the DNS for AFSDB records for unknown cells
    DNS: Separate out CIFS DNS Resolver code
    cifs: account for new creduid=0x%x parameter in spnego upcall string
    cifs: reduce false positives with inode aliasing serverino autodisable
    CIFS: Make cifs_convert_address() take a const src pointer and a length
    cifs: show features compiled in as part of DebugData
    cifs: update README

    Fix up trivial conflicts in fs/cifs/cifsfs.c due to workqueue changes

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (55 commits)
    workqueue: mark init_workqueues() as early_initcall()
    workqueue: explain for_each_*cwq_cpu() iterators
    fscache: fix build on !CONFIG_SYSCTL
    slow-work: kill it
    gfs2: use workqueue instead of slow-work
    drm: use workqueue instead of slow-work
    cifs: use workqueue instead of slow-work
    fscache: drop references to slow-work
    fscache: convert operation to use workqueue instead of slow-work
    fscache: convert object to use workqueue instead of slow-work
    workqueue: fix how cpu number is stored in work->data
    workqueue: fix mayday_mask handling on UP
    workqueue: fix build problem on !CONFIG_SMP
    workqueue: fix locking in retry path of maybe_create_worker()
    async: use workqueue for worker pool
    workqueue: remove WQ_SINGLE_CPU and use WQ_UNBOUND instead
    workqueue: implement unbound workqueue
    workqueue: prepare for WQ_UNBOUND implementation
    libata: take advantage of cmwq and remove concurrency limitations
    workqueue: fix worker management invocation without pending works
    ...

    Fixed up conflicts in fs/cifs/* as per Tejun. Other trivial conflicts in
    include/linux/workqueue.h, kernel/trace/Kconfig and kernel/workqueue.c

    Linus Torvalds
     

07 Aug, 2010

27 commits

  • Commit f9d7562fdb9dc0ada3a7aba5dbbe9d965e2a105d "nfsd4: share file
    descriptors between stateid's" didn't correctly account for O_RDWR opens.
    Symptoms include leaked files, resulting in failures to unmount and/or
    warnings about orphaned inodes on reboot.

    Signed-off-by: J. Bruce Fields

    J. Bruce Fields
     
  • …git/tip/linux-2.6-tip

    * 'x86-xsave-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, xsave: Make xstate_enable_boot_cpu() __init, protect on CPU 0
    x86, xsave: Add __init attribute to setup_xstate_features()
    x86, xsave: Make init_xstate_buf static
    x86, xsave: Check cpuid level for XSTATE_CPUID (0x0d)
    x86, xsave: Introduce xstate enable functions
    x86, xsave: Separate fpu and xsave initialization
    x86, xsave: Move boot cpu initialization to xsave_init()
    x86, xsave: 32/64 bit boot cpu check unification in initialization
    x86, xsave: Do not include asm/i387.h in asm/xsave.h
    x86, xsave: Use xsaveopt in context-switch path when supported
    x86, xsave: Sync xsave memory layout with its header for user handling
    x86, xsave: Track the offset, size of state in the xsave layout

    Linus Torvalds
     
  • * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, mce: Use HW_ERR in MCE handler
    x86, mce: Add HW_ERR printk prefix for hardware error logging
    x86, mce: Fix MSR_IA32_MCI_CTL2 CMCI threshold setup
    x86, mce: Rename MSR_IA32_MCx_CTL2 value

    Linus Torvalds
     
  • * 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, olpc: Constify an olpc_ofw() arg
    x86, olpc: Use pr_debug() for EC commands
    x86, olpc: Add comment about implicit optimization barrier
    x86, olpc: Add support for calling into OpenFirmware

    Linus Torvalds
     
  • …kernel/git/tip/linux-2.6-tip

    * 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, alternatives: BUG on encountering an invalid CPU feature number
    x86, alternatives: Fix one more open-coded 8-bit alternative number
    x86, alternatives: Use 16-bit numbers for cpufeature index

    Linus Torvalds
     
  • …inus', 'x86-apic-for-linus', 'x86-fpu-for-linus' and 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

    * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Clean up arch/x86/kernel/cpu/mtrr/cleanup.c: use ";" not "," to terminate statements

    * 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, vmware: Preset lpj values when on VMware.

    * 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, mtrr: Use stop machine context to rendezvous all the cpu's

    * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86/apic/es7000_32: Remove unused variable

    * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Avoid unnecessary __clear_user() and xrstor in signal handling

    * 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, vdso: Unmap vdso pages

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
    console: Fix compilation regression

    Linus Torvalds
     
  • Fix build error caused by a stale security/selinux/av_permissions.h in the $(src)
    directory which will override a more recent version in $(obj) that is it
    appears to strike only when building with a separate object directory.

    Signed-off-by: Ralf Baechle
    Acked-by: Eric Paris
    Signed-off-by: James Morris

    Ralf Baechle
     
  • It's harmless to set this after the server is created, but also
    ineffective, since the value is only used at the time of
    svc_create_pooled(). So fail the attempt, in keeping with the pattern
    set by write_versions, write_{lease,grace}time and write_recoverydir.

    (This could break userspace that tried to write to nfsd/max_block_size
    between setting up sockets and starting the server. However, such code
    wouldn't have worked anyway, and I don't know of any examples--rpc.nfsd
    in nfs-utils, probably the only user of the interface, doesn't do that.)

    Signed-off-by: J. Bruce Fields

    J. Bruce Fields
     
  • Commit 59db4a0c102e0de226a3395dbf25ea51bf845937 "nfsd: move more into
    nfsd_startup()" inadvertently moved nfsd_versions after
    nfsd_create_svc(). On older distributions using an rpc.nfsd that does
    not explicitly set the list of nfsd versions, this results in
    svc-create_pooled() being called with an empty versions array. The
    resulting incomplete initialization leads to a NULL dereference in
    svc_process_common() the first time a client accesses the server.

    Move nfsd_reset_versions() back before the svc_create_pooled(); this
    time, put it closer to the svc_create_pooled() call, to make this
    mistake more difficult in the future.

    Signed-off-by: J. Bruce Fields

    J. Bruce Fields
     
  • Signed-off-by: Andrea Gelmini
    Signed-off-by: J. Bruce Fields

    Andrea Gelmini
     
  • If a callback is retried at nfsd4_cb_recall_done() due to
    some error, the returned rpc reply crashes here:

    @@ -514,6 +514,7 @@ decode_cb_sequence(struct xdr_stream *xdr, struct nfsd4_cb_sequence *res,
    u32 dummy;
    __be32 *p;

    + BUG_ON(!res);
    if (res->cbs_minorversion == 0)
    return 0;

    [BUG_ON added for demonstration]

    This is because the nfsd4_cb_done_sequence() has NULLed out
    the task->tk_msg.rpc_resp pointer.

    Also eventually the rpc would use the new slot without making
    sure it is free by calling nfsd41_cb_setup_sequence().

    This problem was introduced by a 4.1 protocol addition patch:
    [0421b5c5] nfsd41: Backchannel: Implement cb_recall over NFSv4.1

    Which was overlooking the possibility of an RPC callback retries.
    For not-4.1 case redoing the _prepare is harmless.

    Signed-off-by: Boaz Harrosh
    Signed-off-by: J. Bruce Fields

    Boaz Harrosh
     
  • We must create the server before we can call init_socks or check the
    number of threads.

    Symptoms were a NULL pointer dereference in nfsd_svc(). Problem
    identified by Jeff Layton.

    Also fix a minor cleanup-on-error case in nfsd_startup().

    Reported-by: Tetsuo Handa
    Signed-off-by: J. Bruce Fields

    J. Bruce Fields
     
  • A regression of building without CONFIG_HW_CONSOLE was introduced with
    commit b45cfba4e9005d64d419718e7ff7f7cab44c1994 (vt,console,kdb:
    implement atomic console enter/leave functions).

    ERROR: "con_debug_enter" [drivers/serial/kgdboc.ko] undefined!
    ERROR: "vc_cons" [drivers/serial/kgdboc.ko] undefined!
    ERROR: "fg_console" [drivers/serial/kgdboc.ko] undefined!
    ERROR: "con_debug_leave" [drivers/serial/kgdboc.ko] undefined!

    When there is no HW console the con_debug_enter and con_debug_leave
    functions should have no code.

    Signed-off-by: Jason Wessel
    CC: Jesse Barnes
    Reported-by: Randy Dunlap

    Jason Wessel
     
  • * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    xen: Do not suspend IPI IRQs.
    powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts
    ixp4xx-beeper: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupt
    irq: Add new IRQ flag IRQF_NO_SUSPEND

    Linus Torvalds
     
  • …x/kernel/git/tip/linux-2.6-tip

    * 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    um: Fix read_persistent_clock fallout
    kgdb: Do not access xtime directly
    powerpc: Clean up obsolete code relating to decrementer and timebase
    powerpc: Rework VDSO gettimeofday to prevent time going backwards
    clocksource: Add __clocksource_updatefreq_hz/khz methods
    x86: Convert common clocksources to use clocksource_register_hz/khz
    timekeeping: Make xtime and wall_to_monotonic static
    hrtimer: Cleanup direct access to wall_to_monotonic
    um: Convert to use read_persistent_clock
    timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset
    powerpc: Cleanup xtime usage
    powerpc: Simplify update_vsyscall
    time: Kill off CONFIG_GENERIC_TIME
    time: Implement timespec_add
    x86: Fix vtime/file timestamp inconsistencies

    Trivial conflicts in Documentation/feature-removal-schedule.txt

    Much less trivial conflicts in arch/powerpc/kernel/time.c resolved as
    per Thomas' earlier merge commit 47916be4e28c ("Merge branch
    'powerpc.cherry-picks' into timers/clocksource")

    Linus Torvalds
     
  • * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    Documentation: Add timers/timers-howto.txt
    timer: Added usleep_range timer
    Revert "timer: Added usleep[_range] timer"
    clockevents: Remove the per cpu tick skew
    posix_timer: Move copy_to_user(created_timer_id) down in timer_create()
    timer: Added usleep[_range] timer
    timers: Document meaning of deferrable timer

    Linus Torvalds
     
  • KVM ended up having to put a pretty ugly wrapper around set_64bit()
    in order to get the type right. Now set_64bit() takes the expected
    u64 type, and this wrapper can be cleaned up.

    Signed-off-by: H. Peter Anvin
    Cc: Avi Kivity
    LKML-Reference:
    Signed-off-by: Linus Torvalds

    H. Peter Anvin
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
    pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
    pcmcia: do not request windows if you don't need to
    pcmcia: insert PCMCIA device resources into resource tree
    pcmcia: export resource information to sysfs
    pcmcia: use struct resource for PCMCIA devices, part 2
    pcmcia: remove memreq_t
    pcmcia: move local definitions out of include/pcmcia/cs.h
    pcmcia: do not use io_req_t when calling pcmcia_request_io()
    pcmcia: do not use io_req_t after call to pcmcia_request_io()
    pcmcia: use struct resource for PCMCIA devices
    pcmcia: clean up cs.h
    pcmcia: use pcmica_{read,write}_config_byte
    pcmcia: remove cs_types.h
    pcmcia: remove unused flag, simplify headers
    pcmcia: remove obsolete CS_EVENT_ definitions
    pcmcia: split up central event handler
    pcmcia: simplify event callback
    pcmcia: remove obsolete ioctl

    Conflicts in:
    - drivers/staging/comedi/drivers/*
    - drivers/staging/wlags49_h2/wl_cs.c
    due to dev_info_t and whitespace changes

    Linus Torvalds
     
  • * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (30 commits)
    PCI: update for owner removal from struct device_attribute
    PCI: Fix warnings when CONFIG_DMI unset
    PCI: Do not run NVidia quirks related to MSI with MSI disabled
    x86/PCI: use for_each_pci_dev()
    PCI: use for_each_pci_dev()
    PCI: MSI: Restore read_msi_msg_desc(); add get_cached_msi_msg_desc()
    PCI: export SMBIOS provided firmware instance and label to sysfs
    PCI: Allow read/write access to sysfs I/O port resources
    x86/PCI: use host bridge _CRS info on ASRock ALiveSATA2-GLAN
    PCI: remove unused HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_{SIZE|BOUNDARY}
    PCI: disable mmio during bar sizing
    PCI: MSI: Remove unsafe and unnecessary hardware access
    PCI: Default PCIe ASPM control to on and require !EMBEDDED to disable
    PCI: kernel oops on access to pci proc file while hot-removal
    PCI: pci-sysfs: remove casts from void*
    ACPI: Disable ASPM if the platform won't provide _OSC control for PCIe
    PCI hotplug: make sure child bridges are enabled at hotplug time
    PCI hotplug: shpchp: Removed check for hotplug of display devices
    PCI hotplug: pciehp: Fixed return value sign for pciehp_unconfigure_device
    PCI: Don't enable aspm before drivers have had a chance to veto it
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
    slub: Allow removal of slab caches during boot
    Revert "slub: Allow removal of slab caches during boot"
    slub numa: Fix rare allocation from unexpected node
    slab: use deferable timers for its periodic housekeeping
    slub: Use kmem_cache flags to detect if slab is in debugging mode.
    slub: Allow removal of slab caches during boot
    slub: Check kasprintf results in kmem_cache_init()
    SLUB: Constants need UL
    slub: Use a constant for a unspecified node.
    SLOB: Free objects to their own list
    slab: fix caller tracking on !CONFIG_DEBUG_SLAB && CONFIG_TRACING

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (524 commits)
    Staging: wlan-ng: Update prism2_set_tx_power() to use mBm
    Staging: ti-st: update TODO
    Staging: wlags49_h2: use common PCI_VENDOR/DEVICE_ID name format
    Staging: comedi : fix brace coding style issue in wwrap.c
    Staging: quatech_usb2: remove unused qt2_box_flush function
    Staging: slicoss: Remove net_device_stats from the driver's private
    staging: rtl8192su: check whether requests succeeded
    staging: panel: fix error path
    staging: otus: check kmalloc() return value
    staging: octeon: check request_irq() return value
    Staging: wlan-ng: remove typedef in p80211hdr.h
    Staging: wlan-ng: fix checkpatch issues in headers.
    Staging: wlan-ng: remove typedef in p80211ioctl.h
    Staging: wlan-ng: fix style issues in p80211conv.h
    Staging: wlan-ng: fix style issues for p80211hdr.h
    staging: vt6656: removed NTSTATUS definition
    staging: vt6656: simplified tests involving both multi/broad-casts
    Staging: vt6655: replace BOOL with in kernel bool
    Staging: vt6655: replace FALSE with in kernel false
    Staging: vt6655: replace TRUE with in kernel true
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (28 commits)
    driver core: device_rename's new_name can be const
    sysfs: Remove owner field from sysfs struct attribute
    powerpc/pci: Remove owner field from attribute initialization in PCI bridge init
    regulator: Remove owner field from attribute initialization in regulator core driver
    leds: Remove owner field from attribute initialization in bd2802 driver
    scsi: Remove owner field from attribute initialization in ARCMSR driver
    scsi: Remove owner field from attribute initialization in LPFC driver
    cgroupfs: create /sys/fs/cgroup to mount cgroupfs on
    Driver core: Add BUS_NOTIFY_BIND_DRIVER
    driver core: fix memory leak on one error path in bus_register()
    debugfs: no longer needs to depend on SYSFS
    sysfs: Fix one more signature discrepancy between sysfs implementation and docs.
    sysfs: fix discrepancies between implementation and documentation
    dcdbas: remove a redundant smi_data_buf_free in dcdbas_exit
    dmi-id: fix a memory leak in dmi_id_init error path
    sysfs: sysfs_chmod_file's attr can be const
    firmware: Update hotplug script
    Driver core: move platform device creation helpers to .init.text (if MODULE=n)
    Driver core: reduce duplicated code for platform_device creation
    Driver core: use kmemdup in platform_device_add_resources
    ...

    Linus Torvalds
     
  • Commit 69309a059075 ("x86, asm: Clean up and simplify set_64bit()")
    sanitized the x86-64 types to set_64bit(), and incidentally resulted in
    warnings like

    drivers/pci/intr_remapping.c: In function 'modify_irte':
    drivers/pci/intr_remapping.c:314: warning: passing argument 1 of 'set_64bit' from incompatible pointer type
    arch/x86/include/asm/cmpxchg_64.h:6: note:expected 'volatile u64 *' but argument is of type 'long unsigned int *'

    It turns out that the change to set_64bit() really does clean up things,
    and the PCI intr_remapping.c file did a rather ugly cast in order to
    avoid warnings with the previous set_64bit() type model.

    Removing the ugly cast fixes the warning, and makes everybody happy and
    expects a set_64bit() to take the logical "u64 *" argument.

    Pointed-out-by: Peter Anvin
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Mark it as 'experimental' instead, since in practice, NFSv4.1 should now be
    relatively stable.

    Signed-off-by: Trond Myklebust

    Trond Myklebust
     
  • Signed-off-by: Trond Myklebust

    Trond Myklebust
     
  • Add a flag so we know if we mounted the NFS server using the legacy
    binary interface. If we used the legacy interface, then we should not
    show the mountd options.

    Signed-off-by: Bryan Schumaker
    Signed-off-by: Trond Myklebust

    Bryan Schumaker