1. 27 Feb, 2010 12 commits
    • Christian Kujau's avatar
      Remove EXPERIMENTAL from NFS_FSCACHE · 4912002f
      Christian Kujau authored
      There's currently an open Ubuntu bug[0], with the intent to compile NFS_FSCACHE
      (and possibly AFS_FSCACHE, 9P_FSCACHE) into the standard Ubuntu kernel.
      However, since *_FSCACHE still depends on EXPERIMENTAL, this won't happen.
      
      As Arjan van de Ven pointed out[1], the EXPERIMENTAL flag doesn't mean that
      much any more, I propose the following patch to fs/nfs/Kconfig.  I'd do the
      same for fs/9p/Kconfig and fs/afs/Kconfig, but as I did not test 9p or AFS, I
      feel it would not be appropriate for me to remove the flag.
      
      [0] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/440522/comments/5
      [1] http://lkml.org/lkml/2010/1/23/145Signed-off-by: default avatarChristian Kujau <lists@nerdbynature.de>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4912002f
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of... · 98723153
      Linus Torvalds authored
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
        toshiba_acpi: Add full hotkey support
        hp-wmi: Add support for tablet rotation key
        dell-laptop: Add another Dell laptop to the DMI whitelist
        classmate-laptop: use a single MODULE_DEVICE_TABLE to get correct aliases
        dell-laptop: Pay attention to which devices the hardware switch controls
        dell-laptop: Use buffer with 32-bit physical address
        dell-laptop: Blacklist machines not supporting dell-laptop
        dell-laptop: Block software state changes when rfkill hard blocked
        dell-laptop: Fix small memory leak
        dell-laptop: Fix platform device unregistration
        dell-laptop: Update rfkill state on kill switch
        compal-laptop: Replace sysfs support with rfkill support
        compal-laptop: Add support for known Compal made Dell laptops
        MAINTAINERS: update drivers/platform/x86 information
      98723153
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm · 4cbd5518
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
        dlm: use bastmode in debugfs output
        dlm: Send lockspace name with uevents
        dlm: send reply before bast
        dlm: fix ordering of bast and cast
      4cbd5518
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · b305956a
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (52 commits)
        fs/xfs: Correct NULL test
        xfs: optimize log flushing in xfs_fsync
        xfs: only clear the suid bit once in xfs_write
        xfs: kill xfs_bawrite
        xfs: log changed inodes instead of writing them synchronously
        xfs: remove invalid barrier optimization from xfs_fsync
        xfs: kill the unused XFS_QMOPT_* flush flags V2
        xfs: Use delay write promotion for dquot flushing
        xfs: Sort delayed write buffers before dispatch
        xfs: Don't issue buffer IO direct from AIL push V2
        xfs: Use delayed write for inodes rather than async V2
        xfs: Make inode reclaim states explicit
        xfs: more reserved blocks fixups
        xfs: turn off sign warnings
        xfs: don't hold onto reserved blocks on remount,ro
        xfs: quota limit statvfs available blocks
        xfs: replace KM_LARGE with explicit vmalloc use
        xfs: cleanup up xfs_log_force calling conventions
        xfs: kill XLOG_VEC_SET_TYPE
        xfs: remove duplicate buffer flags
        ...
      b305956a
    • Linus Torvalds's avatar
      Merge branch 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6 · 41630959
      Linus Torvalds authored
      * 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6:
        ibft: Update MAINTAINERS file.
        drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4
      41630959
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 2b8c70b2
      Linus Torvalds authored
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (362 commits)
        V4L-DVB: cx88-dvb: remove extra attribution for core
        V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index
        V4L/DVB: Add support for SMT7020 to cx88
        V4L/DVB: radio-si470x: Use UTF-8 encoding on a comment
        V4L/DVB: MAINTAINERS: Telegent tlg2300 section fix
        V4L/DVB: gspca_stv06xx: Add support for camera button
        V4L/DVB: gspca_ov519: add support for the button on ov511 based cams
        V4L/DVB: gspca_ov519: Add support for the button on ov518 based cams
        V4L/DVB: gspca_ov519: add support for the button on ov519 based cams
        V4L/DVB: gspca_main: Fix a compile error when CONFIG_INPUT is not set
        V4L/DVB: gspca_main: some input error handling fixes
        V4L/DVB: gspca_main: Allow use of input device creation code for non int. inputs
        V4L/DVB: gspca_pac7302: much improved exposure control
        V4L/DVB: gspca_sonixb: Make sonixb driver handle pas106 and pas202 cameras
        V4L/DVB: gspca_sonixb: pas106: fixup bright ctrl and add gain and exposure ctrls
        V4L/DVB: Documentation: gspca.txt: update known mr97310a cams
        V4L/DVB: gspca_mr97310a: add support for the Sakar 1638x CyberPix
        V4L/DVB: gscpa_sonixb: limit ov7630 max framerate at 640x480
        V4L/DVB: gspca_sonixb: pas202: fixup brightness ctrl and add gain and exposure ctrls
        V4L/DVB: gscpa_sonixb: Differentiate between sensors with a coarse and fine expo ctrl
        ...
      2b8c70b2
    • Ang Way Chuang's avatar
      dvb-core: Fix DoS bug in ULE decapsulation code that can be triggered by an invalid Payload Pointer · 29e1fa35
      Ang Way Chuang authored
      ULE (Unidirectional Lightweight Encapsulation RFC 4326) decapsulation
      has a bug that causes endless loop when Payload Pointer of MPEG2-TS
      frame is 182 or 183.  Anyone who sends malicious MPEG2-TS frame will
      cause the receiver of ULE SNDU to go into endless loop.
      
      This patch was generated and tested against linux-2.6.32.9 and should
      apply cleanly to linux-2.6.33 as well because there was only one typo
      fix to dvb_net.c since v2.6.32.
      
      This bug was brought to you by modern day Santa Claus who decided to
      shower the satellite dish at Keio University with heavy snow causing
      huge burst of errors.  We, receiver end, received Santa Claus's gift in
      the form of kernel bug.
      
      Care has been taken not to introduce more bug by fixing this bug, but
      please scrutinize the code for I always produces buggy code.
      Signed-off-by: default avatarAng Way Chuang <wcang79@gmail.com>
      Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      29e1fa35
    • Linus Torvalds's avatar
      Merge branch 'kmemcheck-for-linus' of... · 2594a57a
      Linus Torvalds authored
      Merge branch 'kmemcheck-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
      
      * 'kmemcheck-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        kmemcheck: Test the full object in kmemcheck_is_obj_initialized()
      2594a57a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt · f24407d2
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt:
        xfs: fix xfs to work with Virtually Indexed architectures
        sh: add mm API for DMA to vmalloc/vmap areas
        arm: add mm API for DMA to vmalloc/vmap areas
        parisc: add mm API for DMA to vmalloc/vmap areas
        mm: add coherence API for DMA to vmalloc/vmap areas
      f24407d2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 · 65445174
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (158 commits)
        [SCSI] Fix printing of failed 32-byte commands
        [SCSI] Fix printing of variable length commands
        [SCSI] libsrp: fix bug in ADDITIONAL CDB LENGTH interpretation
        [SCSI] scsi_dh_alua: Add IBM Power Virtual SCSI ALUA device to dev list
        [SCSI] scsi_dh_alua: add netapp to dev list
        [SCSI] qla2xxx: Update version number to 8.03.02-k1.
        [SCSI] qla2xxx: EEH: Restore PCI saved state during pci slot reset.
        [SCSI] qla2xxx: Add firmware ETS burst support.
        [SCSI] qla2xxx: Correct loop-resync issues during SNS scans.
        [SCSI] qla2xxx: Correct use-after-free issue in terminate_rport_io callback.
        [SCSI] qla2xxx: Correct EH bus-reset handling.
        [SCSI] qla2xxx: Proper clean-up of BSG requests when request times out.
        [SCSI] qla2xxx: Initialize payload receive length in failure path of vendor commands
        [SCSI] fix duplicate removal on error path in scsi_sysfs_add_sdev
        [SCSI] fix refcounting bug in scsi_get_host_dev
        [SCSI] fix memory leak in scsi_report_lun_scan
        [SCSI] lpfc: correct PPC build failure
        [SCSI] raid_class: add raid1e
        [SCSI] mpt2sas: Do not call sas_is_tlr_enabled for RAID volumes.
        [SCSI] zfcp: Introduce header file for qdio structs and inline functions
        ...
      65445174
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · 64d497f5
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (187 commits)
        sh: remove dead LED code for migo-r and ms7724se
        sh: ecovec build fix for CONFIG_I2C=n
        sh: ecovec r-standby support
        sh: ms7724se r-standby support
        sh: SH-Mobile R-standby register save/restore
        clocksource: Fix up a registration/IRQ race in the sh drivers.
        sh: ms7724: modify scan_timing for KEYSC
        sh: ms7724: Add sh_sir support
        sh: mach-ecovec24: Add sh_sir support
        sh: wire up SET/GET_UNALIGN_CTL.
        sh: allow alignment fault mode to be configured at kernel boot.
        sh: sh7724: Update FSI/SPU2 clock
        sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec
        sh: add sh7724 kick callback to clk_div4_table
        sh: introduce struct clk_div4_table
        sh: clock-cpg div4 set_rate() shift fix
        sh: Turn on speculative return for SH7785 and SH7786
        sh: Merge legacy and dynamic PMB modes.
        sh: Use uncached I/O helpers in PMB setup.
        sh: Provide uncached I/O helpers.
        ...
      64d497f5
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 37d40084
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)
        crypto: aes_generic - Fix checkpatch errors
        crypto: fcrypt - Fix checkpatch errors
        crypto: ecb - Fix checkpatch errors
        crypto: des_generic - Fix checkpatch errors
        crypto: deflate - Fix checkpatch errors
        crypto: crypto_null - Fix checkpatch errors
        crypto: cipher - Fix checkpatch errors
        crypto: crc32 - Fix checkpatch errors
        crypto: compress - Fix checkpatch errors
        crypto: cast6 - Fix checkpatch errors
        crypto: cast5 - Fix checkpatch errors
        crypto: camellia - Fix checkpatch errors
        crypto: authenc - Fix checkpatch errors
        crypto: api - Fix checkpatch errors
        crypto: anubis - Fix checkpatch errors
        crypto: algapi - Fix checkpatch errors
        crypto: blowfish - Fix checkpatch errors
        crypto: aead - Fix checkpatch errors
        crypto: ablkcipher - Fix checkpatch errors
        crypto: pcrypt - call the complete function on error
        ...
      37d40084
  2. 26 Feb, 2010 28 commits