Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp3741785pxy; Tue, 4 May 2021 08:56:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqs1m/llmsUx187V4xstVjJft3jptrUdbnkEZLDoxvLyB8tQ8gUO+K8qFQeQSGMvnoELID X-Received: by 2002:a17:906:4159:: with SMTP id l25mr19008684ejk.76.1620143809293; Tue, 04 May 2021 08:56:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620143809; cv=none; d=google.com; s=arc-20160816; b=DLFS9pxOI/pMffyh7kKGq+e1EEJvhMq7E5umAnndD/Spmy/251wa2iFIPZJ5gnQwvU R8RKRM81OCBIytFpMzPRNIC4uc+VR/TLEQoau97meIUDHTMazvJFrYbg9zc/5iYHD/25 A6mONZwD4MTLgsNj0zY9uCfInVkDURGQkN+zb81aCxAZwOOOSoGl5Q2Fx/xutUptd150 T67QfylsHOxCsciv19Z2t/XBzeguKiq4JUQcRz0xMWpHiaFPzjzfIIVX/CxdTH6gLECW OK2x7sFnelny/3bxO3OicoUgoeLjTjMAWNTqogtSEUx25kgJD54jON1aa58tOkLC7ZBu bolA== 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=g+unjtHm/rBLwTMZM4tl4Q30PDymo74btwmzKLoZ/sA=; b=wuLleigsClYZ2lW/jlxGwWz2UItbFwOQdrPYVwz1G9kZoPp4J0KAO8BunIrSJe+as+ z9VKNfjD9jw5tPvFt39QrFz99d/XVbpagUV/JpxDf0JMh2TdLEW5zhqxnmzgYchHm/xc l0mM9/GndcFToJe3C8rr+sGN8BhZzEsWRphgZVMezrYJiydggx3EFuNOZEmveVf5fvu5 g2QcPeArZ4NiQRLjc/YeAqq2OMKgRsi5OXPVfqZ0jM1tRC92ghIPFJZxPPCkG9qFO2uv 3DEgQvYsj+AtDooTdeg+11fNiNkJSayxmDD7wag0c3G/fRAry8C1FqPmOCY3KYLsb//q Y4iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=google header.b=ZLT2JvpP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f6si2977687ejq.733.2021.05.04.08.56.25; Tue, 04 May 2021 08:56:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=google header.b=ZLT2JvpP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231441AbhEDPzz (ORCPT + 99 others); Tue, 4 May 2021 11:55:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230525AbhEDPzz (ORCPT ); Tue, 4 May 2021 11:55:55 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 058F3C06174A for ; Tue, 4 May 2021 08:55:00 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id c3so9968636lfs.7 for ; Tue, 04 May 2021 08:54:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=g+unjtHm/rBLwTMZM4tl4Q30PDymo74btwmzKLoZ/sA=; b=ZLT2JvpPvPUPbbcIHgI3bQtXWtU/Hm0/A4U+RLt0R5BiQfq1zpGbnBh63E42n5wnzu Lot16wxaeNXbReHlLIOQ13aRZYx4FLwegzuNmmjLYrN9nBkeQiNfyVrUT3Mc2X5fBf9d oDLqzodlQKQUHRQBoeBp80DzxHmbsEMZ6wifw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=g+unjtHm/rBLwTMZM4tl4Q30PDymo74btwmzKLoZ/sA=; b=gk0dPUZFfHMygBuRMPunLHSUMAvDlE+iPf/qx4q3DbBETQv912JJxd+aM4xhhDJ8ni 66FC5Y+iR13rjdZorvc1xNpULgQmG5pD4DpTSWQHd+v1hfIIdrISPStILlSyh4WETiQ+ Ima7J54FiPEArZ37FBDzB+8eP1MFc3Qf2Nk1AsLCg/Pj5YknQpJm8Q/Ovk9SLK1CthcD 7rs1/BESgVIjdQsTHT433oS4uXHhC5S7Jlvxes08vi2jUgDVLTQXbQXnPssVF0UGqDcJ +ITu4X8B6LLaKncisD5/Y411BD8AM46OQRecSyeNj+ZWFGxK2YiOXYF+YCpGCqSLZ0NT QG8g== X-Gm-Message-State: AOAM532Izmgpl0zNo8Qg38BWR5ECi32JJMNzdYYX0ReRelfqAa2lz2vj BUeTQeUfx0q3kXZ4MZp/n+YhSgNj9+L556HD X-Received: by 2002:a05:6512:139e:: with SMTP id p30mr17375801lfa.489.1620143698313; Tue, 04 May 2021 08:54:58 -0700 (PDT) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com. [209.85.167.52]) by smtp.gmail.com with ESMTPSA id h11sm1708639ljc.118.2021.05.04.08.54.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 May 2021 08:54:57 -0700 (PDT) Received: by mail-lf1-f52.google.com with SMTP id h4so6396725lfv.0 for ; Tue, 04 May 2021 08:54:57 -0700 (PDT) X-Received: by 2002:a19:7504:: with SMTP id y4mr16748492lfe.41.1620143697568; Tue, 04 May 2021 08:54:57 -0700 (PDT) MIME-Version: 1.0 References: <20210502220519.GA24775@duo.ucw.cz> In-Reply-To: From: Linus Torvalds Date: Tue, 4 May 2021 08:54:41 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] LEDs changes for v5.13-rc1 To: Pavel Machek Cc: kernel list , Jacek Anaszewski , Linux LED Subsystem Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 4, 2021 at 8:43 AM Pavel Machek wrote: > > Oops, sounds like I should have test-merged it and dropped the > change. Thanks for solving it for me. Oh, it was fine this way too. In fact, I prefer to see a (trivial) merge conflict over having people change their branch just to avoid it. So I think this all went down exactly how it should have been done. Thanks, Linus