1. 15 Sep, 2012 4 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · dd383af6
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "I realise this a bit bigger than I would want at this point.
      
        Exynos is a large chunk, I got them to half what they wanted already,
        and hey its ARM based, so not going to hurt many people.
      
        Radeon has only two fixes, but the PLL fixes were a bit bigger, but
        required for a lot of scenarios, the fence fix is really urgent.
      
        vmwgfx: I've pulled in a dumb ioctl support patch that I was going to
        shove in later and cc stable, but we need it asap, its mainly to stop
        mesa growing a really ugly dependency in userspace to run stuff on
        vmware, and if I don't stick it in the kernel now, everyone will have
        to ship ugly userspace libs to workaround it.
      
        nouveau: single urgent fix found in F18 testing, causes X to not start
        properly when f18 plymouth is used
      
        i915: smattering of fixes and debug quieting
      
        gma500: single regression fix
      
        So as I said a bit large, but its fairly well scattered and its all
        stuff I'll be shipping in F18's 3.6 kernel."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (26 commits)
        drm/nouveau: fix booting with plymouth + dumb support
        drm/radeon: make 64bit fences more robust v3
        drm/radeon: rework pll selection (v3)
        drm: Drop the NV12M and YUV420M formats
        drm/exynos: remove DRM_FORMAT_NV12M from plane module
        drm/exynos: fix double call of drm_prime_(init/destroy)_file_private
        drm/exynos: add dummy support for dmabuf-mmap
        drm/exynos: Add missing braces around sizeof in exynos_mixer.c
        drm/exynos: Add missing braces around sizeof in exynos_hdmi.c
        drm/exynos: Make g2d_pm_ops static
        drm/exynos: Add dependency for G2D in Kconfig
        drm/exynos: fixed page align bug.
        drm/exynos: Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(.. [1]
        drm/exynos: Use devm_* functions in exynos_drm_g2d.c file
        drm/exynos: Use devm_kzalloc in exynos_drm_hdmi.c file
        drm/exynos: Use devm_kzalloc in exynos_drm_vidi.c file
        drm/exynos: Remove redundant check in exynos_drm_fimd.c file
        drm/exynos: Remove redundant check in exynos_hdmi.c file
        vmwgfx: add dumb ioctl support
        gma500: Fix regression on Oaktrail devices
        ...
      dd383af6
    • Linus Torvalds's avatar
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 889cb3b9
      Linus Torvalds authored
      Pull scheduler fixes from Ingo Molnar:
       "Smaller fixlets"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched: Fix kernel-doc warnings in kernel/sched/fair.c
        sched: Unthrottle rt runqueues in __disable_runtime()
        sched: Add missing call to calc_load_exit_idle()
        sched: Fix load avg vs cpu-hotplug
      889cb3b9
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7ef6e973
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "This tree includes various fixes"
      
      Ingo really needs to improve on the whole "explain git pull" part.
      "Various fixes" indeed.
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/hwpb: Invoke __perf_event_disable() if interrupts are already disabled
        perf/x86: Enable Intel Cedarview Atom suppport
        perf_event: Switch to internal refcount, fix race with close()
        oprofile, s390: Fix uninitialized memory access when writing to oprofilefs
        perf/x86: Fix microcode revision check for SNB-PEBS
      7ef6e973
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7076cca9
      Linus Torvalds authored
      Pull a core sparse warning fix from Ingo Molnar
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        mm/memblock: Use NULL instead of 0 for pointers
      7076cca9
  2. 14 Sep, 2012 8 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · a1362d50
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Use after free and new device IDs in bluetooth from Andre Guedes,
          Yevgeniy Melnichuk, Gustavo Padovan, and Henrik Rydberg.
      
       2) Fix crashes with short packet lengths and VLAN in pktgen, from
          Nishank Trivedi.
      
       3) mISDN calls flush_work_sync() with locks held, fix from Karsten
          Keil.
      
       4) Packet scheduler gred parameters are reported to userspace
          improperly scaled, and WRED idling is not performed correctly.  All
          from David Ward.
      
       5) Fix TCP socket refcount problem in ipv6, from Julian Anastasov.
      
       6) ibmveth device has RX queue alignment requirements which are not
          being explicitly met resulting in sporadic failures, fix from
          Santiago Leon.
      
       7) Netfilter needs to take care when interpreting sockets attached to
          socket buffers, they could be time-wait minisockets.  Fix from Eric
          Dumazet.
      
       8) sock_edemux() has the same issue as netfilter did in #7 above, fix
          from Eric Dumazet.
      
       9) Avoid infinite loops in CBQ scheduler with some configurations, from
          Eric Dumazet.
      
      10) Deal with "Reflection scan: an Off-Path Attack on TCP", from Jozsef
          Kadlecsik.
      
      11) SCTP overcharges socket for TX packets, fix from Thomas Graf.
      
      12) CODEL packet scheduler should not reset it's state every time it
          builds a new flow, fix from Eric Dumazet.
      
      13) Fix memory leak in nl80211, from Wei Yongjun.
      
      14) NETROM doesn't check skb_copy_datagram_iovec() return values, from
          Alan Cox.
      
      15) l2tp ethernet was using sizeof(ETH_HLEN) instead of plain ETH_HLEN,
          oops.  From Eric Dumazet.
      
      16) Fix selection of ath9k chips on which PA linearization and AM2PM
          predistoration are used, from Felix Fietkau.
      
      17) Flow steering settings in mlx4 driver need to be validated properly,
          from Hadar Hen Zion.
      
      18) bnx2x doesn't show the correct link duplex setting, from Yaniv
          Rosner.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (75 commits)
        pktgen: fix crash with vlan and packet size less than 46
        bnx2x: Add missing afex code
        bnx2x: fix registers dumped
        bnx2x: correct advertisement of pause capabilities
        bnx2x: display the correct duplex value
        bnx2x: prevent timeouts when using PFC
        bnx2x: fix stats copying logic
        bnx2x: Avoid sending multiple statistics queries
        net: qmi_wwan: call subdriver with control intf only
        net_sched: gred: actually perform idling in WRED mode
        net_sched: gred: fix qave reporting via netlink
        net_sched: gred: eliminate redundant DP prio comparisons
        net_sched: gred: correct comment about qavg calculation in RIO mode
        mISDN: Fix wrong usage of flush_work_sync while holding locks
        netfilter: log: Fix log-level processing
        net-sched: sch_cbq: avoid infinite loop
        net: qmi_wwan: fix Gobi device probing for un2430
        net: fix net/core/sock.c build error
        ixp4xx_hss: fix build failure due to missing linux/module.h inclusion
        caif: move the dereference below the NULL test
        ...
      a1362d50
    • Linus Torvalds's avatar
      Merge tag 'usb-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 4bca55d3
      Linus Torvalds authored
      Pull USB patches from Greg Kroah-Hartman:
       "Here are a number of USB patches, a bit more than I normally like this
        late in the -rc series, but given people's vacations (myself
        included), and the kernel summit, it seems to have happened this way.
      
        All are tiny, but they add up.  A number of gadget and xhci fixes, and
        a few new device ids.  All have been tested in linux-next.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'usb-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (33 commits)
        usb: chipidea: udc: don't stall endpoint if request list is empty in isr_tr_complete_low
        usb: chipidea: cleanup dma_pool if udc_start() fails
        usb: chipidea: udc: fix error path in udc_start()
        usb: chipidea: udc: add pullup fuction, needed by the uvc gadget
        usb: chipidea: udc: fix setup of endpoint maxpacket size
        USB: option: replace ZTE K5006-Z entry with vendor class rule
        EHCI: Update qTD next pointer in QH overlay region during unlink
        USB: cdc-wdm: fix wdm_find_device* return value
        USB: ftdi_sio: do not claim CDC ACM function
        usb: dwc3: gadget: fix pending isoc handling
        usb: renesas_usbhs: fixup DMA transport data alignment
        usb: gadget: at91udc: Don't check for ep->ep.desc
        usb: gadget: at91udc: don't overwrite driver data
        usb: dwc3: core: fix incorrect usage of resource pointer
        usb: musb: musbhsdma: fix IRQ check
        usb: musb: tusb6010: fix error path in tusb_probe()
        usb: musb: host: fix for musb_start_urb Oops
        usb: gadget: dummy_hcd: add support for USB_DT_BOS on rh
        usb: gadget: dummy_hcd: fixup error probe path
        usb: gadget: s3c-hsotg.c: fix error return code
        ...
      4bca55d3
    • Linus Torvalds's avatar
      Merge tag 'tty-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · fe59d297
      Linus Torvalds authored
      Pull TTY fixes from Greg Kroah-Hartman:
       "Here are 2 tiny patches for a serial driver to resolve issues that
        people have reported with the 3.6-rc tree.
      
        Both of these have been in the linux-next tree for a while now.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'tty-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: serial: imx: don't reinit clock in imx_setup_ufcr()
        tty: serial: imx: console write routing is unsafe on SMP
      fe59d297
    • Linus Torvalds's avatar
      Merge tag 'staging-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · f2378e38
      Linus Torvalds authored
      Pull staging tree fixes from Greg Kroah-Hartman:
       "Here are a few staging tree fixes for problems that have been
        reported.
      
        Nothing major, just a number of tiny driver fixes.  All of these have
        been in the linux-next tree for a while.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'staging-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        drm/omap: add more new timings fields
        drm/omap: update for interlaced
        staging: r8712u: fix bug in r8712_recv_indicatepkt()
        staging: zcache: fix cleancache race condition with shrinker
        Staging: Android alarm: IOCTL command encoding fix
        staging: vt6656: [BUG] - Failed connection, incorrect endian.
        staging: ozwpan: fix memcmp() test in oz_set_active_pd()
        staging: wlan-ng: Fix problem with wrong arguments
        staging: comedi: das08: Correct AO output for das08jr-16-ao
        staging: comedi: das08: Correct AI encoding for das08jr-16-ao
        staging: comedi: das08: Fix PCI ref count
        staging: comedi: amplc_pci230: Fix PCI ref count
        staging: comedi: amplc_pc263: Fix PCI ref count
        staging: comedi: amplc_pc236: Fix PCI ref count
        staging: comedi: amplc_dio200: Fix PCI ref count
        staging: comedi: amplc_pci224: Fix PCI ref count
        drivers/iio/adc/at91_adc.c: adjust inconsistent IS_ERR and PTR_ERR
        staging iio: fix potential memory leak in lis3l02dq_ring.c
        staging:iio: prevent divide by zero bugs
      f2378e38
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 0462bfc8
      Linus Torvalds authored
      Pull driver core fix from Greg Kroah-Hartman:
       "Here is one fix for 3.6-rc6 for the kobject.h file.
      
        It fixes a reported oops if CONFIG_HOTPLUG is disabled.  It's been in
        the linux-next tree for a while now.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'driver-core-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        kobject: fix oops with "input0: bad kobj_uevent_env content in show_uevent()"
      0462bfc8
    • Linus Torvalds's avatar
      vfs: make O_PATH file descriptors usable for 'fstat()' · 55815f70
      Linus Torvalds authored
      We already use them for openat() and friends, but fstat() also wants to
      be able to use O_PATH file descriptors.  This should make it more
      directly comparable to the O_SEARCH of Solaris.
      
      Note that you could already do the same thing with "fstatat()" and an
      empty path, but just doing "fstat()" directly is simpler and faster, so
      there is no reason not to just allow it directly.
      
      See also commit 332a2e12, which did the same thing for fchdir, for
      the same reasons.
      Reported-by: default avatarольга крыжановская <olga.kryzhanovska@gmail.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: stable@kernel.org    # O_PATH introduced in 3.0+
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      55815f70
    • Dave Airlie's avatar
      drm/nouveau: fix booting with plymouth + dumb support · 610bd7da
      Dave Airlie authored
      We noticed a plymouth bug on Fedora 18, and I then
      noticed this stupid thinko, fixing it fixed the problem
      with plymouth.
      
      Cc: stable@vger.kernel.org
      Acked-by: default avatarBen Skeggs <bskeggs@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      610bd7da
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 363fca82
      Dave Airlie authored
      Alex writes:
      
      This is the current set of radeon fixes for 3.6.  Two small fixes:
      - fix the fence issues introduced in 3.5 with 64-bit fences
      - PLL fix for multiple DP heads
      
      * 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: make 64bit fences more robust v3
        drm/radeon: rework pll selection (v3)
      363fca82
  3. 13 Sep, 2012 28 commits