Revision tags: v4.17-rc6, v4.17-rc5, v4.17-rc4 |
|
#
552c69b3 |
| 02-May-2018 |
John Johansen <john.johansen@canonical.com> |
Merge tag 'v4.17-rc3' into apparmor-next
Linux v4.17-rc3
Merge in v4.17 for LSM updates
Signed-off-by: John Johansen <john.johansen@canonical.com>
|
Revision tags: v4.17-rc3 |
|
#
8cad95f5 |
| 24-Apr-2018 |
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> |
Merge tag 'v4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.17-rc2
|
#
57eb13a9 |
| 24-Apr-2018 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'ib-chrome-platform-input-atmel-mx-ts-platform-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform into next
Sync up with chrome-platform to bring in change
Merge branch 'ib-chrome-platform-input-atmel-mx-ts-platform-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform into next
Sync up with chrome-platform to bring in changes to Atmel touch controller.
show more ...
|
#
b393a707 |
| 23-Apr-2018 |
James Morris <james.morris@microsoft.com> |
Merge tag 'v4.17-rc2' into next-general
Sync to Linux 4.17-rc2 for developers.
|
Revision tags: v4.17-rc2 |
|
#
30596ec3 |
| 17-Apr-2018 |
Zhenyu Wang <zhenyuw@linux.intel.com> |
Back merge 'drm-intel-fixes' into gvt-fixes
Need for 4.17-rc1
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
|
#
8089f9f5 |
| 16-Apr-2018 |
Sean Paul <seanpaul@chromium.org> |
Merge airlied/drm-next into drm-misc-fixes
Fast forwarding -fixes for 4.17.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
|
Revision tags: v4.17-rc1 |
|
#
ef389b73 |
| 12-Apr-2018 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'WIP.x86/asm' into x86/urgent, because the topic is ready
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
ee1400dd |
| 09-Apr-2018 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into x86/pti to pick up upstream changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
ea2a6af5 |
| 05-Apr-2018 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into sched/urgent, to pick up fixes and updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
664b0bae |
| 05-Apr-2018 |
Dmitry Torokhov <dmitry.torokhov@gmail.com> |
Merge branch 'next' into for-linus
Prepare input updates for 4.17 merge window.
|
#
320b164a |
| 02-Apr-2018 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge tag 'drm-for-v4.17' of git://people.freedesktop.org/~airlied/linux
Pull drm updates from Dave Airlie: "Cannonlake and Vega12 support are probably the two major things. This pull lacks nouve
Merge tag 'drm-for-v4.17' of git://people.freedesktop.org/~airlied/linux
Pull drm updates from Dave Airlie: "Cannonlake and Vega12 support are probably the two major things. This pull lacks nouveau, Ben had some unforseen leave and a few other blockers so we'll see how things look or maybe leave it for this merge window.
core: - Device links to handle sound/gpu pm dependency - Color encoding/range properties - Plane clipping into plane check helper - Backlight helpers - DP TP4 + HBR3 helper support
amdgpu: - Vega12 support - Enable DC by default on all supported GPUs - Powerplay restructuring and cleanup - DC bandwidth calc updates - DC backlight on pre-DCE11 - TTM backing store dropping support - SR-IOV fixes - Adding "wattman" like functionality - DC crc support - Improved DC dual-link handling
amdkfd: - GPUVM support for dGPU - KFD events for dGPU - Enable PCIe atomics for dGPUs - HSA process eviction support - Live-lock fixes for process eviction - VM page table allocation fix for large-bar systems
panel: - Raydium RM68200 - AUO G104SN02 V2 - KEO TX31D200VM0BAA - ARM Versatile panels
i915: - Cannonlake support enabled - AUX-F port support added - Icelake base enabling until internal milestone of forcewake support - Query uAPI interface (used for GPU topology information currently) - Compressed framebuffer support for sprites - kmem cache shrinking when GPU is idle - Avoid boosting GPU when waited item is being processed already - Avoid retraining LSPCON link unnecessarily - Decrease request signaling latency - Deprecation of I915_SET_COLORKEY_NONE - Kerneldoc and compiler warning cleanup for upcoming CI enforcements - Full range ycbcr toggling - HDCP support
i915/gvt: - Big refactor for shadow ppgtt - KBL context save/restore via LRI cmd (Weinan) - Properly unmap dma for guest page (Changbin)
vmwgfx: - Lots of various improvements
etnaviv: - Use the drm gpu scheduler - prep work for GC7000L support
vc4: - fix alpha blending - Expose perf counters to userspace
pl111: - Bandwidth checking/limiting - Versatile panel support
sun4i: - A83T HDMI support - A80 support - YUV plane support - H3/H5 HDMI support
omapdrm: - HPD support for DVI connector - remove lots of static variables
msm: - DSI updates from 10nm / SDM845 - fix for race condition with a3xx/a4xx fence completion irq - some refactoring/prep work for eventual a6xx support (ie. when we have a userspace) - a5xx debugfs enhancements - some mdp5 fixes/cleanups to prepare for eventually merging writeback - support (ie. when we have a userspace)
tegra: - mmap() fixes for fbdev devices - Overlay plane for hw cursor fix - dma-buf cache maintenance support
mali-dp: - YUV->RGB conversion support
rockchip: - rk3399/chromebook fixes and improvements
rcar-du: - LVDS support move to drm bridge - DT bindings for R8A77995 - Driver/DT support for R8A77970
tilcdc: - DRM panel support"
* tag 'drm-for-v4.17' of git://people.freedesktop.org/~airlied/linux: (1646 commits) drm/i915: Fix hibernation with ACPI S0 target state drm/i915/execlists: Use a locked clear_bit() for synchronisation with interrupt drm/i915: Specify which engines to reset following semaphore/event lockups drm/i915/dp: Write to SET_POWER dpcd to enable MST hub. drm/amdkfd: Use ordered workqueue to restore processes drm/amdgpu: Fix acquiring VM on large-BAR systems drm/amd/pp: clean header file hwmgr.h drm/amd/pp: use mlck_table.count for array loop index limit drm: Fix uabi regression by allowing garbage mode->type from userspace drm/amdgpu: Add an ATPX quirk for hybrid laptop drm/amdgpu: fix spelling mistake: "asssert" -> "assert" drm/amd/pp: Add new asic support in pp_psm.c drm/amd/pp: Clean up powerplay code on Vega12 drm/amd/pp: Add smu irq handlers for legacy asics drm/amd/pp: Fix set wrong temperature range on smu7 drm/amdgpu: Don't change preferred domian when fallback GTT v5 drm/vmwgfx: Bump version patchlevel and date drm/vmwgfx: use monotonic event timestamps drm/vmwgfx: Unpin the screen object backup buffer when not used drm/vmwgfx: Stricter count of legacy surface device resources ...
show more ...
|
Revision tags: v4.16 |
|
#
1f901d59 |
| 30-Mar-2018 |
Rodrigo Vivi <rodrigo.vivi@intel.com> |
Merge airlied/drm-next into drm-intel-next-queued
Commit 'aee3bac0a3a8 ("drm/i915/psr: Tie PSR2 support to Y coordinate requirement")' got merged to drm-intel-next-queued but the variable was define
Merge airlied/drm-next into drm-intel-next-queued
Commit 'aee3bac0a3a8 ("drm/i915/psr: Tie PSR2 support to Y coordinate requirement")' got merged to drm-intel-next-queued but the variable was defined commit 'c5fe47327b06 ("drm: Add PSR version 3 macro") who was merged through drm-misc.
So backmerging to get drm-intel-next-queued compiling back again.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
show more ...
|
#
83fd26c3 |
| 30-Mar-2018 |
Sean Paul <seanpaul@chromium.org> |
Merge airlied/drm-next into drm-misc-next
Backmerging to pick up a fix from drm-misc-next-fixes.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
|
#
d4f96fd5 |
| 29-Mar-2018 |
Joerg Roedel <jroedel@suse.de> |
Merge branches 'x86/amd', 'x86/vt-d', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/exynos', 'arm/renesas', 'arm/smmu' and 'core' into next
|
#
b24d0d5b |
| 28-Mar-2018 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.16-rc7 into char-misc-next
We want the hyperv fix in here for merging and testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
2b4f44ee |
| 28-Mar-2018 |
Dave Airlie <airlied@redhat.com> |
Backmerge tag 'v4.16-rc7' into drm-next
Linux 4.16-rc7
This was requested by Daniel, and things were getting a bit hard to reconcile, most of the conflicts were trivial though.
|
Revision tags: v4.16-rc7 |
|
#
0b884c22 |
| 24-Mar-2018 |
Wolfram Sang <wsa@the-dreams.de> |
Merge tag 'at24-4.17-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-4.17
"three new special cases for device tree compatible strings"
|
#
03fe2deb |
| 23-Mar-2018 |
David S. Miller <davem@davemloft.net> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fun set of conflict resolutions here...
For the mac80211 stuff, these were fortunately just parallel adds. Trivially resolved.
In dri
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fun set of conflict resolutions here...
For the mac80211 stuff, these were fortunately just parallel adds. Trivially resolved.
In drivers/net/phy/phy.c we had a bug fix in 'net' that moved the function phy_disable_interrupts() earlier in the file, whilst in 'net-next' the phy_error() call from this function was removed.
In net/ipv4/xfrm4_policy.c, David Ahern's changes to remove the 'rt_table_id' member of rtable collided with a bug fix in 'net' that added a new struct member "rt_mtu_locked" which needs to be copied over here.
The mlxsw driver conflict consisted of net-next separating the span code and definitions into separate files, whilst a 'net' bug fix made some changes to that moved code.
The mlx5 infiniband conflict resolution was quite non-trivial, the RDMA tree's merge commit was used as a guide here, and here are their notes:
====================
Due to bug fixes found by the syzkaller bot and taken into the for-rc branch after development for the 4.17 merge window had already started being taken into the for-next branch, there were fairly non-trivial merge issues that would need to be resolved between the for-rc branch and the for-next branch. This merge resolves those conflicts and provides a unified base upon which ongoing development for 4.17 can be based.
Conflicts: drivers/infiniband/hw/mlx5/main.c - Commit 42cea83f9524 (IB/mlx5: Fix cleanup order on unload) added to for-rc and commit b5ca15ad7e61 (IB/mlx5: Add proper representors support) add as part of the devel cycle both needed to modify the init/de-init functions used by mlx5. To support the new representors, the new functions added by the cleanup patch needed to be made non-static, and the init/de-init list added by the representors patch needed to be modified to match the init/de-init list changes made by the cleanup patch. Updates: drivers/infiniband/hw/mlx5/mlx5_ib.h - Update function prototypes added by representors patch to reflect new function names as changed by cleanup patch drivers/infiniband/hw/mlx5/ib_rep.c - Update init/de-init stage list to match new order from cleanup patch ====================
Signed-off-by: David S. Miller <davem@davemloft.net>
show more ...
|
#
5893ed18 |
| 22-Mar-2018 |
James Morris <james.morris@microsoft.com> |
Merge tag 'v4.16-rc6' into next-general
Merge to Linux 4.16-rc6 at the request of Jarkko, for his TPM updates.
|
#
0c5286a8 |
| 21-Mar-2018 |
Dave Airlie <airlied@redhat.com> |
Merge tag 'drm-misc-next-2018-03-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.17:
Cross-subsystem Changes: dt-bindings: Add emtrion vendor prefix (Jan)
Core
Merge tag 'drm-misc-next-2018-03-21' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.17:
Cross-subsystem Changes: dt-bindings: Add emtrion vendor prefix (Jan)
Core Changes: drm_print: More object size reductions (Joe)
Driver Changes: vc4: Fix alpha blending on bottom plane (Stefan) panel: Add Raydium RM68200 panel support (Phillipe) panel: Add AUO G104SN02 V2 panel support (Christoph) panel: Add KEO TX31D200VM0BAA panel support (Jagan) vga_switcheroo: Use device link to bookkeep HDA runtime pm (Lukas) rockchip: More CrOS kevin patches trickling in (various sun4i: Add A80 support (Chen-Yu) sun4i: Add YUV plane support (Maxime) meson: Multiple (mostly error-path) fixups (Christophe/Wei)
Cc: Stefan Schake <stschake@gmail.com> Cc: Philippe CORNU <philippe.cornu@st.com> Cc: jan.tuerk@emtrion.com Cc: Christoph Fritz <chf.fritz@googlemail.com> Cc: Jagan Teki <jagannadh.teki@gmail.com> Cc: Lukas Wunner <lukas@wunner.de> Cc: Joe Perches <joe@perches.com> Cc: Chen-Yu Tsai <wens@csie.org> Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Cc: Wei Yongjun <weiyongjun1@huawei.com>
* tag 'drm-misc-next-2018-03-21' of git://anongit.freedesktop.org/drm/drm-misc: (70 commits) drm/qxl: Replace drm_gem_object_reference/unreference() with _get/put() drm/meson: Fix potential NULL dereference in meson_drv_bind_master() drm/sun4i: backend: Support YUV planes drm/sun4i: backend: Check that we only have a single YUV plane drm/sun4i: Add driver support for A80 display pipeline drm/sun4i: Add compatible strings for the A80 display pipeline drm/sun4i: Add support for A80 TCONs drm/sun4i: Add DT binding for Detail Enhancement Unit in Allwinner A80 SoC drm/sun4i: Add compatible strings for A80 TCONs drm: Reduce object size of DRM_DEV_<LEVEL> uses drm/doc: Put all driver docs into a separate chapter drm: dma_bufs: Fixed checkpatch issues drm: remove drm_mode_object_{un/reference} aliases drm: Add PSR version 3 macro drm/vc4_validate: Remove VLA usage drm: Make drm_mode_vrefresh() a bit more accurate drm: Nuke the useless 'ret' variable from drm_mode_convert_umode() drm/i915: Use drm_color_lut_size() drm/i915: Remove the blob->data casts drm: Introduce drm_color_lut_size() ...
show more ...
|
#
4958134d |
| 20-Mar-2018 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.16-rc6 into tty-next
We want the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
edc39c9b |
| 20-Mar-2018 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'linus' into x86/build to pick up dependencies
|
#
3eb93ea3 |
| 20-Mar-2018 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'x86/mm' into x86/dma, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
a8f25c36 |
| 20-Mar-2018 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge branch 4.16-rc6 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
10c18c44 |
| 20-Mar-2018 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|