From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + linux-next-git-rejects.patch added to -mm tree Date: Mon, 23 Sep 2013 11:24:32 -0700 Message-ID: <52408760.tvDcHj8njld9qXUn%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:54853 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752950Ab3IWSYd (ORCPT ); Mon, 23 Sep 2013 14:24:33 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org, akpm@linux-foundation.org Subject: + linux-next-git-rejects.patch added to -mm tree To: akpm@linux-foundation.org From: akpm@linux-foundation.org Date: Mon, 23 Sep 2013 11:24:32 -0700 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/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- drivers/gpu/drm/i915/intel_display.c | 4 ---- drivers/gpu/drm/i915/intel_dvo.c | 7 ------- 2 files changed, 11 deletions(-) diff -puN drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_display.c --- a/drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects +++ a/drivers/gpu/drm/i915/intel_display.c @@ -4933,11 +4933,7 @@ static int i9xx_crtc_mode_set(struct drm } } -<<<<<<< HEAD - if (is_lvds && dev_priv->lvds_downclock_avail) { -======= if (!is_dsi && is_lvds && dev_priv->lvds_downclock_avail) { ->>>>>>> linux-next/akpm-base /* * Ensure we match the reduced clock's P to the target clock. * If the clocks don't match, we can't switch the display clock diff -puN drivers/gpu/drm/i915/intel_dvo.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_dvo.c --- a/drivers/gpu/drm/i915/intel_dvo.c~linux-next-git-rejects +++ a/drivers/gpu/drm/i915/intel_dvo.c @@ -265,13 +265,6 @@ static bool intel_dvo_compute_config(str C(vtotal); C(clock); #undef C -<<<<<<< HEAD - - drm_mode_set_crtcinfo(adjusted_mode, 0); - } -======= ->>>>>>> linux-next/akpm-base - drm_mode_set_crtcinfo(adjusted_mode, 0); } _ Patches currently in -mm which might be from akpm@linux-foundation.org are origin.patch linux-next.patch arch-alpha-kernel-systblss-remove-debug-check.patch i-need-old-gcc.patch watchdog-update-watchdog_tresh-properly-fix.patch revert-memcg-vmscan-do-not-fall-into-reclaim-all-pass-too-quickly.patch revert-memcg-track-all-children-over-limit-in-the-root.patch revert-memcg-vmscan-do-not-attempt-soft-limit-reclaim-if-it-would-not-scan-anything.patch revert-memcg-track-children-in-soft-limit-excess-to-improve-soft-limit.patch revert-memcg-enhance-memcg-iterator-to-support-predicates.patch revert-vmscan-memcg-do-softlimit-reclaim-also-for-targeted-reclaim.patch revert-memcg-get-rid-of-soft-limit-tree-infrastructure.patch revert-memcg-vmscan-integrate-soft-reclaim-tighter-with-zone-shrinking-code.patch kernel-rebootc-re-enable-the-function-of-variable-reboot_default-fix.patch fs-binfmt_elfc-prevent-a-coredump-with-a-large-vm_map_count-from-oopsing-fix.patch sound-soc-atmel-atmel-pcmc-fix-warning.patch kernel-time-tick-commonc-document-tick_do_timer_cpu.patch makefile-enable-werror=implicit-int-and-werror=strict-prototypes-by-default.patch mm-readaheadc-do_readhead-dont-check-for-readpage.patch mm.patch mm-vmalloc-revert-mm-vmallocc-emit-the-failure-message-before-return-fix.patch checkpatch-extend-camelcase-types-and-ignore-existing-camelcase-uses-in-a-patch.patch binfmt_elfc-use-get_random_int-to-fix-entropy-depleting.patch fat-additions-to-support-fat_fallocate.patch fat-additions-to-support-fat_fallocate-v6-checkpatch-fixes.patch gcov-add-support-for-gcc-47-gcov-format-fix.patch gcov-add-support-for-gcc-47-gcov-format-fix-fix.patch gcov-add-support-for-gcc-47-gcov-format-checkpatch-fixes.patch kernel-gcov-fsc-use-pr_warn.patch drivers-block-skd_mainc-fix-a-few-things-disable-on-32-bit.patch mm-drop-actor-argument-of-do_generic_file_read-fix.patch debugging-keep-track-of-page-owners-fix-2-fix.patch debugging-keep-track-of-page-owners-fix-2-fix-fix-fix.patch journal_add_journal_head-debug.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch put_bh-debug.patch linux-next-git-rejects.patch