Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.38-rc3
Commits on Feb 1, 2011
  1. @torvalds

    Linux 2.6.38-rc3

    torvalds authored
Commits on Jan 31, 2011
  1. @torvalds

    Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/n…

    torvalds authored
    …fs-2.6
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      NFS: NFSv4 readdir loses entries
      NFS: Micro-optimize nfs4_decode_dirent()
      NFS: Fix an NFS client lockdep issue
      NFS construct consistent co_ownerid for v4.1
      NFS: nfs_wcc_update_inode() should set nfsi->attr_gencount
      NFS improve pnfs_put_deviceid_cache debug print
      NFS fix cb_sequence error processing
      NFS do not find client in NFSv4 pg_authenticate
      NLM: Fix "kernel BUG at fs/lockd/host.c:417!" or ".../host.c:283!"
      NFS: Prevent memory allocation failure in nfsacl_encode()
      NFS: nfsacl_{encode,decode} should return signed integer
      NFS: Fix "kernel BUG at fs/nfs/nfs3xdr.c:1338!"
      NFS: Fix "kernel BUG at fs/aio.c:554!"
      NFS4: Avoid potential NULL pointer dereference in decode_and_add_ds().
      NFS: fix handling of malloc failure during nfs_flush_multi()
  2. @torvalds

    Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds authored
    * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: smp_on_up: allow non-ARM SMP processors
      ARM: io: ensure inb/outb() et.al. are properly ordered on ARMv6+
      ARM: initrd: disable initrd if passed address overlaps reserved region
      ARM: footbridge: fix debug macros
      ARM: mmci: round down the bytes transferred on error
      ARM: mmci: complete the transaction on error
      ARM: 6642/1: mmci: calculate remaining bytes at error correctly
  3. @torvalds

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

    torvalds authored
    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR
      arm: omap2: mux: fix compile warning
      omap1: Simplify use of omap_irq_flags
      omap2+: Fix unused variable warning for omap_irq_base
  4. @torvalds

    kernel.h: fix kernel-doc warning

    Randy Dunlap authored torvalds committed
    Fix kernel-doc warning in kernel.h from commit 7ef88ad
    ("BUILD_BUG_ON: make it handle more cases"):
    
      Warning(include/linux/kernel.h:605): No description found for parameter 'condition'
      Warning(include/linux/kernel.h:605): Excess function parameter 'cond' description in 'BUILD_BUG_ON'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

    torvalds authored
    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      xfs: xfs_bmap_add_extent_delay_real should init br_startblock
      xfs: fix dquot shaker deadlock
      xfs: handle CIl transaction commit failures correctly
      xfs: limit extsize to size of AGs and/or MAXEXTLEN
      xfs: prevent extsize alignment from exceeding maximum extent size
      xfs: limit extent length for allocation to AG size
      xfs: speculative delayed allocation uses rounddown_power_of_2 badly
      xfs: fix efi item leak on forced shutdown
      xfs: fix log ticket leak on forced shutdown.
  6. @mstsirkin @torvalds

    virtio: update MAINTAINERS

    mstsirkin authored torvalds committed
    Patches should keep coming through Rusty but it helps if I'm Cc'd as
    well.
    
    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

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

    torvalds authored
    …/git/gregkh/usb-2.6
    
    * 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (42 commits)
      usb: gadget: composite: avoid access beyond array max length
      USB: serial: handle Data Carrier Detect changes
      USB: gadget: Fix endpoint representation in ci13xxx_udc
      USB: gadget: Fix error path in ci13xxx_udc gadget probe function
      usb: pch_udc: Fix the worning log issue at gadget driver remove
      USB: serial: Updated support for ICOM devices
      USB: ehci-mxc: add work-around for efika mx/sb bug
      USB: unbreak ehci-mxc on otg port of i.MX27
      drivers: update to pl2303 usb-serial to support Motorola cables
      USB: adding USB support for Cinterion's HC2x, EU3 and PH8 products
      USB serial: add missing .usb_driver field in serial drivers
      USB: ehci-fsl: Fix 'have_sysif_regs' detection
      USB: g_printer: fix bug in module parameter definitions
      USB: g_printer: fix bug in unregistration
      USB: uss720: remove duplicate USB device
      MAINTAINERS: add ueagle-atm entry
      USB: EHCI: fix DMA deallocation bug
      USB: pch_udc: support new device ML7213 IOH
      usb: pch_udc: Fixed issue which does not work with g_serial
      usb: set ep_dev async suspend should be later than device_initialize
      ...
  8. @torvalds

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

    torvalds authored
    …rnel/git/gregkh/staging-2.6
    
    * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (26 commits)
      staging: r8712u: Add new device IDs
      staging: brcm80211: fix suspend/resume issue in brcmsmac
      staging: brcm80211: remove assert to avoid panic since 2.6.37 kernel
      Staging: iio: Aditional fixpoint formatted output bugfix
      staging: usbip: vhci: use urb->dev->portnum to find port
      staging: usbip: vhci: handle EAGAIN from SO_RCVTIMEO
      staging: usbip: vhci: friendly log messages for connection errors
      staging: usbip: vhci: refuse to enqueue for dead connections
      staging: usbip: vhci: give back URBs from in-flight unlink requests
      staging: usbip: vhci: update reference count for usb_device
      staging: usbip: stub: update refcounts for devices and interfaces
      staging: tidspbridge: replace mbox callback with notifier_call
      staging: comedi: ni_labpc: Use shared IRQ for PCMCIA card
      Staging: speakup: &&/|| confusion in silent_store()
      iio: Fixpoint formatted output bugfix
      staging: rt2860: Fix incorrect netif_stop_queue usage warning
      staging: r8712u: Fix memory leak in firmware loading
      staging: tidspbridge: configure full L1 MMU range
      staging: rt2870sta: Add ID for Linksys WUSB100v2
      Staging: xgfib: put parenthesis in the right place
      ...
  9. @torvalds

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

    torvalds authored
    …/git/gregkh/tty-2.6
    
    * 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
      tty/serial: fix apbuart build
      n_hdlc: fix read and write locking
      serial: unbreak billionton CF card
      tty: use for_each_console() and WARN() on sysfs failures
      vt: fix issue when fbcon wants to takeover a second time.
    
    Fix up trivial conflict in drivers/tty/tty_io.c
  10. ARM: smp_on_up: allow non-ARM SMP processors

    Russell King authored
    Allow non-ARM SMP processors to use the SMP_ON_UP feature.  CPUs
    supporting SMP must have the new CPU ID format, so check for this first.
    Then check for ARM11MPCore, which fails the MPIDR check.  Lastly check
    the MPIDR reports multiprocessing extensions and that the CPU is part of
    a multiprocessing system.
    
    Cc: <stable@kernel.org>
    Reported-and-Tested-by: Stephen Boyd <sboyd@codeaurora.org>
    Acked-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  11. ARM: io: ensure inb/outb() et.al. are properly ordered on ARMv6+

    Russell King authored
    Ensure that the ISA/PCI IO space accessors are properly ordered on
    ARMv6+ architectures.  These should always be ordered with respect to
    all other accesses.
    
    This also fixes __iormb() and __iowmb() not being visible to ioread/
    iowrite if a platform defines its own MMIO accessors.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  12. ARM: initrd: disable initrd if passed address overlaps reserved region

    Russell King authored
    Disable the initrd if the passed address already overlaps the reserved
    region.  This avoids oopses on Netwinders when NeTTrom tells the kernel
    that an initrd is located at mem+4MB, but this overlaps the BSS,
    resulting in the kernels in-use BSS being freed.
    
    This should be applied to v2.6.37-stable.
    
    Cc: <stable@kernel.org>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  13. ARM: footbridge: fix debug macros

    Russell King authored
    0ea1293 (arm: return both physical and virtual addresses from addruart)
    changed the way the 'addruart' worked, making it return both the virt
    and phys addresses.  Unfortunately, for footbridge, these were reversed.
    Fix that.  Tested on Netwinder.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  14. ARM: mmci: round down the bytes transferred on error

    Russell King authored
    We should not report incomplete blocks on error.  Return the number of
    bytes successfully transferred, rounded down to the nearest block.
    
    Acked-by: Linus Walleij <linus.walleij@stericsson.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  15. ARM: mmci: complete the transaction on error

    Russell King authored
    When we encounter an error, make sure we complete the transaction
    otherwise we'll leave the request dangling.
    
    Acked-by: Linus Walleij <linus.walleij@stericsson.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  16. @torvalds

    Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

    torvalds authored
    * 'for-linus' of git://git.infradead.org/ubi-2.6:
      Revert "UBI: use mtd->writebufsize to set minimal I/O unit size"
  17. @dtor @torvalds

    Input: rc-keymap - return KEY_RESERVED for unknown mappings

    dtor authored torvalds committed
    Do not respond with -EINVAL to EVIOCGKEYCODE for not-yet-mapped
    scancodes, but rather return KEY_RESERVED.
    
    This fixes breakage with Ubuntu's input-kbd utility that stopped
    returning full keymaps for remote controls.
    
    Tested-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Tested-by: Mark Lord <kernel@teksavvy.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. @torvalds

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

    torvalds authored
    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: synaptics - retry failed resets when reconnecting
      Input: synaptics - fix reconnect logic on MT devices
      Input: tegra-kbc - fix keymap entry for LeftMeta key
      Input: tegra-kbc - fix build error
  19. @torvalds

    Fix prlimit64 for suid/sgid processes

    Kacper Kornet authored torvalds committed
    Since check_prlimit_permission always fails in the case of SUID/GUID
    processes, such processes are not able to read or set their own limits.
    This commit changes this by assuming that process can always read/change
    its own limits.
    
    Signed-off-by: Kacper Kornet <kornet@camk.edu.pl>
    Acked-by: Jiri Slaby <jslaby@suse.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  20. @torvalds

    intel_scu_ipc: remove duplicated #include

    Huang Weiyi authored torvalds committed
    Remove duplicated #include('s) in
      drivers/platform/x86/intel_scu_ipc.c
    
    Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. @torvalds

    NTFS: Fix invalid pointer dereference in ntfs_mft_record_alloc().

    Anton Altaparmakov authored torvalds committed
    In ntfs_mft_record_alloc() when mapping the new extent mft record with
    map_extent_mft_record() we overwrite @m with the return value and on
    error, we then try to use the old @m but that is no longer there as @m
    now contains an error code instead so we crash when dereferencing the
    error code as if it were a pointer.
    
    The simple fix is to use a temporary variable to store the return value
    thus preserving the original @m for later use.  This is a backport from
    the commercial Tuxera-NTFS driver and is well tested...
    
    Thanks go to Julia Lawall for pointing this out (whilst I had fixed it
    in the commercial driver I had failed to fix it in the Linux kernel).
    
    Signed-off-by: Anton Altaparmakov <anton@tuxera.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22. @torvalds

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

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: More crypto cleanup (try #2)
      CIFS: Add strictcache mount option
      CIFS: Implement cifs_strict_writev (try #4)
      [CIFS] Replace cifs md5 hashing functions with kernel crypto APIs
  23. @torvalds

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

    torvalds authored
    …/git/cmarinas/linux-2.6-cm
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm:
      kmemleak: Allow kmemleak metadata allocations to fail
      kmemleak: remove memset by using kzalloc
  24. @torvalds

    Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds authored
    …it/jgarzik/misc-2.6
    
    * 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
      Delete zero-length drivers/staging/vme/bridges/Module.symvers
  25. @torvalds

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

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: HDA: Fix automute on Thinkpad L412/L512
      ALSA: HDA: Fix dmesg output of HDMI supported bits
      ALSA: fix invalid hardware.h include in ac97c for AVR32 architecture
      ASoC: correct link specifications for corgi, poodle and spitz
      ASoC: Samsung: Fix outdated cpu_dai_name for s3c24xx i2s
      ASoC: Fix codec device id format used by some dai_links
      ALSA: azt3328 -  fix broken AZF_FMT_XLATE macro
      ALSA: Xonar, CS43xx: Don't overrun static array
      ASoC: Handle low measured DC offsets for wm_hubs devices
      ASoC: da8xx/omap-l1xx: match codec_name with i2c ids
      ASoC: WM8994: fix wrong value in tristate function
      ASoC: WM8995: Fix incorrect use of snd_soc_update_bits()
  26. @torvalds

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

    torvalds authored
    …ernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      libata: set queue DMA alignment to sector size for ATAPI too
      libata: DVR-212D can't do SETXFER DVD-RW DVR-212D
      ahci: add HFLAG_YES_FBS and apply it to 88SE9128
      pata_hpt37x: inherit prereset() method for HPT374
      ahci: AHCI mode SATA patch for Intel DH89xxCC DeviceIDs
      pata_hpt37x: fold 'if' statement into 'switch'
      pata_hpt{37x|3x2n}: use pr_*(DRV_NAME ...) instead of printk(KERN_* ...)
      pata_hpt{366|37x}: use pr_warning(...) instead of printk(KERN_WARNING ...)
      pata_mpc52xx: inherit from ata_bmdma_port_ops
  27. @torvalds

    Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra

    torvalds authored
    * 'for-linus' of git://android.git.kernel.org/kernel/tegra:
      ARM: tegra: clock: Add forward reference to struct clk
      ARM: tegra: irq: Rename gic pointers to avoid conflicts
      arm/tegra: Fix tegra irq_data conversion
Commits on Jan 29, 2011
  1. Revert "UBI: use mtd->writebufsize to set minimal I/O unit size"

    Artem Bityutskiy authored
    This reverts commit a121f64.
    
    Unfortunately, this commit breaks UBIFS backward compatibility and
    makes new UBIFS refuse older UBIFS-formatted media:
    
    UBIFS error: validate_sb: min. I/O unit mismatch: 8 in superblock, 64 real
    
    Thus, we have to revert this patch and work on a better solution.
    
    Reported-by: Holger Brunck <holger.brunck@keymile.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
  2. @alexandref75 @dtor

    Input: synaptics - retry failed resets when reconnecting

    alexandref75 authored dtor committed
    On some machines, like Dell Studio XPS 16 (1640), touchpad fails to
    respond to the standard query after first reset but may start
    responding later, so let's repeat reset sequence several (3) times.
    
    Signed-off-by: Alexandre Peixoto Ferreira <alexandref75@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  3. @alexandref75 @dtor

    Input: synaptics - fix reconnect logic on MT devices

    alexandref75 authored dtor committed
    synaptics_set_advanced_gesture_mode() affect capabilities bits we should
    perform comparison after calling this function, otherwise they will never
    match and we will be forced to perform full reconnect.
    
    Signed-off-by: Alexandre Peixoto Ferreira <alexandref75@gmail.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  4. @dtor

    Input: tegra-kbc - fix keymap entry for LeftMeta key

    Rakesh Iyer authored dtor committed
    Correct key mapping for Left Meta key.
    
    Signed-off-by: Rakesh Iyer <riyer@nvidia.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  5. @dtor

    Input: tegra-kbc - fix build error

    Rakesh Iyer authored dtor committed
    Fix build error introduced by variable name change.
    
    Signed-off-by: Rakesh Iyer <riyer@nvidia.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Commits on Jan 28, 2011
  1. @chucklever

    NFS: NFSv4 readdir loses entries

    chucklever authored Trond Myklebust committed
    On recent 2.6.38-rc kernels, connectathon basic test 6 fails on
    NFSv4 mounts of OpenSolaris with something like:
    
    > ./test6: readdir
    > 	./test6: (/mnt/klimt/matisse.test) didn't read expected 'file.12' dir entry, pass 0
    > 	./test6: (/mnt/klimt/matisse.test) didn't read expected 'file.82' dir entry, pass 0
    > 	./test6: (/mnt/klimt/matisse.test) didn't read expected 'file.164' dir entry, pass 0
    > 	./test6: (/mnt/klimt/matisse.test) Test failed with 3 errors
    > basic tests failed
    > Tests failed, leaving /mnt/klimt mounted
    > [cel@matisse cthon04]$
    
    I narrowed the problem down to nfs4_decode_dirent() reporting that the
    decode buffer had overflowed while decoding the entries for those
    missing files.
    
    verify_attr_len() assumes both it's pointer arguments reside on the
    same page.  When these arguments point to locations on two different
    pages, verify_attr_len() can report false errors.  This can happen now
    that a large NFSv4 readdir result can span pages.
    
    We have reasonably good checking in nfs4_decode_dirent() anyway, so
    it should be safe to simply remove the extra checking.
    
    At a guess, this was introduced by commit 6650239, "NFS: Don't use
    vm_map_ram() in readdir".
    
    Cc: stable@kernel.org [2.6.37]
    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  2. @chucklever

    NFS: Micro-optimize nfs4_decode_dirent()

    chucklever authored Trond Myklebust committed
    Make the decoding of NFSv4 directory entries slightly more efficient
    by:
    
      1.  Avoiding unnecessary byte swapping when checking XDR booleans,
          and
    
      2.  Not bumping "p" when its value will be immediately replaced by
          xdr_inline_decode()
    
    This commit makes nfs4_decode_dirent() consistent with similar logic
    in the other two decode_dirent() functions.
    
    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Something went wrong with that request. Please try again.