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.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 8597AC433DB for ; Thu, 4 Feb 2021 10:37:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 364AD64F4E for ; Thu, 4 Feb 2021 10:37:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235520AbhBDKhR (ORCPT ); Thu, 4 Feb 2021 05:37:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235343AbhBDKhQ (ORCPT ); Thu, 4 Feb 2021 05:37:16 -0500 Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 033F6C061573 for ; Thu, 4 Feb 2021 02:36:35 -0800 (PST) Received: by mail-oi1-x234.google.com with SMTP id m7so3162065oiw.12 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=G1XDS4DAar/y8X85pFKnlfbnvKro8SE5rXdEBE5DcDulJZdr4S8LafQVY0czuH39sM mAwG96dSjzFVvE/tMBiB6d0R7lk9fbdfaSDbOHAluqNsRE3aNiC98P/NM+o9T+nNY8KL HKr/h6QzW2S6wdeLNPNQD2xKxB31T1q64jz2otkTP7N/a8xqejfYJJor/X07KPTfyJI9 5Alq94BF4h+xgxgy/EYgjwm60+nCkyjEq90tosL8hHAjNAICVmZonDc/6V6RCb6XeZyy 2Tz5Mc6wUK4W1DNVtcyVG4HC1PJ9fCQ8tF5HfApwNcAGOU1CXVCsxfPaOqhXqphFkDXO D5eQ== X-Gm-Message-State: AOAM530CIabJfYSsMWRdUPyhGea95FVg6qLJxmRcm+HAD1M+P+MrQivD 9NfXVd3KeZVCdQxBJ112tr6E/kSdrUoo3UHtRaWWYQ== 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 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 , Hans de Goede , Bartosz Golaszewski , Andy Shevchenko , Guenter Roeck Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org 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