Merge v4.4.86 into chromeos-4.4 |
||||||
Issue descriptionTracking bug for the merge of v4.4.86 into chromeos-4.4 The following patches were reverted from v4.4.86 prior to the merge to avoid merge conflicts. c81c4d453edf2 drm/i915: fix compiler warning in drivers/gpu/drm/i915/intel_uncore.c f7e0f7f86ce0c tpm: Replace device number bitmap with IDR Conflicts: arch/x86/kernel/cpu/perf_event_intel_lbr.c drivers/android/binder.c drivers/gpu/drm/drm_gem.c drivers/gpu/drm/rcar-du/rcar_du_crtc.c fs/pstore/ram.c mm/mempool.c net/core/dev.c
,
Sep 5 2017
,
Sep 5 2017
,
Sep 5 2017
,
Sep 11 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/2c4551465d0bd4ed81dafcdfb54e42ddafaab5c3 commit 2c4551465d0bd4ed81dafcdfb54e42ddafaab5c3 Author: Guenter Roeck <groeck@chromium.org> Date: Mon Sep 11 15:36:54 2017 CHROMIUM: Merge tag 'v4.4.86' into chromeos-4.4 Merge of v4.4.86 into chromeos-4.4 Conflicts: arch/x86/kernel/cpu/perf_event_intel_lbr.c drivers/android/binder.c drivers/gpu/drm/drm_gem.c drivers/gpu/drm/rcar-du/rcar_du_crtc.c fs/pstore/ram.c mm/mempool.c net/core/dev.c BUG= chromium:762046 TEST=Build and test on Eve, Kevin, Chell with 4.4 kernel Change-Id: I843bd55a18cde14429cdecd9cc29857e852f710f Signed-off-by: Guenter Roeck <groeck@chromium.org> [modify] https://crrev.com/2c4551465d0bd4ed81dafcdfb54e42ddafaab5c3/drivers/gpu/drm/rcar-du/rcar_du_crtc.c [modify] https://crrev.com/2c4551465d0bd4ed81dafcdfb54e42ddafaab5c3/net/core/dev.c [modify] https://crrev.com/2c4551465d0bd4ed81dafcdfb54e42ddafaab5c3/drivers/gpu/drm/drm_gem.c [delete] https://crrev.com/d825a6a1b10ccdc7c72104cf9a82a8718fbc9d59/drivers/net/wireless/p54/fwio.c [modify] https://crrev.com/2c4551465d0bd4ed81dafcdfb54e42ddafaab5c3/drivers/android/binder.c [modify] https://crrev.com/2c4551465d0bd4ed81dafcdfb54e42ddafaab5c3/drivers/net/wireless/intersil/p54/fwio.c [modify] https://crrev.com/2c4551465d0bd4ed81dafcdfb54e42ddafaab5c3/arch/x86/kernel/cpu/perf_event_intel_lbr.c [modify] https://crrev.com/2c4551465d0bd4ed81dafcdfb54e42ddafaab5c3/fs/pstore/ram.c [modify] https://crrev.com/2c4551465d0bd4ed81dafcdfb54e42ddafaab5c3/mm/mempool.c
,
Sep 11 2017
|
||||||
►
Sign in to add a comment |
||||||
Comment 1 by groeck@chromium.org
, Sep 5 2017