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.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 40EE7C433E0 for ; Thu, 4 Feb 2021 10:36:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 B12CB64DDA for ; Thu, 4 Feb 2021 10:36:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B12CB64DDA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 191476E040; Thu, 4 Feb 2021 10:36:37 +0000 (UTC) Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0CDE96E040 for ; Thu, 4 Feb 2021 10:36:36 +0000 (UTC) Received: by mail-oi1-x22f.google.com with SMTP id j25so3242985oii.0 for ; Thu, 04 Feb 2021 02:36:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=VwdkegGeppc78dF2PFU6pSDmQfAtNSqd3Duj9DFoqr8=; b=f5k5VV21T0eHtIsE/JIjtzqo9tONCWAK9IKXqDwemmArJ4XNMjmiBMcQawzbRrnw0K YTiI8dvTWlk7wqWJ0idBIFmZiYOqtJiomc1CLXd7d+Vfpt3lfOTZ/Fgmk6npx6SDl6z4 xgBDZACVLLFmvyZS2d2UTScH/IrGlFlvMZH60= 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=VwdkegGeppc78dF2PFU6pSDmQfAtNSqd3Duj9DFoqr8=; b=NWbsRse/DWYNBTGvs1hYjSwLmCMtOpSCP+SiPuJ67DL+saZBUGC3ZXOEhOLVh4gLqJ ZwGxw2OJWmwaisTnd2Dq3gjNH0tRqkAAUo7ej8+AWOrxruzHjtrTRWm2rO+YIniGqA4k 8CGFZg5qA6VwmiweDknYmJRXAZMbaR4wRfq9aRBz7vg+EZuG1ZBJqW4Bgc1TwC6mqnCy TW4wdmvdSxaH1L38xxh6tX9NMI9G+PGOBBEIj04mOIn4MFbXDzOcT1Mk8l/eZg6wtxRc hW7gLJ8CsM3kCZ/p4rxYsNgCqNCo09po2TS/yEVX5Ni1GIA3LdVcv5rVJjK1wge/nmav A47g== X-Gm-Message-State: AOAM5308j7zimb3YiW85u9jmtqqk+TCZxIkifj9BkcyysvZUR9RPpbER tUL6Gmzx/J13NlfGMo3NBdNwcusZVmc4tqghzBWmWA== X-Google-Smtp-Source: ABdhPJwgzZ9kTem2s5DLPzCB4a5HVBFtTEcRM0YmzS/9yA8rya4DMJj9dUJa7RU7vqMUj0nMDTxqlj1goL3lY4CWp+g= X-Received: by 2002:aca:df42:: with SMTP id w63mr4831731oig.128.1612434995408; Thu, 04 Feb 2021 02:36:35 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Daniel Vetter Date: Thu, 4 Feb 2021 11:36:24 +0100 Message-ID: Subject: Re: [GIT PULL] ib-drm-gpio-pdx86-rtc-wdt-v5.12-1 To: Patrik Jakobsson X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:REAL TIME CLOCK \(RTC\) SUBSYSTEM" , Alessandro Zummo , Alexandre Belloni , Andy Shevchenko , Mark Gross , LINUX-WATCHDOG , Hans de Goede , dri-devel , Platform Driver , "open list:GPIO SUBSYSTEM" , Andy Shevchenko , Bartosz Golaszewski , Wim Van Sebroeck , Guenter Roeck Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel