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=-5.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 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 189A1C2D0E2 for ; Tue, 22 Sep 2020 11:02:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B4C6F20B1F for ; Tue, 22 Sep 2020 11:02:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Umn46go7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726566AbgIVLCj (ORCPT ); Tue, 22 Sep 2020 07:02:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726340AbgIVLCj (ORCPT ); Tue, 22 Sep 2020 07:02:39 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4D08C061755; Tue, 22 Sep 2020 04:02:38 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id z9so2894370wmk.1; Tue, 22 Sep 2020 04:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=QP7D4zsS7srJZeKE4h7PMo3PEFbsrs5XuKLoWtHlLfQ=; b=Umn46go7btEmLeJcyiwsP02dYQUWvorQNa1lYDjJe5hLI8gBjUXG99anKJIZ8KW1oO aWnS2IwBNxRgDc4BdFsb/2bzZxWIaDPdYHe+YEhjSVZdBOCpqyxoVj5BQSwbKIHZ/0E+ Fg/bG5+dMDlnqMiui80vfu6VAYwn8rlfvTnmganxFWap07IU5RqfIrTYneIe0ybsaJib TJ/gUnPvxeHP7oFVD5NhWxX0YZI8arEDT5jCtmKbw0sUUkSF7E73qgspyakaSXtNQvRk KUSCd/VJelPux235gIzr9NJbR5LMuf7fWrTqH9IE0cZH1BY6e/hal929kqGCd89sRJRo Htjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=QP7D4zsS7srJZeKE4h7PMo3PEFbsrs5XuKLoWtHlLfQ=; b=QgcUHWpGfvqeaJj4ihcVLhZYUxPaM/FOJ0aFtFcE9kMi03fVxZV1paG/FImrMfnkPF J1BpttkGIBdL4GyCsG9n0HMNqAJQFLKjOF7SQoy9WiBWceOyUYQ75BXsfLd+siTiWyCv drj0F+kr/qUwR7t/N/xqrwKyTuGDmoAEMfltiYb9SJrn0s+g95gIkx6xZatuYo+6zEtU vzHTq+wTT2ao01eucNK2PQ0zOQdJ5yz865sHPCJuFJOqYoQk6kNakPmArvAE++5CQ6bt /wyXkBwHL1ENrOa9cTR1X8Ehe5c9Ehb3qNthh6G764WO9bG8ZnGLQzrojMrGArRRk6b4 172w== X-Gm-Message-State: AOAM533+XMuV+mYmxZ86hjpDdX223A2WSJxTvIs/vkue7z+X40znlNmI rNekBvvJM2Jy3JHdHAipgOKfvBVQvRRQUpKg X-Google-Smtp-Source: ABdhPJxbDGZ7wRBP0AB2A1GN813fNw8J3KclOaZ5ZRBtp53WAU1Vt4G/tAmks/ybFJcR4iJO8U0C5w== X-Received: by 2002:a1c:b388:: with SMTP id c130mr356538wmf.175.1600772557222; Tue, 22 Sep 2020 04:02:37 -0700 (PDT) Received: from [192.168.0.64] (cpc83661-brig20-2-0-cust443.3-3.cable.virginm.net. [82.28.105.188]) by smtp.gmail.com with ESMTPSA id a83sm4085301wmh.48.2020.09.22.04.02.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 22 Sep 2020 04:02:36 -0700 (PDT) Subject: Re: [PATCH REBASE 0/3] atomisp: Rebased fixes To: Mauro Carvalho Chehab Cc: Sakari Ailus , Greg Kroah-Hartman , Dan Carpenter , Alan Cox , linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org References: <21f18dc2-a1bc-0a37-0336-fc35170a40e9@gmail.com> <20200922090914.20702-1-alex.dewar90@gmail.com> <20200922112729.313d454d@coco.lan> From: Alex Dewar Message-ID: Date: Tue, 22 Sep 2020 12:02:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20200922112729.313d454d@coco.lan> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 22/09/2020 10:27, Mauro Carvalho Chehab wrote: > Em Tue, 22 Sep 2020 10:09:07 +0100 > Alex Dewar escreveu: > >> Hi Mauro, >> >> I've rebased the patches now, but there is a slight hiccup. For patches 2 >> and 3 of this series there will now be a conflict with commit 9289cdf39992 >> ("staging: media: atomisp: Convert to GPIO descriptors") in Greg's tree. >> >> I'm not sure what the best way to handle this is? The merge conflicts >> will be trivial (due to a conversion between the gpio_* and gpiod_* >> APIs), but I could alternatively send these last two patches in via >> Greg's tree if that's easier for people. Let me know what works. > Maybe the best would be to re-send those after the merge window, when > both patches will arrive upstream. > > Thanks, > Mauro That sounds more sensible. I've also just noticed that I introduced a bug in the first patch when rebasing it :-/, so let's hold off on the whole series and I'll do a proper tidy and resend after the next merge window. Best, Alex 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=-4.8 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 6CCF3C4727D for ; Tue, 22 Sep 2020 11:02:43 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CEA4023A5F for ; Tue, 22 Sep 2020 11:02:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Umn46go7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CEA4023A5F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6DFB786668; Tue, 22 Sep 2020 11:02:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8N41XheX0P5K; Tue, 22 Sep 2020 11:02:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C604E8664E; Tue, 22 Sep 2020 11:02:41 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 28A371BF255 for ; Tue, 22 Sep 2020 11:02:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2528185C94 for ; Tue, 22 Sep 2020 11:02:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7YLz4qtgOSsx for ; Tue, 22 Sep 2020 11:02:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D881985BCD for ; Tue, 22 Sep 2020 11:02:38 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id v12so1056667wmh.3 for ; Tue, 22 Sep 2020 04:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=QP7D4zsS7srJZeKE4h7PMo3PEFbsrs5XuKLoWtHlLfQ=; b=Umn46go7btEmLeJcyiwsP02dYQUWvorQNa1lYDjJe5hLI8gBjUXG99anKJIZ8KW1oO aWnS2IwBNxRgDc4BdFsb/2bzZxWIaDPdYHe+YEhjSVZdBOCpqyxoVj5BQSwbKIHZ/0E+ Fg/bG5+dMDlnqMiui80vfu6VAYwn8rlfvTnmganxFWap07IU5RqfIrTYneIe0ybsaJib TJ/gUnPvxeHP7oFVD5NhWxX0YZI8arEDT5jCtmKbw0sUUkSF7E73qgspyakaSXtNQvRk KUSCd/VJelPux235gIzr9NJbR5LMuf7fWrTqH9IE0cZH1BY6e/hal929kqGCd89sRJRo Htjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=QP7D4zsS7srJZeKE4h7PMo3PEFbsrs5XuKLoWtHlLfQ=; b=Q3+VxBY7/spnKM6nZ/c8ePgyl16g1Btq3ndPv/vYl9o/jmdi5qenGEa+3WCf8L7c29 qLByYTFhIRbbvxOkz1gIWz1vUVNNuOr1MhVfEFv6nsvNPEfqzoUviOqVEBv3AGWi9Tni evDPanCIBbmLo2X2sgHu8SQkg5EjAVnDSW+a656u45gwEr/fYZOiUedtZ3Fp8t0kWVvT wnOnjl0tK32LubsHUXHFUBA9zrviC4Zy6xz/brWdl02yR1+38/FPpDMARnUb6AAW4Lgg rClQnAvApbPwj9CUeQi962viVFacXH3W00qiNErotlptv4OkDpHbqKTqLJo0nhFyuN31 Ls9A== X-Gm-Message-State: AOAM533DBItpwpg26Yp6nkNXsIgN3y2tFj2AUyIfqAYYM6BpUVkv1CrU ZVoBTC1r/ptnQgs84OjbBfg= X-Google-Smtp-Source: ABdhPJxbDGZ7wRBP0AB2A1GN813fNw8J3KclOaZ5ZRBtp53WAU1Vt4G/tAmks/ybFJcR4iJO8U0C5w== X-Received: by 2002:a1c:b388:: with SMTP id c130mr356538wmf.175.1600772557222; Tue, 22 Sep 2020 04:02:37 -0700 (PDT) Received: from [192.168.0.64] (cpc83661-brig20-2-0-cust443.3-3.cable.virginm.net. [82.28.105.188]) by smtp.gmail.com with ESMTPSA id a83sm4085301wmh.48.2020.09.22.04.02.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 22 Sep 2020 04:02:36 -0700 (PDT) Subject: Re: [PATCH REBASE 0/3] atomisp: Rebased fixes To: Mauro Carvalho Chehab References: <21f18dc2-a1bc-0a37-0336-fc35170a40e9@gmail.com> <20200922090914.20702-1-alex.dewar90@gmail.com> <20200922112729.313d454d@coco.lan> From: Alex Dewar Message-ID: Date: Tue, 22 Sep 2020 12:02:33 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20200922112729.313d454d@coco.lan> Content-Language: en-US X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Sakari Ailus , Alan Cox , Dan Carpenter , linux-media@vger.kernel.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" On 22/09/2020 10:27, Mauro Carvalho Chehab wrote: > Em Tue, 22 Sep 2020 10:09:07 +0100 > Alex Dewar escreveu: > >> Hi Mauro, >> >> I've rebased the patches now, but there is a slight hiccup. For patches 2 >> and 3 of this series there will now be a conflict with commit 9289cdf39992 >> ("staging: media: atomisp: Convert to GPIO descriptors") in Greg's tree. >> >> I'm not sure what the best way to handle this is? The merge conflicts >> will be trivial (due to a conversion between the gpio_* and gpiod_* >> APIs), but I could alternatively send these last two patches in via >> Greg's tree if that's easier for people. Let me know what works. > Maybe the best would be to re-send those after the merge window, when > both patches will arrive upstream. > > Thanks, > Mauro That sounds more sensible. I've also just noticed that I introduced a bug in the first patch when rebasing it :-/, so let's hold off on the whole series and I'll do a proper tidy and resend after the next merge window. Best, Alex _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel