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.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, USER_AGENT_MUTT 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 6584CC282DD for ; Mon, 10 Jun 2019 08:57:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A8102082E for ; Mon, 10 Jun 2019 08:57:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="dLWDNPrk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388682AbfFJI5I (ORCPT ); Mon, 10 Jun 2019 04:57:08 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46647 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387890AbfFJI5I (ORCPT ); Mon, 10 Jun 2019 04:57:08 -0400 Received: by mail-wr1-f67.google.com with SMTP id n4so8255076wrw.13 for ; Mon, 10 Jun 2019 01:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=GlDt1J1fvetPyCESKlMjIqNMRM316J8zlPWhx4LvhsY=; b=dLWDNPrkI87/+NMFnp/VUOiz1kzAkorqRcxWDj2CwmyrVaPmdZqEui/iYaPCvA3EBt YqPI7+TYFzoQSWEuLJ74QLiw7ke6fg0PByg9knMnNIJzN+tYd3RT0OFaQ1VaeWcl/XDV awBdJmYgsMK8KCOAC7Z2wtU68rJmTZvwuKiNyxNeML9bl9KJTutqOQmU8kuQI/TYfwbV AzJH+7TANCbH6cLFyWGUve2ETdV7hkG5L4N5L9qc6RVwJDemOGB1Si7ol9cFGmU175+g paimTa6NSc3J74RFiZVjkGCiiF/3P9cWgXEwoZ3uqJjfAI+kZ7CD2L4yRZPYmU+Mear2 dvYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=GlDt1J1fvetPyCESKlMjIqNMRM316J8zlPWhx4LvhsY=; b=pkPvOumACaV9b/Im8cCfZiqREOgLaaFRkDWXPROLcEoAm4OsTfeDA0UEmt5JxWG86x EQZ1/OsNIw6QpQkSERtlONUXlEHjHxZpIH4TQMg172mhDUvboWnrtXj3lpqgnnO5Jzj5 haAoxwnivYDUvIQb7AMBRdr36PXszzJ+nUPtWk0vvuhNS7G4xrjhsPUhKNipugqGOTTJ BtdwjAOCZWt9Lv62tLE8THzvGIP3mcaYb8KGUSVLZDHaOhsEqlbUgmmWhIDoaMUHCyMy jwbD5pVkvIXkinx401p2P0AEci7Y6sQIaYExehlFuF70RKvl3AoYN8tBY6giNsUhGPJa Th7w== X-Gm-Message-State: APjAAAXM+RPcRnDiKTh9/wZ0n0LVJEVX8LXubOj65leg/4PUnvsgODhH Eg3LnxkjL/BxaPL2gpu0+u6BLQ== X-Google-Smtp-Source: APXvYqwjc0a0DLhGA1q6cGuReETiH52r+c3VwON9VQ9q0tUiL5klLowpEXxkevN5zMVwdmaiDjiyJg== X-Received: by 2002:adf:e691:: with SMTP id r17mr27661347wrm.67.1560157026515; Mon, 10 Jun 2019 01:57:06 -0700 (PDT) Received: from dell ([2.31.167.229]) by smtp.gmail.com with ESMTPSA id h1sm9097423wrt.20.2019.06.10.01.57.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Jun 2019 01:57:06 -0700 (PDT) Date: Mon, 10 Jun 2019 09:57:04 +0100 From: Lee Jones To: Enric Balletbo Serra Cc: Gwendal Grignou , alsa-devel@alsa-project.org, linux-iio@vger.kernel.org, fabien.lahoudere@collabora.com, Takashi Iwai , linux-kernel , Guenter Roeck , Mark Brown , Enric Balletbo i Serra , Benson Leung , Jonathan Cameron , Cheng-Yi Chiang Subject: Re: [GIT PULL] Immutable branch between MFD and Cros due for the v5.3 merge window Message-ID: <20190610085704.GM4797@dell> References: <20190603183401.151408-1-gwendal@chromium.org> <20190604055908.GA4797@dell> <20190610082012.GK4797@dell> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Mon, 10 Jun 2019, Enric Balletbo Serra wrote: > Hi, > > Thanks for the ib Lee. > > Doing my Monday rebase I just noticed we will have a trivial conflict > for the merge window. > > Missatge de Lee Jones del dia dl., 10 de juny > 2019 a les 10:20: > > > > As requested. > > > > Enjoy! > > > > The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: > > > > Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-cros-v5.3 > > > > for you to fetch changes up to 3aa6be30da899619c44aa654313ba66eb44e7291: > > > > mfd: cros_ec: Update I2S API (2019-06-10 09:15:08 +0100) > > > > ---------------------------------------------------------------- > > Immutable branch between MFD and Cros due for the v5.3 merge window > > > > ---------------------------------------------------------------- > > Gwendal Grignou (30): > > mfd: cros_ec: Update license term > > That's the commit will have problems due > > commit 9c92ab61914157664a2fbdf926df0eb937838e45 > Author: Thomas Gleixner > Date: Wed May 29 07:17:56 2019 -0700 > > treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 282 > > That was introduced in v5.2-rc4 Thanks for the heads-up. Hopefully -next will catch it. If not, hopefully Git will just 'do the right thing' (TM). > > mfd: cros_ec: Zero BUILD_ macro > > mfd: cros_ec: set comments properly > > mfd: cros_ec: add ec_align macros > > mfd: cros_ec: Define commands as 4-digit UPPER CASE hex values > > mfd: cros_ec: use BIT macro > > mfd: cros_ec: Update ACPI interface definition > > mfd: cros_ec: move HDMI CEC API definition > > mfd: cros_ec: Remove zero-size structs > > mfd: cros_ec: Add Flash V2 commands API > > mfd: cros_ec: Add PWM_SET_DUTY API > > mfd: cros_ec: Add lightbar v2 API > > mfd: cros_ec: Expand hash API > > mfd: cros_ec: Add EC transport protocol v4 > > mfd: cros_ec: Complete MEMS sensor API > > mfd: cros_ec: Fix event processing API > > mfd: cros_ec: Add fingerprint API > > mfd: cros_ec: Fix temperature API > > mfd: cros_ec: Complete Power and USB PD API > > mfd: cros_ec: Add API for keyboard testing > > mfd: cros_ec: Add Hibernate API > > mfd: cros_ec: Add Smart Battery Firmware update API > > mfd: cros_ec: Add I2C passthru protection API > > mfd: cros_ec: Add API for EC-EC communication > > mfd: cros_ec: Add API for Touchpad support > > mfd: cros_ec: Add API for Fingerprint support > > mfd: cros_ec: Add API for rwsig > > mfd: cros_ec: Add SKU ID and Secure storage API > > mfd: cros_ec: Add Management API entry points > > mfd: cros_ec: Update I2S API > > > > include/linux/mfd/cros_ec_commands.h | 3658 +++++++++++++++++++++++++++------- > > sound/soc/codecs/cros_ec_codec.c | 8 +- > > 2 files changed, 2915 insertions(+), 751 deletions(-) > > -- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog