From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1340EB652; Mon, 5 Jan 2026 02:16:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767579373; cv=none; b=gdrFDLXRLnQqt7JhoJdnNHKOugdB5QjXsj9lTOT2j5k3GyBX69D2bFo8/MvRbzDNciiBB12lofi4q6lUr0fnk3k8t7g2QSLSYhVnTcq5j53AshF6NqzSSvM/G21+OANyUA4yvJtVx+ptdYIDPK7GSd4rOJZ3ZK9LOFfmItp9HRk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767579373; c=relaxed/simple; bh=LUVvGLORn/j00fOai2RoR/6udfVgcZZtT6+SYjhUtVU=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=YazXH1dF69z/BPPkzOZdSAJ22VhFYzYwZA2yBfbmR8C3S12HZ0RRTnRmhlBW8Qmrpj7/CDCnKRntznbzl0PXOBXWWaqy2u8UA1qqADwXrwZjH3GcPOzvUyoLh5w2ZLp0kGvBCwA/7z22sKmhFm38b4ZKlV4N3PC+LqwxDCCLMTU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=bxbzuZiF; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="bxbzuZiF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=202503; t=1767579369; bh=9RzXzUvt8/QuFi+IRhSWlUXRQrQLYf71/r0RyEr+KcU=; h=Date:From:To:Cc:Subject:From; b=bxbzuZiFEPDJvbADVOGfdeUMWlQiAu3gZgTFUD+nB2wguI6xjW2jShOTYD7eKMhn4 QIHEydmji2sarKmQRwdDuf8ZvJ5bucRg3J+dI97+2y00KrSzG0ZgW299sMcWcsVPRh 1yyXRvYvNBkbPT3tfgCpIkOZEFLboujAv816cPxnZ2e/220CJilizXACvO48TC4SHK P5XlV6z5ZWYx5hu5O1sxUXRNpov2ch/wSA9jKOuPY+xSgzpu09th96+tcoCIObyahb MIIIGx+XVjzhmbCqEN55qQciBaVHmwZmGk2/g/ct7P3rmDQf4O1QDhNk0H1AXKzm1Z RFtXPdQuqwSbw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange secp256r1 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4dkyZw2hbwz4w9T; Mon, 05 Jan 2026 13:16:08 +1100 (AEDT) Date: Mon, 5 Jan 2026 13:16:07 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Boris Brezillon , Linux Kernel Mailing List , Linux Next Mailing List , =?UTF-8?B?TG/Dr2M=?= Molinari , Thomas Zimmermann Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20260105131607.718d22cb@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/spBOp=R_D0r.2JHT056REcV"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/spBOp=R_D0r.2JHT056REcV Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_gem_shmem_helper.c between commit: 8f05e411aee3 ("drm/gem-shmem: Fix typos in documentation") from Linus' tree and commit: b440baf35591 ("drm/gem: Fix kerneldoc warnings") from the drm tree. I fixed it up (I just used the latter) 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. --=20 Cheers, Stephen Rothwell --Sig_/spBOp=R_D0r.2JHT056REcV Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmlbHucACgkQAVBC80lX 0Gzg/wf/fosau1ItNUPRa9Dabe9bg73+WF+vMUUw7I53wWqRskCtVeBGPcIk/gXd twoLgeNBuQ6nBFRR2mqdl/K2lkiI0M9xVlIe1M7GPEQNUImYn5d++S9HeGx3wOIC N4PBL8/xtoF99kobOeUeU2txANfWDpNztToweO4bV1orlqIL0HevKwEYdtINySR0 bZstxvNusDkxHF4PRb4W/Z+ulooCdigShHm4MfwuFKCOf9/RIVfnnW1ctKIpzGAp Jtu2up+ekg/wAQVgRh7VyZ4lJZMbtVjSQGJ3Xxg9EcA8NzRGZo6Pnm/bEYgD0vuZ khupYZc1qvD9Y3MPULZiv+R3yaiqSQ== =s4D6 -----END PGP SIGNATURE----- --Sig_/spBOp=R_D0r.2JHT056REcV--