From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD7F4C433DB for ; Wed, 10 Mar 2021 11:57:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BBF664FD7 for ; Wed, 10 Mar 2021 11:57:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231430AbhCJL4h (ORCPT ); Wed, 10 Mar 2021 06:56:37 -0500 Received: from mga05.intel.com ([192.55.52.43]:15457 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231382AbhCJL4a (ORCPT ); Wed, 10 Mar 2021 06:56:30 -0500 IronPort-SDR: 2Cq114r3kZG8z+AzTc8PE+NenJBwN6HHDo/1SxBTcGdyxQPHhCwWm6Qb6adJw3t0cA+XLurOcs WtwRkCH+pr9g== X-IronPort-AV: E=McAfee;i="6000,8403,9917"; a="273486300" X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="273486300" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2021 03:56:29 -0800 IronPort-SDR: d8oFsFOFvUVWTxDS+XsWeW4qkSwqkuFzLLpfTerzivp5tZZXgsAu3r9hWkNOuOVw0d61GrTZ4u GxVHy67502cQ== X-IronPort-AV: E=Sophos;i="5.81,237,1610438400"; d="scan'208";a="437922503" Received: from smile.fi.intel.com (HELO smile) ([10.237.68.40]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2021 03:56:28 -0800 Received: from andy by smile with local (Exim 4.94) (envelope-from ) id 1lJxRx-00BJYs-Ec; Wed, 10 Mar 2021 13:56:25 +0200 Date: Wed, 10 Mar 2021 13:56:25 +0200 From: Andy Shevchenko To: Linus Torvalds Cc: Bartosz Golaszewski , Linus Walleij , "open list:GPIO SUBSYSTEM" , Linux Kernel Mailing List Subject: Re: [GIT PULL] gpio: fixes for v5.12-rc3 Message-ID: References: <20210309153443.16647-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org On Tue, Mar 09, 2021 at 12:04:58PM -0800, Linus Torvalds wrote: > On Tue, Mar 9, 2021 at 7:43 AM Bartosz Golaszewski wrote: > > > > I realized only after I sent out this PR that I had rebased the branch > > on top of v5.12-rc2 (because of the v5.12-rc1 situation) without > > --rebase-merges and this caused git to drop the merge commit for > > Andy's pull-request. Please let me know if you can pull this as is or > > if I should rebuild my branch and resend. > > This is fine - it's small, it's a one-time pain, and there's that reason for it. > > So as long as Andy is aware of how his patches got rebased and don't > match his branch any more, I think it's not a big deal, and I've > pulled it as-is. Thanks! It's not big deal, but a good learning anyway how to communicate and proceed with the git in such (rare I suppose) situations. -- With Best Regards, Andy Shevchenko