Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp2255807rwb; Wed, 5 Oct 2022 11:17:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6OlFBstE98ppKiYb8XEol/7uaKRmFNYME7G1GMRPcR9tVF/Q1pdpWyOdBT9xse0zd5cBd9 X-Received: by 2002:a17:907:1c91:b0:782:496f:271f with SMTP id nb17-20020a1709071c9100b00782496f271fmr710646ejc.718.1664993878830; Wed, 05 Oct 2022 11:17:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664993878; cv=none; d=google.com; s=arc-20160816; b=ioP+RNHgXr+47q3lEx8bYKsUxP166VpK+Dfkes5tZyHTbNHFjcJtm+TSIZCl9s2oy4 9D6l2G3iYLTEi4pEiVhqK/+VlNQLXN5anSD/A1KuQg/A6+Ypg61gP9bFaczc7FqnegPD cTINtKLYmMxbxpE0AIG6TEVki0jggOeAAS8I3eikNQRNBfedu157oq0F6o5RqE/90/W5 th57sYZlpLnZbdggPOoLxeDfFoVX17b/QX87g2boH6J6QUMabMR661r8EalD/+iYYy7o BLaQ0g62dEgFo+wgWze2NvqYwmjvTD40/7FVTizAZVOPqF3w4Ss2QAJazmQtEHL1H0uP MGLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=9ET0IoJ6rEVtbRVeWGB0pVw9IcwTsGPczYsuOM1U4f0=; b=zZTeWC958avbBsS/EpD5sJ+o27o9TjUV6zxkV3XFqPVh4pICW/41DxyeSezNsbe8vL FctZEpwB5GlEIYTeuFCV+BAJdr9Xc/f0i6LEAB8UFrekVQ7jWVmTElrz5U9UvHxpCl5V krq9PvC2qjsnhwwEItL+yrisgQi2XRXk6oxMMcnV0e4iTzyWm7YHxDLzWL/+yD3imusi 1aoVTR/lbw4J79z8bNMdjz0GN6W46OBQkuJFrq/40MCEBwKtC9za7Qf2ziqxFpGGnCJ8 AA5tUe/4U6kCU2c3H5UlmX+F7amk0oPpU/6U3rC1+Zwesy7u7YqS0SlIe1dF/NkGJS59 fUXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=google header.b=EJ6WcTBo; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ca24-20020aa7cd78000000b00451d7cdb63dsi13177236edb.49.2022.10.05.11.17.33; Wed, 05 Oct 2022 11:17:58 -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=@linux-foundation.org header.s=google header.b=EJ6WcTBo; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230378AbiJERlK (ORCPT + 99 others); Wed, 5 Oct 2022 13:41:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230360AbiJERlI (ORCPT ); Wed, 5 Oct 2022 13:41:08 -0400 Received: from mail-oa1-x2c.google.com (mail-oa1-x2c.google.com [IPv6:2001:4860:4864:20::2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 892253A483 for ; Wed, 5 Oct 2022 10:41:06 -0700 (PDT) Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-131dda37dddso19717794fac.0 for ; Wed, 05 Oct 2022 10:41:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=9ET0IoJ6rEVtbRVeWGB0pVw9IcwTsGPczYsuOM1U4f0=; b=EJ6WcTBoO6oU/ezXuBkBYjEbQ7S8KRcou3xsWIrbiRwE9EOHqoC6FTsAgwu07Mfe6Z 0beVDIN9DJs7HZ9oYRIYFeffRZ+wggTvShNIAeZ04kK/I7kiVn2nPmIYDHSxv9mrcTmq 8i+3y+6uRFx9mVL0EBCbpPWxMRHMnS1wVblHM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9ET0IoJ6rEVtbRVeWGB0pVw9IcwTsGPczYsuOM1U4f0=; b=NrQAHWO8x0U9o56GNzKa2fhAKTUhEJqstgNuK3a4pkwJdBHy9F9lbj5byG8nX0W566 4nIeU5HYGtvdfnNA+cXc1dj67gQOYUgAtGUYOPEhFQRrwHo921xr1oBIDoCi2F0Siyec wdbE4BOu2mvFTpmlsghYFIVVLbEm3Ih+DqcSIa+HQ+mQ2erfC91EJtZ3E+nU1kIYS9+7 W8BUrUXYr7/Xp1b/dmRsbK4yJjLJs/KYDnkKIPlTAWZf6HbeUmGCZQkjJh5bR1d6KM5v qJ8/3XW3zqQtmgohLpf1hsn2JCXClCghkV8qJBvzjgZM3x7lk98VzZ7V/S+WvnhRtHFW ZA7A== X-Gm-Message-State: ACrzQf1PQIJ33p7v+qnPfwZBDp8xT+3lLiyYyyKatnaQD4TgE9GA+Xy0 6Bzc+xrBbKHiaI3pPGou5uXHkK+G2E0lXw== X-Received: by 2002:a05:6870:618e:b0:130:9e9d:650d with SMTP id a14-20020a056870618e00b001309e9d650dmr396897oah.109.1664991664856; Wed, 05 Oct 2022 10:41:04 -0700 (PDT) Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com. [209.85.167.181]) by smtp.gmail.com with ESMTPSA id 7-20020a4a1507000000b004767df8f231sm3641525oon.39.2022.10.05.10.41.03 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Oct 2022 10:41:03 -0700 (PDT) Received: by mail-oi1-f181.google.com with SMTP id q10so18397857oib.5 for ; Wed, 05 Oct 2022 10:41:03 -0700 (PDT) X-Received: by 2002:aca:b957:0:b0:351:4ecf:477d with SMTP id j84-20020acab957000000b003514ecf477dmr465391oif.126.1664991663308; Wed, 05 Oct 2022 10:41:03 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Linus Torvalds Date: Wed, 5 Oct 2022 10:40:45 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] platform-drivers-x86 for 6.1-1 To: Hans de Goede Cc: Andy Shevchenko , Mark Gross , LKML , "Rafael J . Wysocki" , linux-acpi Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=no 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 Wed, Oct 5, 2022 at 5:46 AM Hans de Goede wrote: > > There also is a small conflict in drivers/platform/mellanox/mlxreg-lc.c > due to a locking fix which landed mid 6.0 mixing unlock + return with > goto style exits in error paths. My tree has a fix on top to consistently > use the goto style. Here you can just take the version from me tree. Ugh. Why use goto when a simple 'break' would work for all but the first case? I took your side rather than clean things up and not being able to test the end result, but it does seem pointlessly complicated. Linus