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: Sat, 25 Apr 2020 15:55:19 -0700 Message-ID: <20200425225519.RFookTy27%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:50848 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726232AbgDYWzV (ORCPT ); Sat, 25 Apr 2020 18:55:21 -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/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 Subject: linux-next-git-rejects Signed-off-by: Andrew Morton --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 - drivers/gpu/drm/i915/display/intel_display_power.c | 24 ----------- drivers/gpu/drm/tidss/tidss_encoder.c | 14 ------ 3 files changed, 41 deletions(-) --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c~linux-next-git-rejects +++ a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4748,8 +4748,6 @@ amdgpu_dm_connector_late_register(struct struct amdgpu_dm_connector *amdgpu_dm_connector = to_amdgpu_dm_connector(connector); int r; -<<<<<<< HEAD -======= if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) || (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) { @@ -4758,7 +4756,6 @@ amdgpu_dm_connector_late_register(struct if (r) return r; } ->>>>>>> linux-next/akpm-base if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) || (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) { --- a/drivers/gpu/drm/i915/display/intel_display_power.c~linux-next-git-rejects +++ a/drivers/gpu/drm/i915/display/intel_display_power.c @@ -4188,11 +4188,7 @@ static const struct i915_power_well_desc { .name = "AUX D TBT1", .domains = TGL_AUX_D_TBT1_IO_POWER_DOMAINS, -<<<<<<< HEAD - .ops = &icl_tc_phy_aux_power_well_ops, -======= .ops = &icl_aux_power_well_ops, ->>>>>>> linux-next/akpm-base .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs, @@ -4203,11 +4199,7 @@ static const struct i915_power_well_desc { .name = "AUX E TBT2", .domains = TGL_AUX_E_TBT2_IO_POWER_DOMAINS, -<<<<<<< HEAD - .ops = &icl_tc_phy_aux_power_well_ops, -======= .ops = &icl_aux_power_well_ops, ->>>>>>> linux-next/akpm-base .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs, @@ -4218,11 +4210,7 @@ static const struct i915_power_well_desc { .name = "AUX F TBT3", .domains = TGL_AUX_F_TBT3_IO_POWER_DOMAINS, -<<<<<<< HEAD - .ops = &icl_tc_phy_aux_power_well_ops, -======= .ops = &icl_aux_power_well_ops, ->>>>>>> linux-next/akpm-base .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs, @@ -4233,11 +4221,7 @@ static const struct i915_power_well_desc { .name = "AUX G TBT4", .domains = TGL_AUX_G_TBT4_IO_POWER_DOMAINS, -<<<<<<< HEAD - .ops = &icl_tc_phy_aux_power_well_ops, -======= .ops = &icl_aux_power_well_ops, ->>>>>>> linux-next/akpm-base .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs, @@ -4248,11 +4232,7 @@ static const struct i915_power_well_desc { .name = "AUX H TBT5", .domains = TGL_AUX_H_TBT5_IO_POWER_DOMAINS, -<<<<<<< HEAD - .ops = &icl_tc_phy_aux_power_well_ops, -======= .ops = &icl_aux_power_well_ops, ->>>>>>> linux-next/akpm-base .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs, @@ -4263,11 +4243,7 @@ static const struct i915_power_well_desc { .name = "AUX I TBT6", .domains = TGL_AUX_I_TBT6_IO_POWER_DOMAINS, -<<<<<<< HEAD - .ops = &icl_tc_phy_aux_power_well_ops, -======= .ops = &icl_aux_power_well_ops, ->>>>>>> linux-next/akpm-base .id = DISP_PW_ID_NONE, { .hsw.regs = &icl_aux_power_well_regs, --- a/drivers/gpu/drm/tidss/tidss_encoder.c~linux-next-git-rejects +++ a/drivers/gpu/drm/tidss/tidss_encoder.c @@ -66,13 +66,6 @@ static const struct drm_encoder_helper_f .atomic_check = tidss_encoder_atomic_check, }; -<<<<<<< HEAD -static const struct drm_encoder_funcs encoder_funcs = { - .destroy = tidss_encoder_destroy, -}; - -======= ->>>>>>> linux-next/akpm-base struct drm_encoder *tidss_encoder_create(struct tidss_device *tidss, u32 encoder_type, u32 possible_crtcs) { @@ -85,15 +78,8 @@ struct drm_encoder *tidss_encoder_create enc->possible_crtcs = possible_crtcs; -<<<<<<< HEAD - ret = drm_encoder_init(&tidss->ddev, enc, &encoder_funcs, - encoder_type, NULL); - if (ret < 0) { - kfree(enc); -======= ret = drm_simple_encoder_init(&tidss->ddev, enc, encoder_type); if (ret < 0) ->>>>>>> linux-next/akpm-base return ERR_PTR(ret); } _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm-memcg-fix-error-return-value-of-mem_cgroup_css_alloc-fix.patch squashfs-migrate-from-ll_rw_block-usage-to-bio-fix.patch drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch mm.patch mm-slub-fix-corrupted-freechain-in-deactivate_slab-fix.patch mm-remove-__vmalloc_node_flags_caller-fix.patch mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node-fix.patch mm-remove-vmalloc_user_node_flags-fix.patch mm-replace-zero-length-array-with-flexible-array-member-fix.patch mm-hugetlb-fix-a-typo-in-comment-manitained-maintained-v2-checkpatch-fixes.patch initrdmem=-option-to-specify-initrd-physical-address-checkpatch-fixes.patch linux-next-fix.patch linux-next-git-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch