Skip to content
Commits on Apr 24, 2008
  1. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/x86/linux-2.6-x86-fixes
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
      "make namespacecheck" fixes
      x86: fix compilation error in VisWS
      x86: voyager fix
      x86: Drop duplicate from setup.c
      intel-iommu.c: dma ops fix
    torvalds committed Apr 24, 2008
  2. "make namespacecheck" fixes

    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Ingo Molnar committed Apr 23, 2008
  3. x86: fix compilation error in VisWS

    Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Alexey Starikovskiy committed with Ingo Molnar Apr 21, 2008
  4. x86: voyager fix

    Reported-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Ingo Molnar committed Apr 21, 2008
  5. x86: Drop duplicate from setup.c

    Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Alexey Starikovskiy committed with Ingo Molnar Apr 21, 2008
  6. intel-iommu.c: dma ops fix

    Stephen Rothwell noticed that:
    
    Commit 2be6214 ("x86: dma-ops on highmem
    fix") in Linus' tree introduced a new warning (noticed in the x86_64
    allmodconfig build of linux-next):
    
    drivers/pci/intel-iommu.c:2240: warning: initialization from incompatible pointer type
    
    Which points at an instance of map_single that needs updating.
    
    Fix it to the new prototype.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Ingo Molnar committed Apr 22, 2008
  7. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      [CIFS] Fix typo in previous commit
      [CIFS] Fix define for new proxy cap to match documentation
      [CIFS] Fix UNC path prefix on QueryUnixPathInfo to have correct slash
      [CIFS] Reserve new proxy cap for WAFS
      [CIFS] Add various missing flags and defintions
      [CIFS] make cifs_dfs_automount_list_static
      [CIFS] Fix oops when slow oplock process races with unmount
      [CIFS] Fix acl length when very short ACL being modified by chmod
      [CIFS] Fix looping on reconnect to Samba when unexpected tree connect fail on reconnect
      [CIFS] minor update to change log
    torvalds committed Apr 24, 2008
  8. @torvalds

    RxRPC: Fix a regression in the RXKAD security module

    Fix a regression in the RXKAD security module introduced in:
    
    	commit 91e916c
    	Author: Al Viro <viro@ftp.linux.org.uk>
    	Date:   Sat Mar 29 03:08:38 2008 +0000
    
    	net/rxrpc trivial annotations
    
    A variable was declared as a 16-bit type rather than a 32-bit type.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-with-apologies-by: Al Viro <viro@ZenIV.linux.org.uk>
    Signed-of-by: Linus Torvalds <torvalds@linux-foundation.org>
    David Howells committed with torvalds Apr 24, 2008
  9. @torvalds

    Remove -numa from EXTRAVERSION

    This snuck in through 919ee67
    ("[SPARC64]: Add NUMA support")
    
    Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
    Cc: David S. Miller <davem@davemloft.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Sebastian Siewior committed with torvalds Apr 24, 2008
  10. @torvalds

    Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6

    * git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (80 commits)
      SUNRPC: Invalidate the RPCSEC_GSS session if the server dropped the request
      make nfs_automount_list static
      NFS: remove duplicate flags assignment from nfs_validate_mount_data
      NFS - fix potential NULL pointer dereference v2
      SUNRPC: Don't change the RPCSEC_GSS context on a credential that is in use
      SUNRPC: Fix a race in gss_refresh_upcall()
      SUNRPC: Don't disconnect more than once if retransmitting NFSv4 requests
      SUNRPC: Remove the unused export of xprt_force_disconnect
      SUNRPC: remove XS_SENDMSG_RETRY
      SUNRPC: Protect creds against early garbage collection
      NFSv4: Attempt to use machine credentials in SETCLIENTID calls
      NFSv4: Reintroduce machine creds
      NFSv4: Don't use cred->cr_ops->cr_name in nfs4_proc_setclientid()
      nfs: fix printout of multiword bitfields
      nfs: return negative error value from nfs{,4}_stat_to_errno
      NLM/lockd: Ensure client locking calls use correct credentials
      NFS: Remove the buggy lock-if-signalled case from do_setlk()
      NLM/lockd: Fix a race when cancelling a blocking lock
      NLM/lockd: Ensure that nlmclnt_cancel() returns results of the CANCEL call
      NLM: Remove the signal masking in nlmclnt_proc/nlmclnt_cancel
      ...
    torvalds committed Apr 24, 2008
  11. @torvalds

    Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

    * 'for-linus' of git://linux-nfs.org/~bfields/linux: (52 commits)
      knfsd: clear both setuid and setgid whenever a chown is done
      knfsd: get rid of imode variable in nfsd_setattr
      SUNRPC: Use unsigned loop and array index in svc_init_buffer()
      SUNRPC: Use unsigned index when looping over arrays
      SUNRPC: Update RPC server's TCP record marker decoder
      SUNRPC: RPC server still uses 2.4 method for disabling TCP Nagle
      NLM: don't let lockd exit on unexpected svc_recv errors (try #2)
      NFS: don't let nfs_callback_svc exit on unexpected svc_recv errors (try #2)
      Use a zero sized array for raw field in struct fid
      nfsd: use static memory for callback program and stats
      SUNRPC: remove svc_create_thread()
      nfsd: fix comment
      lockd: Fix stale nlmsvc_unlink_block comment
      NFSD: Strip __KERNEL__ testing from unexported header files.
      sunrpc: make token header values less confusing
      gss_krb5: consistently use unsigned for seqnum
      NFSD: Remove NFSv4 dependency on NFSv3
      SUNRPC: Remove PROC_FS dependency
      NFSD: Use "depends on" for PROC_FS dependency
      nfsd: move most of fh_verify to separate function
      ...
    torvalds committed Apr 24, 2008
  12. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

    * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (452 commits)
      V4L/DVB (7731): tuner-xc2028: fix signal strength calculus
      V4L/DVB (7730): tuner-xc2028: Fix SCODE load for MTS firmwares
      V4L/DVB (7729): Fix VIDIOCGAP corruption in ivtv
      V4L/DVB (7728): tea5761: bugzilla #10462: tea5761 autodetection code were broken
      V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800
      V4L/DVB (7725): cx23885: Add generic cx23417 hardware encoder support
      V4L/DVB (7723): pvrusb2: Clean up input selection list generation in V4L interface
      V4L/DVB (7722): pvrusb2: Implement FM radio support for Gotview USB2.0 DVD 2
      V4L/DVB (7721): pvrusb2: Restructure cx23416 firmware loading to have a common exit point
      V4L/DVB (7720): pvrusb2: Fix bad error code on cx23416 firmware load failure
      V4L/DVB (7719): pvrusb2: Implement input selection enforcement
      V4L/DVB (7718): pvrusb2-dvb: update Kbuild selections
      V4L/DVB (7717): pvrusb2-dvb: add DVB-T support for Hauppauge pvrusb2 model 73xxx
      V4L/DVB (7716): pvrusb2: clean up global functions
      V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__
      V4L/DVB (7714): pvrusb2: Fix hang on module removal
      V4L/DVB (7713): pvrusb2: Implement cleaner DVB kernel thread shutdown
      V4L/DVB (7712): pvrusb2: Close connect/disconnect race
      V4L/DVB (7711): pvrusb2: Fix race on module unload
      V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk for onair devices
      ...
    torvalds committed Apr 24, 2008
  13. Merge branch 'devel'

    Trond Myklebust committed Apr 24, 2008
  14. SUNRPC: Invalidate the RPCSEC_GSS session if the server dropped the r…

    …equest
    
    RFC 2203 requires the server to drop the request if it believes the
    RPCSEC_GSS context is out of sequence. The problem is that we have no way
    on the client to know why the server dropped the request. In order to avoid
    spinning forever trying to resend the request, the safe approach is
    therefore to always invalidate the RPCSEC_GSS context on every major
    timeout.
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Trond Myklebust committed Apr 22, 2008
  15. @mchehab

    V4L/DVB (7731): tuner-xc2028: fix signal strength calculus

    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    mchehab committed Apr 24, 2008
  16. @mchehab

    V4L/DVB (7730): tuner-xc2028: Fix SCODE load for MTS firmwares

    There are different tables for MTS firmwares. This should be taken into
    account while selecting the proper firmware.
    
    While at tuner-xc2028.h, improve some comments.
    
    Thanks to Edward J. Sheldrake <ejs1920@yahoo.co.uk> for helping to
    diagnose such troubles with PAL/I standard.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    mchehab committed Apr 24, 2008
  17. @Alan-Cox @mchehab

    V4L/DVB (7729): Fix VIDIOCGAP corruption in ivtv

    Frank Bennett reported that ivtv was causing skype to crash. With help
    from one of their developers he showed it was a kernel problem.
    VIDIOCGCAP copies a name into a fixed length buffer - ivtv uses names
    that are too long and does not truncate them so corrupts a few bytes of
    the app data area.
    
    Possibly the names also want trimming but for now this should fix the
    corruption case.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Alan-Cox committed with mchehab Apr 20, 2008
  18. @mchehab

    V4L/DVB (7728): tea5761: bugzilla #10462: tea5761 autodetection code …

    …were broken
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    mchehab committed Apr 23, 2008
  19. @mchehab

    V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800

    cx23885: Enable cx23417 support on the HVR1800
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Steven Toth committed with mchehab Jan 13, 2008
  20. @mchehab

    V4L/DVB (7725): cx23885: Add generic cx23417 hardware encoder support

    cx23885: Add generic cx23417 hardware encoder support.
    
    Signed-off-by: Steven Toth <stoth@hauppauge.com>
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Steven Toth committed with mchehab Jan 13, 2008
  21. @mchehab

    V4L/DVB (7723): pvrusb2: Clean up input selection list generation in …

    …V4L interface
    
    Change how list of possible pvrusb2 inputs is generated to include
    only those interfaces that make sense for the interface instance.
    
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 21, 2008
  22. @mchehab

    V4L/DVB (7722): pvrusb2: Implement FM radio support for Gotview USB2.…

    …0 DVD 2
    
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 21, 2008
  23. @mchehab

    V4L/DVB (7721): pvrusb2: Restructure cx23416 firmware loading to have…

    … a common exit point
    
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 21, 2008
  24. @mchehab

    V4L/DVB (7720): pvrusb2: Fix bad error code on cx23416 firmware load …

    …failure
    
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 21, 2008
  25. @mchehab

    V4L/DVB (7719): pvrusb2: Implement input selection enforcement

    In the pvrusb2 driver, different interfaces (e.g. V4L, DVB) have
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 21, 2008
  26. @mkrufky @mchehab

    V4L/DVB (7718): pvrusb2-dvb: update Kbuild selections

    These changes are required with the addition of digital television support
    for the Hauppauge HVR1900 & HVR1950, the OnAir Creator and Sasem USB HDTV
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    mkrufky committed with mchehab Apr 20, 2008
  27. @mkrufky @mchehab

    V4L/DVB (7717): pvrusb2-dvb: add DVB-T support for Hauppauge pvrusb2 …

    …model 73xxx
    
    Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    mkrufky committed with mchehab Apr 19, 2008
  28. @mchehab

    V4L/DVB (7716): pvrusb2: clean up global functions

    This patch contains the following cleanups:
    - make the following needlessly global function static:
      - pvr2_hdw_set_cur_freq()
    - #if 0 the following unused global functions:
      - pvr2_hdw_get_state_name()
      - pvr2_hdw_get_debug_info_unlocked()
      - pvr2_hdw_get_debug_info_locked()
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Adrian Bunk committed with mchehab Apr 18, 2008
  29. @mchehab

    V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__

    Apparently the kernel developers no longer consider it proper
    etiquette to use __FUNCTION__; everyone must instead use __func__
    (even though it breaks with older compilers).  And worse still, actual
    effort is being expended to sweep this change throughout the kernel
    source tree.  Don't these people have better things to do?  So...
    Completely clean out all use of __FUNCTION__ from the pvrusb2 driver
    (it was just in the sysfs interface).  I'm not going to use __func__
    either.  So there.
    
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 9, 2008
  30. @mchehab

    V4L/DVB (7714): pvrusb2: Fix hang on module removal

    The pvrusb2 driver was getting had by this scenario:
    
    1. Task A calls kthread_stop() for task B.
    2. Before exiting, then Task B calls kthread_stop() for task C.
    
    The problem is, kthread_stop() wants to allocate an internal resource
    to itself (i.e. acquire a lock), which won't be released until
    kthread_stop() returns.  But kthread_stop() won't return until task B
    is dead.  But task B won't die until it finishes its call to
    kthread_stop() for task C, and that will block waiting on the resource
    already allocated inside task A.  Deadlock.
    
    With the pvrusb2 driver, task A is the caller to pvr_exit(), task B is
    the control thread run inside of pvrusb2-context.c, and task C is any
    worker thread run inside of pvrusb2-hdw.c.
    
    This problem got introduced by the previous threading setup change,
    which was itself an attempt to fix a module tear-down race (which it
    actually did fix).  The lesson here is that a task being waited on as
    part of a kthread_stop() simply cannot be allow to also issue a
    kthread_stop() - or we make sure not to issue the enclosing
    kthread_stop() until we know that the inner kthread_stop() has
    completed first.  The solution for the pvrusb2 driver is some hackish
    code which changes the main control thread tear down into a two step
    process.  This then makes it possible to delay issuing the
    kthread_stop() on the control thread until after we know that
    everything has been torn down first.  (And yes, we really need that
    kthread_stop() because it's the only way to safely guarantee that a
    module-referencing kernel thread has safely returned back out of the
    module before we finally remove the module.)
    
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 9, 2008
  31. @mchehab

    V4L/DVB (7713): pvrusb2: Implement cleaner DVB kernel thread shutdown

    Earlier fix to handle DVB feed thread aborts was overly-aggressive.
    We can take better advantage of what kthread_stop() can do.  This
    change simplifies things.
    
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 7, 2008
  32. @mchehab

    V4L/DVB (7712): pvrusb2: Close connect/disconnect race

    If a disconnect happens before initialization is completed, the
    pvrusb2 driver can accidentally touch dangling pointers.  The whole
    initialization function must be protected by the big_lock, and once
    inside that lock, the initialization function should abort if it is
    discovered that a disconnect has already taken place.
    
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 7, 2008
  33. @mchehab

    V4L/DVB (7711): pvrusb2: Fix race on module unload

    The pvrusb2 driver - for basically forever - was not enforcing a
    proper module tear-down.  Kernel threads are used inside the driver
    and all must be gone before the module can be safely removed.  This
    changeset reimplements a chunk of pvrusb2-context.c to enforce this
    correctly.  Unfortunately this is not a simple fix.  The new
    implementation also cuts back on kernel thread usage; instead of there
    being 1 control thread per instance now it's just 1 control thread
    shared by all instances.  (By dropping to a single thread then the
    module exit function can block on its shutdown and the thread itself
    can monitor and cleanly shut down all of the other instances first.)
    
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 7, 2008
  34. @mchehab

    V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk f…

    …or onair devices
    
    Implement timed measurement of encoder operation for the first time it
    is run.  This allows the driver to note when the encoder has been run
    successfully for at least 1/4 second.  On top of that implement
    various bits to ensure that the encoder has been run once before
    digital streaming for OnAir devices.  This is done via several core
    state machine tweaks.
    
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 6, 2008
  35. @mchehab

    V4L/DVB (7709): pvrusb2: New device attribute for encoder usage in di…

    …gital mode
    
    Some tuners seem to not work in digital mode unless the encoder is
    healthy.  Implement a device attribute to represent this flag and
    modify the core state machines to enforce this requirement.
    
    Signed-off-by: Mike Isely <isely@pobox.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
    Mike Isely committed with mchehab Apr 3, 2008
Something went wrong with that request. Please try again.