Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp3015641rwb; Mon, 16 Jan 2023 02:32:40 -0800 (PST) X-Google-Smtp-Source: AMrXdXu2K49ZaXe0J+KZ/usRu0rYH5Ah1L7NFif3x4Ht3fj8zvOgZSfSkRMp52AsAIj3DAERubrQ X-Received: by 2002:a17:906:7052:b0:870:73ce:2136 with SMTP id r18-20020a170906705200b0087073ce2136mr3555244ejj.52.1673865160509; Mon, 16 Jan 2023 02:32:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673865160; cv=none; d=google.com; s=arc-20160816; b=QcPB0pbPMuJK90TPO1b9gukRxjX6A0w+BiOqJjtGYuUCRFAlHBjMay0ltJFDLti3v4 VMQIZVSzJ9ydh+tpTcVxc634V00DUCDYRfj0/BsHdZ69u+zO/I1dfo4yARGNcPGBV5Fe PH7D5v84NK4Jf2ySbgk283Co4Xa5wRIWUDmJ+NxB04lVfNtX0Z94P8LYS4F8xMM6+BBB slE5VhgcTUlvOftk5uVoCO+k8xPDahTXR+7HUUmEmy4on1/lFiMZADv5nn2ehx6C0/Vp QPmR2iT0wRwcXR2qd2Y2y2TtiENiarA1MPbZwEbfbfavJq4WO1n7qeeYrAmQ22ymv2kS og1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:ui-outboundreport:content-transfer-encoding :in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:dkim-signature; bh=2lI6yXR2SP0HV05LyObsqT2zBEEva8CrlCRrQ/YrBek=; b=lcMt/l4U89QgHvDq+dyszRBFE/WbhNrEXXw6RlzOL+s7A95FBzAIiRE+qh8EkW2nT9 LfMF3cNXKyGZH11l/BWQ3Kamne7E9b2bJqyccaAwMUWSOxH3f1GSvqxsOTjNuKJCShAc +JNHY0KddWB4ns62vd+2bZqTrOQZk8HW2Rgd7ZHlontIxrGlGdjaDl/h9Gp6lW+qbYTa PQLkHHRsSTj4z3MR61YLTxRN+MyZmci3cp6cRNEgkVDi06Ydu4LZV2q45JPUZ/GiLMFN ov2avxxaP2/v8MgSd/9kOtphlHrg9x4YNpNSbaCQl4z7caQ/PE3qYZAEu2WOn0Q3D2CB I4CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmx.de header.s=s31663417 header.b="NSfx8Dl/"; 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=gmx.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b11-20020a056402084b00b0046bc9cbd8f0si36100591edz.504.2023.01.16.02.32.10; Mon, 16 Jan 2023 02:32:40 -0800 (PST) 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=@gmx.de header.s=s31663417 header.b="NSfx8Dl/"; 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=gmx.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232211AbjAPJgS (ORCPT + 51 others); Mon, 16 Jan 2023 04:36:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232268AbjAPJgP (ORCPT ); Mon, 16 Jan 2023 04:36:15 -0500 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59EF216AF7; Mon, 16 Jan 2023 01:36:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1673861767; bh=wnOHpBayjdNSjw+eUV3MCoIeItj+WtT29KKObbgNH18=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=NSfx8Dl/wEgIyRrR0lcjIoZ2+gQioo4GdYXZkaOt2SZ3INu5zv6Y/9o8PVdWYeZqR QNGn2DEv3OmXbsz/w3tvJWMHONjbZHsP3G8pjogqQPAqlgq+LZCqqIyhJAN9vQxYi/ TTf1oXWyOJJg5Jtw4O/rysQc1v+GF13XVONMtp3Nua6R3avP0Qg5toxTZAmfmdXaX3 waz1MU7k/3oAEm4Y4i8lS0UfTcafirk3DTeS2iuo2/WnWwb79WkUFzb/ZBwtOosEZj xMtgyLwB0YXxPfnekHlZ3Z9Kf8dhuyG2VjP2OCin+PHLchWkLTvLasF8ABFw4kX0g2 QEt3dzz2Bvlbw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [192.168.151.61] ([109.43.179.224]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1N8XPn-1odhjS1vbV-014QUC; Mon, 16 Jan 2023 10:36:07 +0100 Message-ID: <7c2d45e5-8f16-83b2-93ce-87b456c53b52@gmx.de> Date: Mon, 16 Jan 2023 10:36:05 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: linux-next: manual merge of the fbdev tree with the drm-misc tree To: Stephen Rothwell , Daniel Vetter Cc: Intel Graphics , DRI , Kees Cook , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Zimmermann References: <20230116115440.3f1909cd@canb.auug.org.au> Content-Language: en-US From: Helge Deller In-Reply-To: <20230116115440.3f1909cd@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:xA0svzfJeflX86rbfoatcczhHIIJk14fm6BDqRMBweC4tHBj+xI rguCwLMLkg/Dti7PO2lt61M72WAmQkS1veipCs2sT2tXF50/j71RCda0GLxqM4RqNmq4rwt onxH1WflPzvJkQm/GcvynAN21l0DPhdIo3ssqh+IzHHFPXoNyx3w3I2MjIJT/qeguil2NEz hb1ToK3uFt5czFm5P26rw== UI-OutboundReport: notjunk:1;M01:P0:k89X/3EyuLs=;g1bkkxWspCpYG57AuM4VeRimN4z ezB7wSI6jDg08BcB6gbCb7IFTL/5VQXLsoEc52FXl1CUtYylgCgQG6h0/fsgDaU+Mk7x6hvAM h+hoKyfY5r9xDqV0vHXyrH5hvZppQ0e1W/1R11DNZivpMIutj+C1SRh/8Ck22cDutidkA4f4v BU4QZIFVtgwBQ6OfEyernNiIJk1DZ3tbRpnHy7b9n9lZXB+L9CICCX9NWCOGraTxe5rl1Mnzu LThv7ToYMMG1Pdft3L1FbsidYy12beDqw6tsZ/OYz1q+IZY2A9rhBIT8EJlCsgno1hKto/ICy 63TAZfGVlcRbQ3dcZfKJfeU0vxY6dMXc5M8tMRGMCjB5sjtz/lkfJUSColVdLB8mG+mTouieH 6NQpK2/OEmPJRYDJHihgtreIs/U6YUyyjyw3PahEJbAFhqAGWl8BZqF5EhqTMUn/7aac/7yMB zgykOQegOPMj8zmB4Bkmz0hqMxjUkRN+IsVIR3Ug4HafcJILz0QAPcd5zJwn7SGAwMYTUgMBz RG2W7pcLSak1Qx0NeoY9n4vmxc304QoQYzfn2PIK4QNRSa98lwzdIpJ3OOt8NUGtSqy5PBMIj +PHeMimDGxhjtTeBkxWOX/9/TXbhuWJmn8SrxOP9IkdMDgTv05Ie02knvAvsCDjedtOwts6/C LToJ99CyQqrBquHVmCrtoARUSopVrvNjgGuTbCzNIuXpLZFLDniRmSOXzaMpmBv0T3A46Ybkm tHJBzjo9kuZW5HvAh88dct0WI22xmvo8yBp2Uf/yWuB9TbJ7Q3/yhwO87Ry3sjc+sNB9IPdcj ICnUeNi9avC718Vb2cFp/1DCSiEn2eYLi/ACaBvJoRZneYM8/zUKKDGzzuTAt2k3wAwifQbtQ WWDCuQ3S7Rnm/4y6lpQzevW1lrjM5O3iHtGstwg6vQwQvW1q9MBMpWSd3r6gbthn0+uQClPaf bZBnczip6/lgZQog2ZUJZdFL7mA= X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,NICE_REPLY_A, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS 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 On 1/16/23 01:54, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the fbdev tree got a conflict in: > > include/linux/fb.h > > between commit: > > 5b6373de4351 ("drm/fbdev: Remove aperture handling and FBINFO_MISC_FI= RMWARE") > > from the drm-misc tree and commit: > > 72ac3535c2c5 ("fbdev: fb.h: Replace 0-length array with flexible arra= y") > > from the fbdev tree. I've dropped the offending patch from the fbdev git tree, so it should be resolved now. Thanks! Helge