1. 30 5月, 2013 1 次提交
  2. 29 5月, 2013 4 次提交
  3. 28 5月, 2013 1 次提交
  4. 24 5月, 2013 13 次提交
    • D
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next · 5ed77662
      Dave Airlie 提交于
      Daniel writes:
      A few fixes, nothing shocking:
      - More Haswell pci ids. Includes a pile of marketing spare ids (which
        despite the spare moniker show up all over the place).
      - Fix a regression in handling modeset failures, resulting in black
        screens on 3 pipe setups when we've run out of pch plls (Chris).
      - Fix up the setcrtc semantics to unconditionally enable the outputs.
        Juding from git digging that has (kinda) always been the case and neatly
        fixes a few long-standing (i.e. forever) bug reports (Imre).
      - jiffies_timeout + 1 patches from Imre. They partially fix spurious
        wait_event failures in the interrupt-driven dp aux/i2c code. The other
        part is a core patch for the wait_event macros going in through -mm. A
        few patches more than strictly required since Imre is pushing for a
        general solution in 3.11.
      
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
        drm/i915: avoid premature DP AUX timeouts
        drm/i915: avoid premature timeouts in __wait_seqno()
        drm/i915: use msecs_to_jiffies_timeout instead of open coding the same
        drm/i915: add msecs_to_jiffies_timeout to guarantee minimum duration
        drm/i915: force full modeset if the connector is in DPMS OFF mode
        drm/i915: Propagate errors back from fb set-base
        drm/i915: Adding more reserved PCI IDs for Haswell.
      5ed77662
    • D
      Merge branch 'exynos-drm-fixes' of... · 80ce5f6f
      Dave Airlie 提交于
      Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
      
      Inki writes:
        This pull request includes drm_send_vblank_event() helper
         relevant patch I missed and code cleanups. And also it fixes
         a pended page flip issue.
      
      * 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
        drm/exynos: replace request_threaded_irq with devm function
        drm/exynos: remove unnecessary devm_kfree
        drm/exynos: fix build warnings from ipp fimc
        drm/exynos: cleanup device pointer usages
        drm/exynos: wait for the completion of pending page flip
        drm/exynos: use drm_send_vblank_event() helper
        drm/exynos: page flip fixes
        drm/exynos: exynos_hdmi: Pass correct pointer to free_irq()
        drm/exynos: exynos_drm_ipp: Fix incorrect usage of IS_ERR_OR_NULL
        drm/exynos: exynos_drm_fbdev: Fix incorrect usage of IS_ERR_OR_NULL
      
      Conflicts:
      	drivers/gpu/drm/exynos/exynos_hdmi.c
      80ce5f6f
    • D
      Merge remote-tracking branch 'pfdo/drm-fixes' into drm-next · c313d567
      Dave Airlie 提交于
      Pull the vblank event changes into a Linus master tree to make merging
      easier.
      c313d567
    • L
      Merge tag 'pci-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · b91fd4d5
      Linus Torvalds 提交于
      Pull PCI updates from Bjorn Helgaas:
       "Here are some more fixes for v3.10.  The Moorestown update broke Intel
        Medfield devices, so I reverted it.  The acpiphp change fixes a
        regression: we broke hotplug notifications to host bridges when we
        split acpiphp into the host-bridge related part and the
        endpoint-related part.
      
        Moorestown
            Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"
        Hotplug
            PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check"
      
      * tag 'pci-v3.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        Revert "x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"
        PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check
      b91fd4d5
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 4c0eec03
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "A few fixups to Wacom and eGalax touchscreen driver"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: wacom - add an eraser to DTH2242/DTK2241
        Input: wacom - add a few new styli for Cintiq series
        Input: wacom - add three new display tablets
        Input: egalax_ts - ABS_MT_POSITION_Y not reported well
      4c0eec03
    • L
      Merge tag 'tty-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · d9795562
      Linus Torvalds 提交于
      Pull tty/serial fixes from Greg Kroah-Hartman:
       "Here are some tty / serial driver fixes for 3.10-rc2.
      
        Nothing huge, although the rocket driver fix looks large, it's just
        moving the code around to fix the reported build issues in it.  Other
        than that, this has the fix for the of-reported lockdep warning from
        the vt layer, as well as some other needed bugfixes.
      
        All of these have been in linux-next for a while"
      
      * tag 'tty-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        tty: mxser: Fix build warning introduced by dfc7b837 (Re: linux-next: build warning after merge of the tty.current tree)
        tty: mxser: fix usage of opmode_ioaddr
        serial: 8250_dw: add ACPI ID for Intel BayTrail
        TTY: Fix tty miss restart after we turn off flow-control
        tty/vt: Fix vc_deallocate() lock order
        TTY: ehv_bytechan: add missing platform_driver_unregister() when module exit
        TTY: rocket, fix more no-PCI warnings
        serial: mcf: missing uart_unregister_driver() on error in mcf_init()
        tty: serial: mpc5xxx: fix error handing in mpc52xx_uart_init()
        serial: samsung: add missing platform_driver_unregister() when module exit
        serial: pl011: protect attribute read from NULL platform data struct
        tty: nwpserial: Pass correct pointer to free_irq()
        serial: 8250_dw: Add valid clk pointer check
      d9795562
    • L
      Merge tag 'staging-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 388c2896
      Linus Torvalds 提交于
      Pull staging driver fixes from Greg Kroah-Hartman:
       "Here are some staging tree driver fixes for 3.10-rc2
      
        The drivers/iio/ changes are here as they are still tied into
        drivers/staging/iio/.
      
        Nothing major, just a number of small bugfixes, and a larger
        documentation update for the ramster code."
      
      * tag 'staging-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (28 commits)
        staging: dwc2: remove compile warning for USB_DWC2_TRACK_MISSED_SOFS
        iio: exynos_adc: fix wrong structure extration in suspend and resume
        iio:common:st: added disable function after read info raw data
        iio: dac: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m
        staging:iio:light:tsl2x7x: fix the error handling in tsl2x7x_probe()
        staging/iio/mxs-lradc: fix preenable for multiple buffers
        staging: imx-drm: imx-tve: Check the return value of 'regulator_enable()'
        staging: video: imx: Select VIDEOMODE_HELPERS for parallel display
        staging: ramster: add how-to document
        staging: dwc2: Fix dma-enabled platform devices using a default dma_mask
        staging: vt6656: [bug] Fix missing spin lock in iwctl_siwpower.
        staging: Swap zram and zsmalloc in Kconfig
        staging: android: logger: use kuid_t instead of uid_t
        staging: zcache: Fix incorrect module_param_array types
        staging/solo6x10: depend on CONFIG_FONTS
        staging/drm: imx: add missing dependencies
        staging: ste_rmi4: Suppress 'ignoring return value of ‘regulator_enable()' warning
        staging: sep: fix driver build and kconfig
        staging: nvec: cleanup childs on remove
        staging: nvec: implement unregistering of notifiers
        ...
      388c2896
    • L
      Merge tag 'driver-core-3.10-rc2' of... · c7153d06
      Linus Torvalds 提交于
      Merge tag 'driver-core-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core fixes from Greg Kroah-Hartman:
       "Here are 3 tiny driver core fixes for 3.10-rc2.
      
        A needed symbol export, a change to make it easier to track down
        offending sysfs files with incorrect attributes, and a klist bugfix.
      
        All have been in linux-next for a while"
      
      * tag 'driver-core-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        klist: del waiter from klist_remove_waiters before wakeup waitting process
        driver core: print sysfs attribute name when warning about bogus permissions
        driver core: export subsys_virtual_register
      c7153d06
    • L
      Merge tag 'char-misc-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 5cc0c038
      Linus Torvalds 提交于
      Pull char/misc driver fixes from Greg Kroah-Hartman:
       "Here are some small char/misc driver fixes for 3.10-rc2.
      
        Nothing major here, just a number of fixes for things that people have
        reported, and a MAINTAINERS update for the recent changes for the
        hyperv files that went into 3.10-rc1."
      
      * tag 'char-misc-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        ttyprintk: Fix NULL pointer deref by setting tty_port ops after initializing port
        uio: UIO_DMEM_GENIRQ should depend on HAS_DMA
        MAINTAINERS: update Hyper-V file list
        mei: bus: Reset event_cb when disabling a device
        Drivers: hv: Fix a bug in get_vp_index()
        mei: fix out of array access to me clients array
        Char: lp, protect LPGETSTATUS with port_mutex
        dummy-irq: require the user to specify an IRQ number
      5cc0c038
    • L
      Merge tag 'usb-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · b6419406
      Linus Torvalds 提交于
      Pull USB fixes from Greg Kroah-Hartman:
       "Here are a number of tiny USB bugfixes / new device ids for 3.10-rc2
      
        The majority of these are USB gadget fixes, but they are all small.
        Other than that, some USB host controller fixes, and USB serial driver
        fixes for problems reported with them.
      
        Also hopefully a fixed up USB_OTG Kconfig dependancy, that one seems
        to be almost impossible to get right for all of the different
        platforms these days."
      
      * tag 'usb-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (56 commits)
        USB: cxacru: potential underflow in cxacru_cm_get_array()
        USB: ftdi_sio: Add support for Newport CONEX motor drivers
        USB: option: add device IDs for Dell 5804 (Novatel E371) WWAN card
        usb: ohci: fix goto wrong tag in err case
        usb: isp1760-if: fix memleak when platform_get_resource fail
        usb: ehci-s5p: fix memleak when fallback to pdata
        USB: serial: clean up chars_in_buffer
        USB: ti_usb_3410_5052: fix chars_in_buffer overhead
        USB: io_ti: fix chars_in_buffer overhead
        USB: ftdi_sio: fix chars_in_buffer overhead
        USB: ftdi_sio: clean up get_modem_status
        USB: serial: add generic wait_until_sent implementation
        USB: serial: add wait_until_sent operation
        USB: set device dma_mask without reference to global data
        USB: Blacklisted Cinterion's PLxx WWAN Interface
        usb: option: Add Telewell TW-LTE 4G
        USB: EHCI: remove bogus #error
        USB: reset resume quirk needed by a hub
        USB: usb-stor: realtek_cr: Fix compile error
        usb, chipidea: fix link error when USB_EHCI_HCD is a module
        ...
      b6419406
    • L
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 72dd4e79
      Linus Torvalds 提交于
      Pull kvm bugfixes from Gleb Natapov.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM/MIPS32: Wrap calls to gfn_to_pfn() with srcu_read_lock/unlock()
        KVM/MIPS32: Move include/asm/kvm.h => include/uapi/asm/kvm.h since it is a user visible API.
        KVM: take over co-maintainership from Marcelo, fix MAINTAINERS entry
      72dd4e79
    • R
      lib: make iovec obj instead of lib · b4d3ba33
      Randy Dunlap 提交于
      Fix build error io vmw_vmci.ko when CONFIG_VMWARE_VMCI=m by chaning
      iovec.o from lib-y to obj-y.
      
        ERROR: "memcpy_toiovec" [drivers/misc/vmw_vmci/vmw_vmci.ko] undefined!
        ERROR: "memcpy_fromiovec" [drivers/misc/vmw_vmci/vmw_vmci.ko] undefined!
      Signed-off-by: NRandy Dunlap <rdunlap@infradead.org>
      Acked-by: NRusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b4d3ba33
    • P
      Input: wacom - add an eraser to DTH2242/DTK2241 · c73a1afb
      Ping Cheng 提交于
      plus send begin and end of express keys events for
      Cintiq 13HD and DTH2242/DTK2241
      Signed-off-by: NPing Cheng <pingc@wacom.com>
      Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
      c73a1afb
  5. 23 5月, 2013 17 次提交
  6. 22 5月, 2013 4 次提交
    • R
      mm: Fix virt_to_page() warning · bb3ec6b0
      Ralf Baechle 提交于
      virt_to_page() is typically implemented as a macro containing a cast so
      that it will accept both pointers and unsigned long without causing a
      warning.
      
      But MIPS virt_to_page() uses virt_to_phys which is a function so passing
      an unsigned long will cause a warning:
      
          CC      mm/page_alloc.o
        mm/page_alloc.c: In function ‘free_reserved_area’:
        mm/page_alloc.c:5161:3: warning: passing argument 1 of ‘virt_to_phys’ makes pointer from integer without a cast [enabled by default]
        arch/mips/include/asm/io.h:119:100: note: expected ‘const volatile void *’ but argument is of type ‘long unsigned int’
      
      All others users of virt_to_page() in mm/ are passing a void *.
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      Reported-by: NEunbong Song <eunb.song@samsung.com>
      Cc: linux-kernel@vger.kernel.org
      Cc: linux-mm@kvack.org
      Cc: linux-mips@linux-mips.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bb3ec6b0
    • L
      Merge tag 'mfd-fixes-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes · cbfd2cd7
      Linus Torvalds 提交于
      Pull mfd fixes from Samuel Ortiz:
       "This is the first batch of MFD fixes for 3.10.
      
        It's bigger than I would like, most of it is due to the big ab/db8500
        merge that went through during the 3.10 merge window.
      
        So we have:
      
         - Some build fixes for the tps65912 and ab8500 drivers.
         - A couple of build fixes for the the si476x driver with pre 4.3 gcc
           compilers.
         - A few runtime breakage fixes (probe failures or oopses) for the
           ab8500 and db8500 drivers.
         - Some sparse or regular gcc warning fixes for the si476x, ab8500 and
           cros_ec drivers."
      
      * tag 'mfd-fixes-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:
        mfd: ab8500-sysctrl: Let sysctrl driver work without pdata
        mfd: db8500-prcmu: Update stored DSI PLL divider value
        mfd: ab8500-sysctrl: Always enable pm_power_off handler
        mfd: ab8500-core: Pass GPADC compatible string to MFD core
        mfd: db8500-prcmu: Supply the pdata_size attribute for db8500-thermal
        mfd: ab8500-core: Use the correct driver name when enabling gpio/pinctrl
        mfd: ab8500: Pass AB8500 IRQ to debugfs code by resource
        mfd: ab8500-gpadc: Suppress 'ignoring regulator_enable() return value' warning
        mfd: ab8500-sysctrl: Set sysctrl_dev during probe
        mfd: ab8500-sysctrl: Fix sparse warning
        mfd: abx500-core: Fix sparse warning
        mfd: ab8500: Debugfs code depends on gpadc
        mfd: si476x: Use get_unaligned_be16() for unaligned be16 loads
        mfd: cros_ec_spi: Use %z to format pointer differences
        mfd: si476x: Do not use binary constants
        mfd: tps65912: Select MFD_CORE
      cbfd2cd7
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · 94f1be97
      Linus Torvalds 提交于
      Pull virtio fixes from Rusty Russell:
       "A build fix and a uapi exposure fix.  The build fix is later than I
        liked, but my first version broke linux-next due to overzealous header
        clean."
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        virtio_console: fix uapi header
        Hoist memcpy_fromiovec/memcpy_toiovec into lib/
      94f1be97
    • A
      MIPS: N64: Wire getdents64(2) · dec33aba
      Aron Xu 提交于
      As a relatively new ABI, N64 only had getdents syscall while other modern
      architectures have getdents64.
      
      This was noticed when Python 3.3 shifted to the latter one for aarch64.
      
      [ralf@linux-mips.org: The history of getdents64 is a little complicated.
      Commit 1a1d77dd589de5a567fa95e36aa6999c704ceca4 [Merge with 2.4.0-test7.]
      added N64 getdents(2) to arch/mips64/kernel/scall_64.S as syscall 5213,
      then dropped again in 578720675c44e54e8aa7c68f6dce59ed37ce3d3b [Overhaul
      of the 64-bit syscall interface.  Now heritage free.] for 2.5.18 in 2002.]
      Signed-off-by: NAron Xu <aron@debian.org>
      Acked-by: NDavid Daney <david.daney@cavium.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5285/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      dec33aba