Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp2558356pxp; Tue, 22 Mar 2022 00:37:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzN3lbMaJvJVWebcAheNPj2/sRFyJk2rX1mwGjuSbhEXYeiwIhJusBEY20XXqZ+y+x5sQkf X-Received: by 2002:a17:902:e943:b0:14f:4a2b:203 with SMTP id b3-20020a170902e94300b0014f4a2b0203mr16756213pll.113.1647934630261; Tue, 22 Mar 2022 00:37:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647934630; cv=none; d=google.com; s=arc-20160816; b=Le9PjPIBSjU1sMc88AfqBvaZJcvCo2vsSmASr4lgSb/xY/RMlbQ6YbZdh2dntJsqKN +ExdjSFmKxcNlvjE0YjylGJ1ZFfz0u1emeEVmSQ7pzMfzArmtW17l9F0574GnE0wiV5l Zf8f7a3wcNwDYKtqL4iyE7nw3rJVJuZQNlfkywqrk6jYmn5QutJRIcBWR0xYhIYMnSgB ZUrKPSvsI8I3g4eWhaPJMsJBFJdNMj1P/xWH5E9cJIUm/v4GdYKtUz3XQ9ruzjt06KAE IVJsNkNryk519fJVsWwKKNM2TyOa/frNE4RFRj03IAzz+o4nSjd8MyOSyjnua+tbdsPt CXQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=rOPH6g37mauJoa2trxdFJdkR5hRR2ETwMr/7bfJTMVs=; b=TY1OCFt55OVkO9NZHn+iLZDh7QZClSF+NRT9eGWqwyzGBb9vrTzdHF8MzrOk5LbEZu 6N07LeFM9xFG6ckhe03N/loQADRSIy7200EnDsPPOuHvY9bPzw1K0yHj91uy1Q3Oo+ER RBED01J//t281FhERIHOB3eyI6XRME5eSq+xYZj3ZZJ2vTALsc2e0KMGZPap/q12+OAi tHUXVHD5Fwnbt9LCR1yI75KQR6tXtUkU0n/k+mV08cAjn4yr4UYivQLC1G/txvcKPHaq gT5pO/8xAl5Hv2OIj2N1Aayip6cu0JywvNBRqqOsobZOzCSy+XIpED9n+z+8A/8jveCu gzRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ECmoAO6p; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id g1-20020a17090a7d0100b001bd14e030a1si1596046pjl.121.2022.03.22.00.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 00:37:10 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ECmoAO6p; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2853F21A1; Tue, 22 Mar 2022 00:18:25 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237368AbiCVHTn (ORCPT + 99 others); Tue, 22 Mar 2022 03:19:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237367AbiCVHTe (ORCPT ); Tue, 22 Mar 2022 03:19:34 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7CA763AA for ; Tue, 22 Mar 2022 00:18:06 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id a1so22229586wrh.10 for ; Tue, 22 Mar 2022 00:18:06 -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; bh=rOPH6g37mauJoa2trxdFJdkR5hRR2ETwMr/7bfJTMVs=; b=ECmoAO6pUz5bCOcqf0VjrZStJXin03xM1sXJYLPNpOrw/efsdaQ9T3QISm981kdFIk ttvS4MEmLE6zZwzPh+Q62fnjXdEwS7bJxXAh4pJTGki2KiqC/8HiN9MS4/uwWJARnX9U CR7I63zLZUo9H2YSiL3ap4rC/fCuZS++znRcLVfd53Obxk+z5/cyMaGdjXWyAlnklchI /gjH3Wzc4Aa2Pgi07mD7JCgASK8Nvv7e6HMEyWrXJVlYl2FDAmfUCWOLoXpXBQDE1AYU C/SSnwusEQ+nh3cvj86u0fK85nCaN8fD0ReHDDy9+4QjaWmT862USFlLAaiBWT2AM0LL CLNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=rOPH6g37mauJoa2trxdFJdkR5hRR2ETwMr/7bfJTMVs=; b=wfDe6So3upARCc3CQvt+0V+01kqipixP+XPfX3djJbUAFsoi4S75LNRySj2drlebxE xcfzJIXaZY59cAlTXW0WVtmnYXdue6HpU8yWfP0SbRK3pYkQaIK4Ub750bFhUHhZFWqx sUEnKq75psVHfeEpTRKxZz+aMzSG7RGZ4BmmQ056ZFTYFtJlWiZ5uHB4XoFAnVvZBVHj q76QnfZAExMF/+ysWnlmeWcYVCnK+TA8r/TDJEnnUTEGeti0voKL2W8wxjyLO2DPWV0D 7xLZEXyv48FMyNJoReR6W3GEowO6yX+DeRWIWNpJJMxFJ/SGMawcAHPPUOAyy46E+OFa 7nWA== X-Gm-Message-State: AOAM531jdlJK3deBTaRGp0K/AFy2uZrBYPox0uSndHwV1/pBUQFke9sM 0027OU6mN0sONfpOjNCCORToEBkuX2YLCQ== X-Received: by 2002:adf:a41c:0:b0:203:daeb:165f with SMTP id d28-20020adfa41c000000b00203daeb165fmr21807101wra.188.1647933485475; Tue, 22 Mar 2022 00:18:05 -0700 (PDT) Received: from google.com (cpc155339-bagu17-2-0-cust87.1-3.cable.virginm.net. [86.27.177.88]) by smtp.gmail.com with ESMTPSA id f11-20020a7bcc0b000000b0037e0c362b6dsm1225250wmh.31.2022.03.22.00.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 00:18:04 -0700 (PDT) Date: Tue, 22 Mar 2022 07:18:02 +0000 From: Lee Jones To: Stephen Rothwell Cc: Rob Herring , Linux Kernel Mailing List , Linux Next Mailing List , Michael Walle , Rob Herring Subject: Re: linux-next: manual merge of the devicetree tree with the mfd tree Message-ID: References: <20220322141029.1885af98@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220322141029.1885af98@canb.auug.org.au> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 22 Mar 2022, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the devicetree tree got a conflict in: > > Documentation/devicetree/bindings/mfd/syscon.yaml > > between commit: > > 844dd8fe02f2 ("dt-bindings: Add compatibles for undocumented trivial syscons") > > from the mfd tree and commit: > > c1ff0c0f24d6 ("dt-bindings: mfd: syscon: add microchip,lan966x-cpu-syscon compatible") > > from the devicetree tree. Did you accidentally hoover this up Rob? -- Lee Jones [李琼斯] Principal Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog