#
e42f6f9b |
| 04-Sep-2018 |
James Morris <james.morris@microsoft.com> |
Merge tag 'v4.19-rc2' into next-general
Sync to Linux 4.19-rc2 for downstream developers.
|
#
6e2d6b27 |
| 28-Aug-2018 |
Mark Brown <broonie@kernel.org> |
Merge tag 'v4.19-rc1' into asoc-4.19
Linux 4.19-rc1
|
#
ea4d65f1 |
| 28-Aug-2018 |
Tony Lindgren <tony@atomide.com> |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
|
#
bc537a9c |
| 27-Aug-2018 |
Sean Paul <seanpaul@chromium.org> |
Merge drm/drm-next into drm-misc-next
Now that 4.19-rc1 is cut, backmerge it into -misc-next.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
|
#
0a3173a5 |
| 16-Aug-2018 |
Jason Gunthorpe <jgg@mellanox.com> |
Merge branch 'linus/master' into rdma.git for-next
rdma.git merge resolution for the 4.19 merge window
Conflicts: drivers/infiniband/core/rdma_core.c - Use the rdma code and revise with the new
Merge branch 'linus/master' into rdma.git for-next
rdma.git merge resolution for the 4.19 merge window
Conflicts: drivers/infiniband/core/rdma_core.c - Use the rdma code and revise with the new spelling for atomic_fetch_add_unless drivers/nvme/host/rdma.c - Replace max_sge with max_send_sge in new blk code drivers/nvme/target/rdma.c - Use the blk code and revise to use NULL for ib_post_recv when appropriate - Replace max_sge with max_recv_sge in new blk code net/rds/ib_send.c - Use the net code and revise to use NULL for ib_post_recv when appropriate
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
show more ...
|
#
89982f7c |
| 16-Aug-2018 |
Jason Gunthorpe <jgg@mellanox.com> |
Merge tag 'v4.18' into rdma.git for-next
Resolve merge conflicts from the -rc cycle against the rdma.git tree:
Conflicts: drivers/infiniband/core/uverbs_cmd.c - New ifs added to ib_uverbs_ex_cre
Merge tag 'v4.18' into rdma.git for-next
Resolve merge conflicts from the -rc cycle against the rdma.git tree:
Conflicts: drivers/infiniband/core/uverbs_cmd.c - New ifs added to ib_uverbs_ex_create_flow in -rc and for-next - Merge removal of file->ucontext in for-next with new code in -rc drivers/infiniband/core/uverbs_main.c - for-next removed code from ib_uverbs_write() that was modified in for-rc
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
show more ...
|
#
54dbe75b |
| 16-Aug-2018 |
Linus Torvalds <torvalds@linux-foundation.org> |
Merge tag 'drm-next-2018-08-15' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie: "This is the main drm pull request for 4.19.
Rob has some new hardware support for new
Merge tag 'drm-next-2018-08-15' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie: "This is the main drm pull request for 4.19.
Rob has some new hardware support for new qualcomm hw that I'll send along separately. This has the display part of it, the remaining pull is for the acceleration engine.
This also contains a wound-wait/wait-die mutex rework, Peter has acked it for merging via my tree.
Otherwise mostly the usual level of activity. Summary:
core: - Wound-wait/wait-die mutex rework - Add writeback connector type - Add "content type" property for HDMI - Move GEM bo to drm_framebuffer - Initial gpu scheduler documentation - GPU scheduler fixes for dying processes - Console deferred fbcon takeover support - Displayport support for CEC tunneling over AUX
panel: - otm8009a panel driver fixes - Innolux TV123WAM and G070Y2-L01 panel driver - Ilitek ILI9881c panel driver - Rocktech RK070ER9427 LCD - EDT ETM0700G0EDH6 and EDT ETM0700G0BDH6 - DLC DLC0700YZG-1 - BOE HV070WSA-100 - newhaven, nhd-4.3-480272ef-atxl LCD - DataImage SCF0700C48GGU18 - Sharp LQ035Q7DB03 - p079zca: Refactor to support multiple panels
tinydrm: - ILI9341 display panel
New driver: - vkms - virtual kms driver to testing.
i915: - Icelake: Display enablement DSI support IRQ support Powerwell support - GPU reset fixes and improvements - Full ppgtt support refactoring - PSR fixes and improvements - Execlist improvments - GuC related fixes
amdgpu: - Initial amdgpu documentation - JPEG engine support on VCN - CIK uses powerplay by default - Move to using core PCIE functionality for gens/lanes - DC/Powerplay interface rework - Stutter mode support for RV - Vega12 Powerplay updates - GFXOFF fixes - GPUVM fault debugging - Vega12 GFXOFF - DC improvements - DC i2c/aux changes - UVD 7.2 fixes - Powerplay fixes for Polaris12, CZ/ST - command submission bo_list fixes
amdkfd: - Raven support - Power management fixes
udl: - Cleanups and fixes
nouveau: - misc fixes and cleanups.
msm: - DPU1 support display controller in sdm845 - GPU coredump support.
vmwgfx: - Atomic modesetting validation fixes - Support for multisample surfaces
armada: - Atomic modesetting support completed.
exynos: - IPPv2 fixes - Move g2d to component framework - Suspend/resume support cleanups - Driver cleanups
imx: - CSI configuration improvements - Driver cleanups - Use atomic suspend/resume helpers - ipu-v3 V4L2 XRGB32/XBGR32 support
pl111: - Add Nomadik LCDC variant
v3d: - GPU scheduler jobs management
sun4i: - R40 display engine support - TCON TOP driver
mediatek: - MT2712 SoC support
rockchip: - vop fixes
omapdrm: - Workaround for DRA7 errata i932 - Fix mm_list locking
mali-dp: - Writeback implementation PM improvements - Internal error reporting debugfs
tilcdc: - Single fix for deferred probing
hdlcd: - Teardown fixes
tda998x: - Converted to a bridge driver.
etnaviv: - Misc fixes"
* tag 'drm-next-2018-08-15' of git://anongit.freedesktop.org/drm/drm: (1506 commits) drm/amdgpu/sriov: give 8s for recover vram under RUNTIME drm/scheduler: fix param documentation drm/i2c: tda998x: correct PLL divider calculation drm/i2c: tda998x: get rid of private fill_modes function drm/i2c: tda998x: move mode_valid() to bridge drm/i2c: tda998x: register bridge outside of component helper drm/i2c: tda998x: cleanup from previous changes drm/i2c: tda998x: allocate tda998x_priv inside tda998x_create() drm/i2c: tda998x: convert to bridge driver drm/scheduler: fix timeout worker setup for out of order job completions drm/amd/display: display connected to dp-1 does not light up drm/amd/display: update clk for various HDMI color depths drm/amd/display: program display clock on cache match drm/amd/display: Add NULL check for enabling dp ss drm/amd/display: add vbios table check for enabling dp ss drm/amd/display: Don't share clk source between DP and HDMI drm/amd/display: Fix DP HBR2 Eye Diagram Pattern on Carrizo drm/amd/display: Use calculated disp_clk_khz value for dce110 drm/amd/display: Implement custom degamma lut on dcn drm/amd/display: Destroy aux_engines only once ...
show more ...
|
#
f5b6c1fc |
| 13-Aug-2018 |
Takashi Iwai <tiwai@suse.de> |
Merge tag 'asoc-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.19
A fairly big update, including quite a bit of core activity this time
Merge tag 'asoc-v4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v4.19
A fairly big update, including quite a bit of core activity this time around (which is good to see) along with a fairly large set of new drivers.
- A new snd_pcm_stop_xrun() helper which is now used in several drivers. - Support for providing name prefixes to generic component nodes. - Quite a few fixes for DPCM as it gains a bit wider use and more robust testing. - Generalization of the DIO2125 support to a simple amplifier driver. - Accessory detection support for the audio graph card. - DT support for PXA AC'97 devices. - Quirks for a number of new x86 systems. - Support for AM Logic Meson, Everest ES7154, Intel systems with RT5682, Qualcomm QDSP6 and WCD9335, Realtek RT5682 and TI TAS5707.
show more ...
|
#
d0ed4c60 |
| 09-Aug-2018 |
Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
Merge branch 'acpi-scan' to satisfy dependencies.
|
#
6488a7f3 |
| 08-Aug-2018 |
Joerg Roedel <jroedel@suse.de> |
Merge branches 'arm/shmobile', 'arm/renesas', 'arm/msm', 'arm/smmu', 'arm/omap', 'x86/amd', 'x86/vt-d' and 'core' into next
|
#
31570604 |
| 06-Aug-2018 |
Thomas Gleixner <tglx@linutronix.de> |
Merge branch 'x86/pti-urgent' into x86/pti
Integrate the PTI Global bit fixes which conflict with the 32bit PTI support.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
#
d2ce98ca |
| 06-Aug-2018 |
Paolo Bonzini <pbonzini@redhat.com> |
Merge tag 'v4.18-rc6' into HEAD
Pull bug fixes into the KVM development tree to avoid nasty conflicts.
|
#
a3046108 |
| 06-Aug-2018 |
Stefan Schmidt <stefan@datenfreihafen.org> |
Merge remote-tracking branch 'net-next/master'
|
#
05b9ba4b |
| 06-Aug-2018 |
Jens Axboe <axboe@kernel.dk> |
Merge tag 'v4.18-rc6' into for-4.19/block2
Pull in 4.18-rc6 to get the NVMe core AEN change to avoid a merge conflict down the line.
Signed-of-by: Jens Axboe <axboe@kernel.dk>
|
#
f2701b77 |
| 05-Aug-2018 |
Thomas Gleixner <tglx@linutronix.de> |
Merge 4.18-rc7 into master to pick up the KVM dependcy
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
#
c5f5aeef |
| 03-Aug-2018 |
Herbert Xu <herbert@gondor.apana.org.au> |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to pick up c7513c2a2714 ("crypto/arm64: aes-ce-gcm - add missing kernel_neon_begin/end pair").
|
#
15da0950 |
| 01-Aug-2018 |
Dave Airlie <airlied@redhat.com> |
Merge branch 'drm-armada-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-next
This set of changes migrates Armada DRM from legacy modeset to atomic modeset. This is everything from the
Merge branch 'drm-armada-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-next
This set of changes migrates Armada DRM from legacy modeset to atomic modeset. This is everything from the "Transition Armada DRM planes to atomic state" and "Finish Armada DRM transition to atomic modeset" patch sets as posted on drm-devel, excluding the "Finish Armada DRM DT support" series.
These series did not evoke any comments - if there are any, these can be addressed via follow up patches.
Developed and tested on Dove Cubox with xf86-video-armada including the overlay plane, and also tested with the tools in libdrm.
Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180730110543.GA30664@rmk-PC.armlinux.org.uk
show more ...
|
#
0239520e |
| 30-Jul-2018 |
Russell King <rmk+kernel@armlinux.org.uk> |
drm/armada: add rectangle helpers
Add helpers to convert rectangle width/height and x/y to register values.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
#
c88b94a9 |
| 30-Jul-2018 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.18-rc7 into staging-next
We want the staging changes in here for testing and merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
d2fc88a6 |
| 30-Jul-2018 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.18-rc7 into driver-core-next
We need the driver core changes in here as well for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
8a7b5d0f |
| 30-Jul-2018 |
Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
Merge 4.18-rc7 into usb-next
We want the USB fixes in here as well to handle merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
#
3fce4618 |
| 30-Jul-2018 |
Dave Airlie <airlied@redhat.com> |
BackMerge v4.18-rc7 into drm-next
rmk requested this for armada and I think we've had a few conflicts build up.
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
#
b1d2b0a4 |
| 29-Jul-2018 |
Wolfram Sang <wsa@the-dreams.de> |
Merge tag 'at24-4.19-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-4.19
at24: updates for v4.19
New property: 'address-width' which allows to specify
Merge tag 'at24-4.19-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-4.19
at24: updates for v4.19
New property: 'address-width' which allows to specify the number of addressing bits. Up until now we only could choose one of the defined models and rely on the flags specified in its corresponding chip data structure.
show more ...
|
#
93081caa |
| 25-Jul-2018 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
#
4765096f |
| 25-Jul-2018 |
Ingo Molnar <mingo@kernel.org> |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|