| Message ID | 20230414160306.2254545-1-broonie@kernel.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp498252vqo;
Fri, 14 Apr 2023 09:16:27 -0700 (PDT)
X-Google-Smtp-Source:
AKy350Z1MjqrqMYbs19d6YVUYYWdUAs0VwFdrmJtRajqWHFlSkDWb13RRrtbv2J8KHhpN9O+s3bU
X-Received: by 2002:a17:90a:3fc8:b0:23d:15d8:1bc3 with SMTP id
u8-20020a17090a3fc800b0023d15d81bc3mr6175065pjm.39.1681488987527;
Fri, 14 Apr 2023 09:16:27 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1681488987; cv=none;
d=google.com; s=arc-20160816;
b=lOuOEoFYGNSKvLcF+T0BmJPulnAGtoP23vYiCGyvxYGX474Bi4tBT7wB2XAKYuEXP7
49KfmtDswH8MdNA7V0peT3LzvhcZnyY0UCpAptjhKPsAV4sqmvhR74mP9iARgSGugQod
NvCozHoUPBPxMgTLr4Umg2jr5pv4/KW2eMZxQ2N2eNCqfpMr6c6TmHREigPuyYzGvsIc
pCuBgZKPL8/qnXdUXSdfGpUjs/DDZguzsXcqa2FpwQfs3BAi8CwOe4lSjQ66ZhNHq+e9
BlHLdgEQ/sYIrRndSdgNSOtPXrj6fOMApJuKqPRtq7/5JtjoEprG1UHocr5/VphUZJR6
a4oQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from:dkim-signature;
bh=iL3oExLNLZYomewjhspKMVw3Evj4gMHDV0HZYWuQhVI=;
b=HvD6zWEzSY+Wz62IDHGe2wb/mlXUOHB1CqQqbmplZ7lqNw80XoR/E9vzHJ5/mCTINv
OgL0YkEJMNve98RCGHKb0xTegb5p3x0z7mmSe8PSXqdZf5XysnTcrlhnJtqzucHJU29y
vRrJqbrYH/S6SJ4h0ifoWaCzF7S4wxTIQbinut6Pryb7seBmbfJ7cc2ERcfWHBKvd0Am
Jl/awOWozaEHE3L4kUrI7mDL/NlB68NMw6+z67sEinvRPVXNhfWVPLKGInoM1P3MV2s5
nGRraiWfGbtC2p2XjjBYh0mlIbXH8c8F4vamwONVDcx9UOFRAtg04MBlKp5qMjKVYl2P
u4MA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=USod7eYD;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
j3-20020a170903028300b001a216fddd01si5161239plr.647.2023.04.14.09.16.12;
Fri, 14 Apr 2023 09:16:27 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=USod7eYD;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229831AbjDNQD2 (ORCPT <rfc822;leviz.kernel.dev@gmail.com>
+ 99 others); Fri, 14 Apr 2023 12:03:28 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47838 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229497AbjDNQDN (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Fri, 14 Apr 2023 12:03:13 -0400
Received: from dfw.source.kernel.org (dfw.source.kernel.org
[IPv6:2604:1380:4641:c500::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD4861BD0;
Fri, 14 Apr 2023 09:03:12 -0700 (PDT)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by dfw.source.kernel.org (Postfix) with ESMTPS id 4AB5164661;
Fri, 14 Apr 2023 16:03:12 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0F8FC433EF;
Fri, 14 Apr 2023 16:03:09 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1681488191;
bh=mwpEVmthTFGXrAt5wlQ6rrrdR4nou9HpjsVImzjWbwc=;
h=From:To:Cc:Subject:Date:From;
b=USod7eYDgwQFm8mGHq42JZkxRBBqcRBcS/dbXR1mcv0RHk+Wj3tekEGltOQYaPwCo
dZt0N2BAlkr6VaDxl1+zcnQ3GXIt+opo76fryYak+swZvJtsM2bqb1uTUtJja8cojQ
G0pDi3ElubIeYbRzlQk5uxmmMPtQbQcJ9H9VvmtYxvs7lHOBlcRRMq8FCVA1Mkd4Vd
9z3c+bLF4BF/auLop7aQd7etKjmN6HitGbyrI4otiF0VABaZqj6k6gVbEONUiN6m79
QhHmB2x3VnpL8BlzKgdmhDh7fnsFzM6sPqUr+o+gD//pwJlAt7lN8lq7QDwCwCRrCK
duZTIYnnhvPaQ==
From: broonie@kernel.org
To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the nvmem tree with the devicetree tree
Date: Fri, 14 Apr 2023 17:03:06 +0100
Message-Id: <20230414160306.2254545-1-broonie@kernel.org>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1763168996236737400?=
X-GMAIL-MSGID: =?utf-8?q?1763168996236737400?=
|
| Series |
linux-next: manual merge of the nvmem tree with the devicetree tree
|
|
Commit Message
Mark Brown
April 14, 2023, 4:03 p.m. UTC
Hi all,
Today's linux-next merge of the nvmem tree got a conflict in:
include/linux/of.h
between commit:
82174a0a9c5cf ("of: Move of_device_get_match_data() declaration")
from the devicetree tree and commit:
82174a0a9c5cf ("of: Move of_device_get_match_data() declaration")
from the nvmem tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
+++ b/include/linux/of.h
diff --cc include/linux/of.h index 6ecde0515677d,9b7a99499ef35..0000000000000 --- a/include/linux/of.h