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=-7.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 60EE3C433E9 for ; Thu, 4 Feb 2021 10:51:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 16D2464F67 for ; Thu, 4 Feb 2021 10:51:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235487AbhBDKvi (ORCPT ); Thu, 4 Feb 2021 05:51:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:29797 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235450AbhBDKvg (ORCPT ); Thu, 4 Feb 2021 05:51:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612435808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ExcdpvdW4w9z0j1rSZqVqf3PX+bGLK8NJ4uHHCnJ7SI=; b=Ckj4V9W55B7e90v71yhXsJNTIbxnM9fjsphF04l3kGfyJz9RY6n6HMRkaIK5ZegenqDVbI tpMmnkhjqk5lEj7FTH3aBe5xvFf4yuK4e+AlNtje/JGBP8RSVuWm9kDwUWUBeb5r2/Gy3X AULraChdaU8ugH8Ao7JJgAA1aTqYdPc= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-93-pPMXj9BJNamRbR4vobdSUg-1; Thu, 04 Feb 2021 05:50:06 -0500 X-MC-Unique: pPMXj9BJNamRbR4vobdSUg-1 Received: by mail-ej1-f70.google.com with SMTP id by20so2368746ejc.1 for ; Thu, 04 Feb 2021 02:50:06 -0800 (PST) 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-language :content-transfer-encoding; bh=ExcdpvdW4w9z0j1rSZqVqf3PX+bGLK8NJ4uHHCnJ7SI=; b=qBKIsuOTtfMzdH6zoktp1nJFwbnaj0Aon0qdXWb61XPJjTfocsgj/IA5YSZPVWlW10 3X0MvKoc4kXJRKcQC89YXb+4341NBSHBYRHD5Pqml8V3EOKuuiPQUNVTSe7ra4spHM74 NUlLnNAIs8D+WU4mDUrA402wzKlPxaSDkio/IRGTWMxx458ur+JeczZQU4qMHTUdrkuv /2WUXAY8OjASM52g9u1CYQZlsqx2dIQ9nxyFtlF/cg5KurZbxma1Cnd5HWc5xBB5iHyH d21EtOWB2gkQ48vjbVhRWiunPAI5QUwx4Ljannrd8nZpr3dDZFYPVcppfajNpVgvMGRI 2jZQ== X-Gm-Message-State: AOAM53237Eyd3ftcsC2Og04f1Pvumu4cZ+o/80mANpvZG42GwotcCwZK kVG3Hj8KEJFYfe+m1kb3/Jn3bfdIjSsjbDeNVs64knvTNlh8BUxgEbH60yJppCuoMLpEPYHGHhY RWmYh4TnRfBVwq23OWPTC03mWIGY= X-Received: by 2002:a50:e40d:: with SMTP id d13mr7199520edm.286.1612435805421; Thu, 04 Feb 2021 02:50:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJyrLq4STTB5oHsAxoJ/eqPScYWEXm044cXSlN/alKGEooRBz1nK3qDv8a2u2yCHeu/QD1EDgg== X-Received: by 2002:a50:e40d:: with SMTP id d13mr7199513edm.286.1612435805290; Thu, 04 Feb 2021 02:50:05 -0800 (PST) Received: from x1.localdomain (2001-1c00-0c1e-bf00-37a3-353b-be90-1238.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:37a3:353b:be90:1238]) by smtp.gmail.com with ESMTPSA id n16sm2273045ejd.116.2021.02.04.02.50.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Feb 2021 02:50:04 -0800 (PST) Subject: Re: [GIT PULL] ib-drm-gpio-pdx86-rtc-wdt-v5.12-1 To: Daniel Vetter , Patrik Jakobsson Cc: Andy Shevchenko , "open list:REAL TIME CLOCK (RTC) SUBSYSTEM" , Alessandro Zummo , Alexandre Belloni , Wim Van Sebroeck , Mark Gross , LINUX-WATCHDOG , "open list:GPIO SUBSYSTEM" , dri-devel , Platform Driver , Bartosz Golaszewski , Andy Shevchenko , Guenter Roeck References: From: Hans de Goede Message-ID: <797cf4ac-ffdc-e73e-cb58-d027beb6e3b4@redhat.com> Date: Thu, 4 Feb 2021 11:50:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Hi, On 2/4/21 11:36 AM, Daniel Vetter wrote: > On Thu, Feb 4, 2021 at 11:19 AM Patrik Jakobsson > wrote: >> >> On Wed, Feb 3, 2021 at 1:00 PM Andy Shevchenko >> wrote: >>> >>> On Tue, Jan 26, 2021 at 5:25 PM Patrik Jakobsson >>> wrote: >>>> On Tue, Jan 26, 2021 at 1:37 PM Andy Shevchenko >>>> wrote: >>>>> >>>>> Hi guys, >>>>> >>>>> This is first part of Intel MID outdated platforms removal. It's collected into >>>>> immutable branch with a given tag, please pull to yours subsystems. >>>> >>>> Hi Andy, >>>> Do you plan on eventually removing X86_INTEL_MID completely? If so, >>>> then I should probably start looking at removing the corresponding >>>> parts in GMA500. >>> >>> I have noticed new commits in DRM against GMA500 and it seems now in a >>> conflict with my immutable branch. Are you sure you don't forget to >>> pull it? >> >> Hi Andy, sorry I missed pulling the immutable branch before taking the >> gma500 medfield removal. I was unsure how to do that through drm-misc >> and it's tools so I got sidetracked. What would be the correct way to >> fix this? > > Imo Linus can resolve this, it's pretty trivial, as long as both pull > requests point it out to him. The removal of older Intel platforms touches a number of subsystem trees, the idea about the IM branch was that all subsystem-trees would merge that. I can certainly point out the problem in the pdx86 pull-req to Linus, but the GPIO pull-req also contains a merge of the IM branch as will the x86/tip and rtc pull-reqs I believe. We can add a remark to all the pull-reqs about the issue I guess ? But it might be better to still merge the branch into drm-misc-next and resolve the conflict there. I think that should avoid Linus seeing it ? Regards, Hans