1. 05 Jul, 2010 34 commits
  2. 02 Jul, 2010 1 commit
  3. 30 Jun, 2010 5 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 9f2952db
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (22 commits)
        USB: gadget: f_mass_storage: stale common->fsg value bug fix
        USB: gadget: f_mass_storage: fixed fs descriptors not being updated
        USB: musb: Enable the maximum supported burst mode for DMA
        USB: musb: fix Blackfin ulpi stubs
        USB: MUSB: make non-OMAP platforms build with CONFIG_PM=y
        USB: musb_core: make disconnect and suspend interrupts work again
        USB: obey the sysfs power/wakeup setting
        USB: gadget eth: Fix calculate CRC32 in EEM
        USB: qcserial: fix a memory leak in qcprobe error path
        USB: gadget/printer, fix sleep inside atomic
        USB: isp1362-hcd, fix double lock
        USB: serial: ftdi: correct merge conflict with CONTEC id
        USB: fix oops in usb_sg_init()
        USB: s3c2410: deactivate endpoints before gadget unbinding
        USB: ehci-mxc: bail out on transceiver problems
        USB: otg/ulpi: bail out on read errors
        usb: musb: Fix a bug by making suspend interrupt available in device mode
        USB: r8a66597: Fix failure in change of status
        USB: xHCI: Fix bug in link TRB activation change.
        USB: gadget: g_fs: possible invalid pointer reference bug fixed
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 · 59e76486
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
        serial: cpm_uart: implement the cpm_uart_early_write() function for console poll
    • Linus Torvalds's avatar
      Merge branch 'omap-fixes-for-linus' of... · c01ec7b1
      Linus Torvalds authored
      Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/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:
        OMAP: hwmod: Fix the missing braces
        OMAP4: clock: Fix multi-omap boot with reset un-used clocks
        OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg
        omap: GPIO: fix auto-disable of debounce clock
        omap: DMTIMER: Ack pending interrupt always when stopping a timer
        omap: Stalker board: switch over to gpio_set_debounce
        omap: fix build failure due to missing include dma-mapping.h
        omap iommu: Fix Memory leak
    • Jes Sorensen's avatar
      Add mdr as maintainer of qla1280 driver. · 5e9772b9
      Jes Sorensen authored
      As discussed with Mike Reed, add him as the maintainer of the qla1280
      driver as I no longer have any hardware and he is actively looking
      after it.
      Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Michal Hocko's avatar
      futex: futex_find_get_task remove credentails check · 7a0ea09a
      Michal Hocko authored
      futex_find_get_task is currently used (through lookup_pi_state) from two
      contexts, futex_requeue and futex_lock_pi_atomic.  None of the paths
      looks it needs the credentials check, though.  Different (e)uids
      shouldn't matter at all because the only thing that is important for
      shared futex is the accessibility of the shared memory.
      The credentail check results in glibc assert failure or process hang (if
      glibc is compiled without assert support) for shared robust pthread
      mutex with priority inheritance if a process tries to lock already held
      lock owned by a process with a different euid:
      pthread_mutex_lock.c:312: __pthread_mutex_lock_full: Assertion `(-(e)) != 3 || !robust' failed.
      The problem is that futex_lock_pi_atomic which is called when we try to
      lock already held lock checks the current holder (tid is stored in the
      futex value) to get the PI state.  It uses lookup_pi_state which in turn
      gets task struct from futex_find_get_task.  ESRCH is returned either
      when the task is not found or if credentials check fails.
      futex_lock_pi_atomic simply returns if it gets ESRCH.  glibc code,
      however, doesn't expect that robust lock returns with ESRCH because it
      should get either success or owner died.
      Signed-off-by: default avatarMichal Hocko <mhocko@suse.cz>
      Acked-by: default avatarDarren Hart <dvhltc@us.ibm.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Nick Piggin <npiggin@suse.de>
      Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>