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: Fri, 24 Jun 2016 12:23:21 -0700 Message-ID: <576d88a9.E9QA6bYCu+rmbMQm%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]:38932 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750972AbcFXTXW (ORCPT ); Fri, 24 Jun 2016 15:23:22 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, mm-commits@vger.kernel.org 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_fbc.c | 4 ---- drivers/gpu/drm/sun4i/sun4i_drv.c | 7 ------- drivers/gpu/drm/sun4i/sun4i_rgb.c | 11 ----------- 3 files changed, 22 deletions(-) diff -puN drivers/gpu/drm/i915/intel_fbc.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_fbc.c --- a/drivers/gpu/drm/i915/intel_fbc.c~linux-next-git-rejects +++ a/drivers/gpu/drm/i915/intel_fbc.c @@ -818,10 +818,6 @@ static bool intel_fbc_can_choose(struct { struct drm_i915_private *dev_priv = crtc->base.dev->dev_private; struct intel_fbc *fbc = &dev_priv->fbc; -<<<<<<< HEAD - bool enable_by_default = IS_BROADWELL(dev_priv); -======= ->>>>>>> linux-next/akpm-base if (intel_vgpu_active(dev_priv)) { fbc->no_fbc_reason = "VGPU is active"; diff -puN drivers/gpu/drm/sun4i/sun4i_drv.c~linux-next-git-rejects drivers/gpu/drm/sun4i/sun4i_drv.c --- a/drivers/gpu/drm/sun4i/sun4i_drv.c~linux-next-git-rejects +++ a/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -174,13 +174,6 @@ static int sun4i_drv_bind(struct device if (ret) goto free_drm; -<<<<<<< HEAD - ret = drm_connector_register_all(drm); - if (ret) - goto unregister_drm; - -======= ->>>>>>> linux-next/akpm-base return 0; free_drm: diff -puN drivers/gpu/drm/sun4i/sun4i_rgb.c~linux-next-git-rejects drivers/gpu/drm/sun4i/sun4i_rgb.c --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c~linux-next-git-rejects +++ a/drivers/gpu/drm/sun4i/sun4i_rgb.c @@ -95,17 +95,6 @@ static int sun4i_rgb_mode_valid(struct d rounded_rate = clk_round_rate(tcon->dclk, rate); if (rounded_rate < rate) return MODE_CLOCK_LOW; -<<<<<<< HEAD - - if (rounded_rate > rate) - return MODE_CLOCK_HIGH; - - DRM_DEBUG_DRIVER("Clock rate OK\n"); - - return MODE_OK; -} -======= ->>>>>>> linux-next/akpm-base if (rounded_rate > rate) return MODE_CLOCK_HIGH; _ Patches currently in -mm which might be from akpm@linux-foundation.org are i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch mm.patch mm-reorganize-slab-freelist-randomization-fix.patch mm-balloon-use-general-non-lru-movable-page-feature-fix.patch mm-compaction-split-freepages-without-holding-the-zone-lock-fix-2.patch mm-frontswap-convert-frontswap_enabled-to-static-key-checkpatch-fixes.patch mm-add-nr_zsmalloc-to-vmstat-fix.patch mm-memcg-use-consistent-gfp-flags-during-readahead-checkpatch-fixes.patch mm-thp-make-swapin-readahead-under-down_read-of-mmap_sem-fix-2-fix.patch mm-fix-build-warnings-in-linux-compactionh-fix.patch mm-update-the-comment-in-__isolate_free_page-checkpatch-fixes.patch nvme-dont-allocate-unused-nvme_major-fix.patch printk-create-pr_level-functions-fix.patch kexec-ensure-user-memory-sizes-do-not-wrap-fix.patch kexec-allow-architectures-to-override-boot-mapping-fix.patch linux-next-rejects.patch drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch bitmap-bitmap_equal-memcmp-optimization-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch linux-next-git-rejects.patch