Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 29, 2010
  1. @torvalds

    Linux 2.6.36-rc3

    torvalds authored
  2. @torvalds

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

    torvalds authored
    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: ohci: work around VIA and NEC PHY packet reception bug
      firewire: core: do not use del_timer_sync() in interrupt context
      firewire: net: fix unicast reception RCODE in failure paths
      firewire: sbp2: fix stall with "Unsolicited response"
      firewire: sbp2: fix memory leak in sbp2_cancel_orbs or at send error
      ieee1394: Adjust confusing if indentation
  3. firewire: ohci: work around VIA and NEC PHY packet reception bug

    Stefan Richter authored
    VIA VT6306, VIA VT6308, and NEC OrangeLink controllers do not write
    packet event codes for received PHY packets (or perhaps write
    evt_no_status, hard to tell).  Work around it by overwriting the
    packet's ACK by ack_complete, so that upper layers that listen to PHY
    packet reception get to see these packets.
    
    (Also tested:  TI TSB82AA2, TI TSB43AB22/A, TI XIO2213A, Agere FW643,
    JMicron JMB381 --- these do not exhibit this bug.)
    
    Clemens proposed a quirks flag for that, IOW whitelist known misbehaving
    controllers for this workaround.  Though to me it seems harmless enough
    to enable for all controllers.
    
    The log_ar_at_event() debug log will continue to show the original
    status from the DMA unit.
    
    Reported-by: Clemens Ladisch <clemens@ladisch.de> (VT6308)
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Commits on Aug 28, 2010
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      net/ipv4: Eliminate kstrdup memory leak
      net/caif/cfrfml.c: use asm/unaligned.h
      ax25: missplaced sock_put(sk)
      qlge: reset the chip before freeing the buffers
      l2tp: test for ethernet header in l2tp_eth_dev_recv()
      tcp: select(writefds) don't hang up when a peer close connection
      tcp: fix three tcp sysctls tuning
      tcp: Combat per-cpu skew in orphan tests.
      pxa168_eth: silence gcc warnings
      pxa168_eth: update call to phy_mii_ioctl()
      pxa168_eth: fix error handling in prope
      pxa168_eth: remove unneeded null check
      phylib: Fix race between returning phydev and calling adjust_link
      caif-driver: add HAS_DMA dependency
      3c59x: Fix deadlock between boomerang_interrupt and boomerang_start_tx
      qlcnic: fix poll implementation
      netxen: fix poll implementation
      bridge: netfilter: fix a memory leak
  2. @torvalds

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

    torvalds authored
    …/git/vapier/blackfin
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
      Blackfin: bf52x/bf54x boards: drop unused nand page size
      Blackfin: punt duplicate SPORT MMR defines
  3. @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: pcm: add more format names
      sound: oss: fix uninitialized spinlock
      ALSA: asihpi - Return hw error directly from oustream_write.
      ASoC: soc-core: fix debugfs_pop_time file permissions
      ALSA: hda - Add Sony VAIO quirk for ALC269
  4. @torvalds

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

    torvalds authored
    …nux/kernel/git/kgene/linux-samsung
    
    * 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
      ARM: S5PV310: Fix on Secondary CPU startup
      ARM: S5PV310: Bug fix on uclk1 and sclk_pwm
      ARM: S5PV310: Fix missed uart clocks
      ARM: S5PV310: Should be clk_sclk_apll not clk_mout_apll
      ARM: S5PV310: Fix on PLL setting for S5PV310
      ARM: S5PV310: Add CMU block for S5PV310 Clock
      ARM: S5PV310: Fix on typo irqs.h of S5PV310
      ARM: S5PV310: Fix on default ZRELADDR of ARCH_S5PV310
      ARM: S5PV310: Fix on GPIO base addresses
      ARM: SAMSUNG: Fix on build warning regarding VMALLOC_END type
      ARM: S5P: VMALLOC_END should be unsigned long
  5. @torvalds

    Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

    torvalds authored
    * 'for-linus' of git://git.infradead.org/users/eparis/notify:
      fsnotify: drop two useless bools in the fnsotify main loop
      fsnotify: fix list walk order
      fanotify: Return EPERM when a process is not privileged
      fanotify: resize pid and reorder structure
      fanotify: drop duplicate pr_debug statement
      fanotify: flush outstanding perm requests on group destroy
      fsnotify: fix ignored mask handling between inode and vfsmount marks
      fanotify: add MAINTAINERS entry
      fsnotify: reset used_inode and used_vfsmount on each pass
      fanotify: do not dereference inode_mark when it is unset
  6. @torvalds

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

    torvalds authored
    …/git/ecryptfs/ecryptfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
      eCryptfs: Fix encrypted file name lookup regression
      ecryptfs: properly mark init functions
      fs/ecryptfs: Return -ENOMEM on memory allocation failure
  7. @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: VMALLOC_END should be unsigned long
      arm: tegra: fix compilation of board-harmony.c
  8. @torvalds

    Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      vgaarb: Wrap vga_(get|put) in CONFIG_VGA_ARB
      drm/radeon/kms: add missing scratch update in dp_detect
      drm/modes: Fix CVT-R modeline generation
      drm: fix regression in drm locking since BKL removal.
      drm/radeon/kms: remove stray radeon_i2c_destroy
      drm: mm: fix range restricted allocations
      drm/nouveau: drop drm_global_mutex before sleeping in submission path
      drm: export drm_global_mutex for drivers to use
      drm/nv20: Don't use pushbuf calls on the original nv20.
      drm/nouveau: Fix TMDS on some DCB1.5 boards.
      drm/nouveau: Fix backlight control on PPC machines with an internal TMDS panel.
      drm/nv30: Apply modesetting to the correct slave encoder
      drm/nouveau: Use a helper function to match PCI device/subsystem IDs.
      drm/nv50: add dcb type 14 to enum to prevent compiler complaint
  9. @torvalds

    Merge branch 'lguest' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/rusty/linux-2.6-for-linus
    
    * 'lguest' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      lguest: Odd Fixes
      lguest: clean up warnings in demonstration launcher.
  10. @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:
      OMAP3: PM: ensure IO wakeups are properly disabled
      omap: Fix omap_4430sdp_defconfig for make oldconfig
      omap: Use CONFIG_SMP for test_for_ipi and test_for_ltirq
      omap: Fix sev instruction usage for multi-omap
      OMAP3: Fix a cpu type check problem
      omap3: id: fix 3630 rev detection
  11. @torvalds

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

    torvalds authored
    …/git/sage/ceph-client
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
      ceph: fix get_ticket_handler() error handling
      ceph: don't BUG on ENOMEM during mds reconnect
      ceph: ceph_mdsc_build_path() returns an ERR_PTR
      ceph: Fix warnings
      ceph: ceph_get_inode() returns an ERR_PTR
      ceph: initialize fields on new dentry_infos
      ceph: maintain i_head_snapc when any caps are dirty, not just for data
      ceph: fix osd request lru adjustment when sending request
      ceph: don't improperly set dir complete when holding EXCL cap
      mm: exporting account_page_dirty
      ceph: direct requests in snapped namespace based on nonsnap parent
      ceph: queue cap snap writeback for realm children on snap update
      ceph: include dirty xattrs state in snapped caps
      ceph: fix xattr cap writeback
      ceph: fix multiple mds session shutdown
  12. @torvalds

    Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds authored
    …git/rafael/suspend-2.6
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM QoS: Fix inline documentation.
      PM QoS: Fix kzalloc() parameters swapped in pm_qos_power_open()
  13. @torvalds

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

    torvalds authored
    * 'for-2.6.36' of git://linux-nfs.org/~bfields/linux:
      nfsd: fix NULL dereference in nfsd_statfs()
      nfsd4: fix downgrade/lock logic
      nfsd4: typo fix in find_any_file
      nfsd4: bad BUG() in preprocess_stateid_op
  14. @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:
      Cannot allocate memory error on mount
      [CIFS] Eliminate unused variable warning
  15. @torvalds

    Alpha: Fix a missing comma in sys_osf_statfs()

    David Howells authored torvalds committed
    Fix a comma that got accidentally deleted from sys_osf_statfs() leading to the
    following warning:
    
      arch/alpha/kernel/osf_sys.c: In function 'SYSC_osf_statfs':
      arch/alpha/kernel/osf_sys.c:255: error: syntax error before 'buffer'
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @torvalds

    NOMMU: Stub out vm_get_page_prot() if there's no MMU

    David Howells authored torvalds committed
    Stub out vm_get_page_prot() if there's no MMU.
    
    This was added by commit 804af2c ("[AGPGART] remove private page
    protection map") and is used in commit c07fbfd ("fbmem: VM_IO set,
    but not propagated") in the fbmem video driver, but the function doesn't
    exist on NOMMU, resulting in an undefined symbol at link time.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  17. @torvalds

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

    torvalds authored
    …/git/bp/bp
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      amd64_edac: Do not report error overflow as a separate error
      MCE, AMD: Limit MCE decoding to current families for now
  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: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove()
      Input: mousedev - fix regression of inverting axes
      Input: uinput - add devname alias to allow module on-demand load
      Input: hil_kbd - fix compile error
      USB: drop tty argument from usb_serial_handle_sysrq_char()
      Input: sysrq - drop tty argument form handle_sysrq()
      Input: sysrq - drop tty argument from sysrq ops handlers
  19. @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-sff: remove harmful BUG_ON from ata_bmdma_qc_issue
      sata_mv: fix broken DSM/TRIM support (v2)
      libata: be less of a drama queen on empty data commands
      [libata] sata_dwc_460ex: signdness bug
      ahci: add HFLAG_YES_FBS and apply it to 88SE9128
      libata: remove no longer needed pata_winbond driver
      pata_cmd64x: revert commit d62f557
  20. @torvalds

    mm: fix hang on anon_vma->root->lock

    Hugh Dickins authored torvalds committed
    After several hours, kbuild tests hang with anon_vma_prepare() spinning on
    a newly allocated anon_vma's lock - on a box with CONFIG_TREE_PREEMPT_RCU=y
    (which makes this very much more likely, but it could happen without).
    
    The ever-subtle page_lock_anon_vma() now needs a further twist: since
    anon_vma_prepare() and anon_vma_fork() are liable to change the ->root
    of a reused anon_vma structure at any moment, page_lock_anon_vma()
    needs to check page_mapped() again before succeeding, otherwise
    page_unlock_anon_vma() might address a different root->lock.
    
    Signed-off-by: Hugh Dickins <hughd@google.com>
    Reviewed-by: Rik van Riel <riel@redhat.com>
    Cc: Christoph Lameter <cl@linux.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Andrea Arcangeli <aarcange@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  21. @tiwai
  22. @tiwai
  23. @error27 @tiwai

    ALSA: pcm: add more format names

    error27 authored tiwai committed
    There were some new formats added in commit 15c0cee "ALSA: pcm:
    Define G723 3-bit and 5-bit formats".  That commit increased
    SNDRV_PCM_FORMAT_LAST as well.  My concern is that there are a couple
    places which do:
    
            for (i = 0; i < SNDRV_PCM_FORMAT_LAST; i++) {
                    if (dummy->pcm_hw.formats & (1ULL << i))
                            snd_iprintf(buffer, " %s", snd_pcm_format_name(i));
            }
    
    I haven't tested these but it looks like if "i" were equal to
    SNDRV_PCM_FORMAT_G723_24 or higher then we might read past the end of
    the array.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  24. @mita @tiwai

    sound: oss: fix uninitialized spinlock

    mita authored tiwai committed
    The spinlock lock in sound_timer.c is used without initialization.
    
    Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  25. @tiwai

    ALSA: asihpi - Return hw error directly from oustream_write.

    Eliot Blennerhassett authored tiwai committed
    If hw error is ignored, status is updated with invalid info.
    
    Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  26. @JuliaLawall @davem330

    net/ipv4: Eliminate kstrdup memory leak

    JuliaLawall authored davem330 committed
    The string clone is only used as a temporary copy of the argument val
    within the while loop, and so it should be freed before leaving the
    function.  The call to strsep, however, modifies clone, so a pointer to the
    front of the string is kept in saved_clone, to make it possible to free it.
    
    The sematic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)
    
    // <smpl>
    @r exists@
    local idexpression x;
    expression E;
    identifier l;
    statement S;
    @@
    
    *x= \(kasprintf\|kstrdup\)(...);
    ...
    if (x == NULL) S
    ... when != kfree(x)
        when != E = x
    if (...) {
      <... when != kfree(x)
    * goto l;
      ...>
    * return ...;
    }
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  27. @eparis

    fsnotify: drop two useless bools in the fnsotify main loop

    eparis authored
    The fsnotify main loop has 2 bools which indicated if we processed the
    inode or vfsmount mark in that particular pass through the loop.  These
    bool can we replaced with the inode_group and vfsmount_group variables
    and actually make the code a little easier to understand.
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
  28. @eparis

    fsnotify: fix list walk order

    eparis authored
    Marks were stored on the inode and vfsmonut mark list in order from
    highest memory address to lowest memory address.  The code to walk those
    lists thought they were in order from lowest to highest with
    unpredictable results when trying to match up marks from each.  It was
    possible that extra events would be sent to userspace when inode
    marks ignoring events wouldn't get matched with the vfsmount marks.
    
    This problem only affected fanotify when using both vfsmount and inode
    marks simultaneously.
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
Commits on Aug 27, 2010
  1. @eparis

    fanotify: Return EPERM when a process is not privileged

    Andreas Gruenbacher authored eparis committed
    The appropriate error code when privileged operations are denied is
    EPERM, not EACCES.
    
    Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
    Signed-off-by: Eric Paris <paris@paris.rdu.redhat.com>
  2. @eparis

    fanotify: resize pid and reorder structure

    Tvrtko Ursulin authored eparis committed
    resize pid and reorder the fanotify_event_metadata so it is naturally
    aligned and we can work towards dropping the packed attributed
    
    Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
    Cc: Andreas Dilger <adilger@dilger.ca>
    Signed-off-by: Eric Paris <eparis@redhat.com>
  3. @vapier

    Blackfin: bf52x/bf54x boards: drop unused nand page size

    Barry Song authored vapier committed
    Now that the driver for the Blackfin on-chip NFC no longer uses/respects
    the page_size from the platform resources (figures out the needs on the
    fly), drop it from the platform resources.  This fixes some build errors
    since the defines no longer exists.
    
    Signed-off-by: Barry Song <barry.song@analog.com>
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
  4. @vapier

    Blackfin: punt duplicate SPORT MMR defines

    vapier authored
    The common bfin_sport.h header now has unified definitions of these, so
    stop polluting the global namespace.
    
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Something went wrong with that request. Please try again.