From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 99F4C2417D1 for ; Mon, 5 Jan 2026 07:07:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767596873; cv=none; b=l9qrlQ/0dfmUjhyOKzpgGgCwEblzdM4HnPw7NlLcq5pllnTR5yKe/RCWPOIamF6XsFkBFsQ3FxSEaGLuZv6r0okvgOpD6NNVRiXTgN/tjY2wvsTjOM/VKk3U6wRNm9hCubGqEkf4ZypxoPGMburKs0LPya7Vo+yzgDmTaW0ZvCE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767596873; c=relaxed/simple; bh=DdHxT87EXmZRQ47DlVY63PvJhnwG447h+BmlEiwBjOE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=EQkjCKgxL1Ghajs1i/sPXIs8wH/ar8nZFv9DUeIQk7duHygnrc9Q3BxyUMt304btbJoW6z5fe7YUM+rMnVOHnmX/h/nkTfcrkEi0BeVfZ3Mobpp+OTJdYlzYBdANFOhGnFUve5N/yuWBqMVy14zV7Q+uqDFQwK3gtgaGzGWN8nw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=oE/+gC2l; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=qZh/b16q; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=o0jKz9CK; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=33eJQ5J4; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="oE/+gC2l"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="qZh/b16q"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="o0jKz9CK"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="33eJQ5J4" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 942303373F; Mon, 5 Jan 2026 07:07:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1767596863; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=QtcT2vuX9NDExh0WlhoDMzjoiaeH7DXVmIilOH/kAyU=; b=oE/+gC2lDs91eSvmnJdFlotJbYlNypLzcEbYP1/+76rHpmUqpZax/K8Af+YHKI90FlIKZX 6PhNS8C29NLKT70UYr1/9L8eTTj7MlQvQBfDR2vltDgMFI6GBoGIaJca6OuW1In9tokcm+ kuqyaCROr6NTh6kR4FLsfJO7QKnuicA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1767596863; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=QtcT2vuX9NDExh0WlhoDMzjoiaeH7DXVmIilOH/kAyU=; b=qZh/b16qDA1vbAoBhwwdl2CjFWznJEOhBO4mtdarH3gPZAituE44QEv43mJxK12yBqkDQH 4wPwR0Y7AGnUieBw== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=o0jKz9CK; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=33eJQ5J4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1767596862; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=QtcT2vuX9NDExh0WlhoDMzjoiaeH7DXVmIilOH/kAyU=; b=o0jKz9CKClnrUWKkXhhgQmQQVq0ugobIGSaBkRCAuEjKIm0ULCGgnkxEeKM6XKlvEx05BC feXgj0S8uepr9ZgMYQPkNCxWOtxI3aQ8/eXrgj4TzlM2eUVFRiRAjvnCAecsci9LTMdHzd q3//DWpJXBm+puwNadecFjgb2Rw8vc0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1767596862; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=QtcT2vuX9NDExh0WlhoDMzjoiaeH7DXVmIilOH/kAyU=; b=33eJQ5J4v7nVepmkoE5Kf9wHeE/MxLeBdj2x43fjssW9k58AKzxxlUJIJ/0Uat7UaRxmDE LK1FG8Z3m/WM8zDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 61AD113964; Mon, 5 Jan 2026 07:07:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 16NqFj5jW2nNKgAAD6G6ig (envelope-from ); Mon, 05 Jan 2026 07:07:42 +0000 Message-ID: <58b06cfa-1710-4438-83ba-25b6d17075b9@suse.de> Date: Mon, 5 Jan 2026 08:07:41 +0100 Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the drm tree with Linus' tree To: Stephen Rothwell , Dave Airlie , DRI Cc: Boris Brezillon , Linux Kernel Mailing List , Linux Next Mailing List , =?UTF-8?Q?Lo=C3=AFc_Molinari?= References: <20260105131607.718d22cb@canb.auug.org.au> Content-Language: en-US From: Thomas Zimmermann Autocrypt: addr=tzimmermann@suse.de; keydata= xsBNBFs50uABCADEHPidWt974CaxBVbrIBwqcq/WURinJ3+2WlIrKWspiP83vfZKaXhFYsdg XH47fDVbPPj+d6tQrw5lPQCyqjwrCPYnq3WlIBnGPJ4/jreTL6V+qfKRDlGLWFjZcsrPJGE0 BeB5BbqP5erN1qylK9i3gPoQjXGhpBpQYwRrEyQyjuvk+Ev0K1Jc5tVDeJAuau3TGNgah4Yc hdHm3bkPjz9EErV85RwvImQ1dptvx6s7xzwXTgGAsaYZsL8WCwDaTuqFa1d1jjlaxg6+tZsB 9GluwvIhSezPgnEmimZDkGnZRRSFiGP8yjqTjjWuf0bSj5rUnTGiyLyRZRNGcXmu6hjlABEB AAHNJ1Rob21hcyBaaW1tZXJtYW5uIDx0emltbWVybWFubkBzdXNlLmRlPsLAjgQTAQgAOAIb AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftODH AAoJEGgNwR1TC3ojx1wH/0hKGWugiqDgLNXLRD/4TfHBEKmxIrmfu9Z5t7vwUKfwhFL6hqvo lXPJJKQpQ2z8+X2vZm/slsLn7J1yjrOsoJhKABDi+3QWWSGkaGwRJAdPVVyJMfJRNNNIKwVb U6B1BkX2XDKDGffF4TxlOpSQzdtNI/9gleOoUA8+jy8knnDYzjBNOZqLG2FuTdicBXblz0Mf vg41gd9kCwYXDnD91rJU8tzylXv03E75NCaTxTM+FBXPmsAVYQ4GYhhgFt8S2UWMoaaABLDe 7l5FdnLdDEcbmd8uLU2CaG4W2cLrUaI4jz2XbkcPQkqTQ3EB67hYkjiEE6Zy3ggOitiQGcqp j//OwE0EWznS4AEIAMYmP4M/V+T5RY5at/g7rUdNsLhWv1APYrh9RQefODYHrNRHUE9eosYb T6XMryR9hT8XlGOYRwKWwiQBoWSDiTMo/Xi29jUnn4BXfI2px2DTXwc22LKtLAgTRjP+qbU6 3Y0xnQN29UGDbYgyyK51DW3H0If2a3JNsheAAK+Xc9baj0LGIc8T9uiEWHBnCH+RdhgATnWW GKdDegUR5BkDfDg5O/FISymJBHx2Dyoklv5g4BzkgqTqwmaYzsl8UxZKvbaxq0zbehDda8lv hFXodNFMAgTLJlLuDYOGLK2AwbrS3Sp0AEbkpdJBb44qVlGm5bApZouHeJ/+n+7r12+lqdsA EQEAAcLAdgQYAQgAIAIbDBYhBHIX+6yM6c9jRKFo5WgNwR1TC3ojBQJftOH6AAoJEGgNwR1T C3ojVSkIALpAPkIJPQoURPb1VWjh34l0HlglmYHvZszJWTXYwavHR8+k6Baa6H7ufXNQtThR yIxJrQLW6rV5lm7TjhffEhxVCn37+cg0zZ3j7zIsSS0rx/aMwi6VhFJA5hfn3T0TtrijKP4A SAQO9xD1Zk9/61JWk8OysuIh7MXkl0fxbRKWE93XeQBhIJHQfnc+YBLprdnxR446Sh8Wn/2D Ya8cavuWf2zrB6cZurs048xe0UbSW5AOSo4V9M0jzYI4nZqTmPxYyXbm30Kvmz0rYVRaitYJ 4kyYYMhuULvrJDMjZRvaNe52tkKAvMevcGdt38H4KSVXAylqyQOW5zvPc4/sq9c= In-Reply-To: <20260105131607.718d22cb@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-4.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_ALL(0.00)[]; URIBL_BLOCKED(0.00)[suse.de:dkim,suse.de:mid,suse.com:url,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from,2a07:de40:b281:106:10:150:64:167:received]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.com:url,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns] X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spam-Level: X-Rspamd-Queue-Id: 942303373F X-Spam-Flag: NO X-Spam-Score: -4.51 Hi Am 05.01.26 um 03:16 schrieb Stephen Rothwell: > 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 The latter fix is incorrect. You rather want the headline and size-parameter description from the first commit and other docs from the second commit. Like this:  /**   * drm_gem_shmem_init - Initialize an allocated object.   * @dev: DRM device   * @shmem: shmem GEM object to initialize   * @size: Buffer size in bytes   *   * This function initializes an allocated shmem GEM object.   *   * Returns:   * 0 on success, or a negative error code on failure.   */ Best regards Thomas > 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. > -- -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)