From patchwork Tue Jun 20 01:38:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 110230 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3360664vqr; Mon, 19 Jun 2023 18:44:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4N9lM7lesiMJHDMGbtA8rHei1Mj5c7KKYWTwAmMAT0LQEVZflx1dJ4O+42VC+RyZCao1A0 X-Received: by 2002:a05:6a00:398d:b0:668:93e7:6800 with SMTP id fi13-20020a056a00398d00b0066893e76800mr2026765pfb.14.1687225453361; Mon, 19 Jun 2023 18:44:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687225453; cv=none; d=google.com; s=arc-20160816; b=uZm/otcGD4Ac0UVmyJvQZvv6wjjr3ZrTlzkcrqrIWG1WsA+ladYOIC0dFDbGytwS0D IN2VLhkdSzrDS8ooMdGWjId0wJR/826AEXFDjZQHnD+E71s7t749PMee3t9+KyY7xIHS aMOl3ZM0l/yZZc7XjEcPhCZYiWO6Lh/B6Rh9Guu7WPVBM0GrVpV8N5u4EZTy8d7GW1fO gJujfOwFJqPZ7v68B+Ym2uY4tlMUaA1nAhix5OGq8blPUlTIRM92VvOxKMNVZ9Xh3QKu Li8gVS+Hlwa1iDCRLD5iQxERdX8QHpsbjmkafXo44u+ZTwpbCQpPLtFmaUVQCtEmYLBc 3i7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=4KyqwkMLpA8d4g7V9+oDFKaAaBX3iSBt4eegpKSuZXc=; b=pjfLYFMoLIrdX2S6A379mouahaL90khsnJrqFd3dGLISni14sE1GXYl2/Sp96CqxgO HM5j3qDCmO1SJx3/dEReGUJeulpNlrI8TVNU9gimxhq7Z+Pz4s0vZIUAGhAB0K6kKDjT /6IS+nknKcVQ/x6vbvFN/YjifhI4JCBIFw41PWI+Lzh6kiqc/jbuWiXhPHRqUb/zS64t zZn/81cJvOmh3y8eC62hVbEGCJ2zMxkKVd5D4JY1bS/F+eVTEiqo8vo6SYBWd4MHTY64 tpIa+FEK7aK2jfsKBnO8ERKSurB4NU39N5AXUzO5ApOXEP9VNBa10L5pEkq5uItSGzbl PZsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="GLc/ZVkj"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k28-20020a637b5c000000b005418b187c59si695456pgn.633.2023.06.19.18.43.50; Mon, 19 Jun 2023 18:44:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="GLc/ZVkj"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229639AbjFTBiI (ORCPT + 99 others); Mon, 19 Jun 2023 21:38:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbjFTBiH (ORCPT ); Mon, 19 Jun 2023 21:38:07 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13592119; Mon, 19 Jun 2023 18:38:04 -0700 (PDT) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QlTmC05Myz4wgk; Tue, 20 Jun 2023 11:38:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687225083; bh=4KyqwkMLpA8d4g7V9+oDFKaAaBX3iSBt4eegpKSuZXc=; h=Date:From:To:Cc:Subject:From; b=GLc/ZVkjdiPtAfg9Sl/qnh5Jeljw+7FUTI67co5wH1IzQfuxbjbxQvjpyZ6kz4peY pMuubEErgtBz9msOEFk1t98HcDOMTs+vqgeU89tny+jJKBSr869F4tPioGuR7s0fly l6ewdWkcNekUB11ZCAhIUfvjywI7JL5SFdoyHx0wohw0trl8RKbalTdB3Sz9YYrDkQ C8Lm3Y67c5qjW1sEmoi59KQ57ZqDUUxa7haG16sfl4QE1MwPHgI5+U9A0HxzIkjm86 UJU5H0o8onxPSUhMgdZFJXwPsP8PE5pm77YwmAAx8NyOWxbS6+8+F9czVGeXOGiR9J TZQGaqbjt61gg== Date: Tue, 20 Jun 2023 11:38:00 +1000 From: Stephen Rothwell To: Helge Deller , Dave Airlie Cc: DRI , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Zimmermann Subject: linux-next: manual merge of the fbdev tree with the drm tree Message-ID: <20230620113800.5e76a964@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769184117053557852?= X-GMAIL-MSGID: =?utf-8?q?1769184117053557852?= Hi all, Today's linux-next merge of the fbdev tree got a conflict in: drivers/video/fbdev/hitfb.c between commit: bb47f218fd01 ("fbdev/hitfb: Cast I/O offset to address") from the drm tree and commit: dadeeffbe525 ("fbdev: hitfb: Use NULL for pointers") from the fbdev 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. diff --cc drivers/video/fbdev/hitfb.c index 7737923b7a0a,5f544a177033..000000000000 --- a/drivers/video/fbdev/hitfb.c