The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/i915/intel_dp.c | 8 --------
1 file changed, 8 deletions(-)
diff -puN drivers/gpu/drm/i915/intel_dp.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_dp.c
--- a/drivers/gpu/drm/i915/intel_dp.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_dp.c
@@ -1921,20 +1921,12 @@ intel_dp_compute_config(struct intel_enc
if (intel_connector->panel.downclock_mode != NULL &&
dev_priv->drrs.type == SEAMLESS_DRRS_SUPPORT) {
pipe_config->has_drrs = true;
-<<<<<<< HEAD
- intel_link_compute_m_n(bpp, lane_count,
- intel_connector->panel.downclock_mode->clock,
- pipe_config->port_clock,
- &pipe_config->dp_m2_n2,
- reduce_m_n);
-=======
intel_link_compute_m_n(pipe_config->pipe_bpp,
pipe_config->lane_count,
intel_connector->panel.downclock_mode->clock,
pipe_config->port_clock,
&pipe_config->dp_m2_n2,
reduce_m_n);
->>>>>>> linux-next/akpm-base
}
if (!HAS_DDI(dev_priv))
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
z3fold-fix-reclaim-lock-ups-checkpatch-fixes.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
zram-introduce-zram-memory-tracking-fix.patch
zram-introduce-zram-memory-tracking-update-fix.patch
zram-introduce-zram-memory-tracking-update-fix-fix.patch
mm-check-for-sigkill-inside-dup_mmap-loop-fix.patch
mm-vmalloc-pass-proper-vm_start-into-debugobjects-fix.patch
mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch
mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch
mm-memcontrolc-add-mem_cgroup_from_task-as-a-local-helper.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-fix.patch
proc-simpler-iterations-for-proc-cmdline-fix.patch
ida-remove-simple_ida_lock-fix.patch
kcov-prefault-the-kcov_area-fix.patch
kcov-prefault-the-kcov_area-fix-fix.patch
kcov-prefault-the-kcov_area-fix-fix-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
