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=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 39F5AC433E6 for ; Fri, 22 Jan 2021 21:06:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F377123B45 for ; Fri, 22 Jan 2021 21:06:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729198AbhAVVGF (ORCPT ); Fri, 22 Jan 2021 16:06:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:52139 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730285AbhAVVFq (ORCPT ); Fri, 22 Jan 2021 16:05:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611349453; 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=ojBbmib3HW+Vk8eHI0XyBI6yZ25pUk4R+YG8M8Azs8Q=; b=CH0996gjilamhi7kvOtv9pvKitI2dumEcY90Myb7RpsZnxyZGsO0RQ8pzUyq7z/Q+CkwP0 KNug1iIuGBJcuZn28avM5/BEMH1cDXRYIzItBHoHGUo4K77LVrQn5v706U1MV7Lm3mQkEx tkp+UFZQpQET6B/RBTYk0Fvucd05yTk= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-240-0PkP3Ue_Pfyir7FHk4YdwQ-1; Fri, 22 Jan 2021 16:04:09 -0500 X-MC-Unique: 0PkP3Ue_Pfyir7FHk4YdwQ-1 Received: by mail-ed1-f72.google.com with SMTP id n18so3531071eds.2 for ; Fri, 22 Jan 2021 13:04:09 -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=ojBbmib3HW+Vk8eHI0XyBI6yZ25pUk4R+YG8M8Azs8Q=; b=jN9nfZNSI3I0V2LAfN0ihg3LirEbtTUIabbZxCVmF2c0AX7NfGh480TU2BtV1ZgXxm aA6rPCgprMtmIvU4INYwf33ioWK2k9PtD5AOKSazSc1Uq4Z+O5YLpCkRAnofnZuHZBOn w3IRjMj3BjOHjeGkFfCn0KKDMk+8DkGDj1KELNp4wGH0EAOBItnjOGaYEAEG2BxuRM15 zZCTxlBls9/RFSBNm4Fs3c43b/UXyf7pHPnnvZkXv/rq3I7pYmrcAvZk+CyuycmsyM/V SZElDMlV3uQvc/DAYVKIJgsBMfQirqYnkbOUgy/EnFQ9/NEXm862zH3p6BaAorQmAR9q IrZA== X-Gm-Message-State: AOAM5326yaxBQ5qabcxmYMZ6xie+l0MQq4VA+bCQI7vRfuglGLNLBXWt 1QIxtlqN+h49WoG16U7oB7MousctJyeNfrjQCXdPaYKOEbdduEagiMDnGoLrW52YWqNWZF6Yidt UEuIj5rYCjvd4O9zwLAbWAnB3Vmo= X-Received: by 2002:a17:907:7252:: with SMTP id ds18mr4272380ejc.239.1611349448558; Fri, 22 Jan 2021 13:04:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJx9MLCCtbPCyhHqfL3DjFawychQZ/BSSkESjO+dy5CJSr0XHbHZaRsDEncNSaKanNsoT+PPYQ== X-Received: by 2002:a17:907:7252:: with SMTP id ds18mr4272367ejc.239.1611349448347; Fri, 22 Jan 2021 13:04:08 -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 h12sm5923735edb.16.2021.01.22.13.04.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Jan 2021 13:04:07 -0800 (PST) Subject: Re: [PATCH v1 1/5] watchdog: intel_scu_watchdog: Remove driver for deprecated platform To: Andy Shevchenko Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , platform-driver-x86@vger.kernel.org, Mark Gross , linux-watchdog@vger.kernel.org, Wim Van Sebroeck , Guenter Roeck , Linus Walleij , Alessandro Zummo , Alexandre Belloni , Arnd Bergmann , Lee Jones References: <20210122123201.40935-1-andriy.shevchenko@linux.intel.com> <1f3d5ad1-9f8f-4a78-6239-6cdcbeeeb95b@redhat.com> From: Hans de Goede Message-ID: <4ba64643-9254-055d-49a0-55104b8669d8@redhat.com> Date: Fri, 22 Jan 2021 22:04:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 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 1/22/21 4:45 PM, Andy Shevchenko wrote: > +Cc: Arnd, RTC maintainers, Lee > > On Fri, Jan 22, 2021 at 05:22:25PM +0200, Andy Shevchenko wrote: >> On Fri, Jan 22, 2021 at 03:59:34PM +0100, Hans de Goede wrote: >>> Hi, >>> >>> What is the plan for merging this series ? >>> >>> It touches files under: >>> arch/x86 >>> drivers/watchdog >>> drivers/platform/x86 >>> >>> It is probably best if the entire series is merged through a single >>> tree. I don't expect this to cause any conflicts with current / upcoming >>> changes under drivers/platform/x86, so I'm fine with this being merged >>> through another tree. >>> >>> Or if I can get an ack for that from the x86 and watchdog maintainers >>> I can merge the entire series through the pdx86 tree. >> >> For time being I'm collecting tags and comments. >> As of today this series is independent per se, but other (later) clean up >> patches may rely on this. >> >> One strategy can be providing an immutable branch for anybody who wants it and >> merge thru PDx86 or watchdog tree (I guess PDx86 is preferable because there >> are more patches touching other stuff, though independently, in this matters). > > Yes, I think one more time and guess the best is: > - get tags from x86 / watchdog > - get tag from RTC > - collect everything in PDx86 immutable branch Ok, that works for me. I assume that it is best for the other subsystems if I create an immutable branch for this based on 5.11-rc1 (and then merge that into pdx86/for-next) ? Guenter, I believe you have already reviewed all the watchdog changes, are you ok with me creating an immutable branch for the entire series and then sending you a pull-req for that ? And x86 folks, can I get an Ack for merging the: rename arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c => drivers/platform/x86/intel_scu_wdt.c Change through an PDx86 immutable branch (for which you will then get a pull-req) ? Regards, Hans > - part 2 can be merged thru Lee's MFD tree with taking above mentioned branch > as a base > - part 3 (SFI removal) can be done based on Lee's branch and via tip tree > > in this case we won't wait all maintainers to give a tag in a short period of > time (like couple of weeks from now on). > > The full series (all three parts) are located in [1]. > > [1]: https://gitlab.com/andy-shev/next/-/tree/topic/mid-removal-next >