linux-kernel - linux-next: manual merge of the drm-msm tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20220413095840.4eadca71@canb.auug.org.au>
Date:   Wed, 13 Apr 2022 09:58:40 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Rob Clark <robdclark@...il.com>, Sean Paul <seanpaul@...omium.org>
Cc:     Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Maxime Ripard <maxime@...no.tech>,
        Rob Clark <robdclark@...omium.org>,
        Xiaoke Wang <xkernel.wang@...mail.com>
Subject: linux-next: manual merge of the drm-msm tree with Linus' tree

Hi all,

Today's linux-next merge of the drm-msm tree got a conflict in:

  drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c

between commit:

  c228cb343a6d ("drm/msm/mdp5: Remove redundant zpos initialisation")

from Linus' tree and commit:

  047ae6655777 ("drm/msm/mdp5: check the return of kzalloc()")

from the drm-msm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
index 1ee824600995,85ef10b888e9..000000000000
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
@@@ -98,7 -91,17 +98,11 @@@ static void mdp5_plane_reset(struct drm
  		__drm_atomic_helper_plane_destroy_state(plane->state);
  
  	kfree(to_mdp5_plane_state(plane->state));
+ 	plane->state = NULL;
  	mdp5_state = kzalloc(sizeof(*mdp5_state), GFP_KERNEL);
+ 	if (!mdp5_state)
+ 		return;
+ 
 -	if (plane->type == DRM_PLANE_TYPE_PRIMARY)
 -		mdp5_state->base.zpos = STAGE_BASE;
 -	else
 -		mdp5_state->base.zpos = STAGE0 + drm_plane_index(plane);
 -	mdp5_state->base.normalized_zpos = mdp5_state->base.zpos;
 -
  	__drm_atomic_helper_plane_reset(plane, &mdp5_state->base);
  }
  

Content of type "application/pgp-signature" skipped