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=-10.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 F37BAC433E6 for ; Tue, 23 Feb 2021 03:29:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B074F64E5B for ; Tue, 23 Feb 2021 03:29:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231531AbhBWD32 (ORCPT ); Mon, 22 Feb 2021 22:29:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230498AbhBWD3T (ORCPT ); Mon, 22 Feb 2021 22:29:19 -0500 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9111C061574; Mon, 22 Feb 2021 19:28:38 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Dl4Jf3K23z9sVF; Tue, 23 Feb 2021 14:28:34 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1614050917; bh=V690SKCwLrohnCVI+gCw4TsytrgcasOIs1npBVXhXMo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=jVBKqM6wzrc2e1+KV+42Vj+6ATKobYHbyvWPGtSQyd1yMQ/IiyGOW3XD8S62GHpAW 7y8cQz11uhaZnCrOsw1eBT4Ci5YzahYmH9Yib2Yyc3vNN4yi8G9z6mkxtfnwjQ9inu spNBBVtdJ5m6EDQjG9eNW9e+lRi8328+5LcRESjXmAtdHb08hWlSga77uV0Kwgq31z NTHCp7mTVBK5hMWeG3Lp9E7ZKNAq/plydXck0EMu2xWBi4B5U3RU/ozI63jHxkynue nSkeyTXORBUE1XGOnjJWWCr9HtXLs4NFkVgF+aIjvK+cEYvc408UYOeQ2OWK5ZjYGH NoK9vPLtAIWdg== Date: Tue, 23 Feb 2021 14:28:33 +1100 From: Stephen Rothwell To: Greg KH , Arnd Bergmann Cc: Hans de Goede , Mark Gross , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Matthew Gerlach , Maximilian Luz , Moritz Fischer , Russ Weight , Wu Hao , Xu Yilun Subject: Re: linux-next: manual merge of the char-misc tree with the drivers-x86 tree Message-ID: <20210223142833.377289f6@canb.auug.org.au> In-Reply-To: <20210215074431.7a06b223@canb.auug.org.au> References: <20210111130851.374bf4ea@canb.auug.org.au> <20210215074431.7a06b223@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/D1xfNiQo4XdiSMLL8iqRR22"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/D1xfNiQo4XdiSMLL8iqRR22 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Mon, 15 Feb 2021 07:44:31 +1100 Stephen Rothwell = wrote: > > On Mon, 11 Jan 2021 13:08:51 +1100 Stephen Rothwell wrote: > > > > Today's linux-next merge of the char-misc tree got conflicts in: > >=20 > > include/linux/mod_devicetable.h > > scripts/mod/devicetable-offsets.c > > scripts/mod/file2alias.c > >=20 > > between commit: > >=20 > > eb0e90a82098 ("platform/surface: aggregator: Add dedicated bus and de= vice type") > >=20 > > from the drivers-x86 tree and commits: > >=20 > > 9326eecd9365 ("fpga: dfl: move dfl_device_id to mod_devicetable.h") > > 4a224acec597 ("fpga: dfl: add dfl bus support to MODULE_DEVICE_TABLE(= )") > >=20 > > from the char-misc tree. > >=20 > > 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. > >=20 > > diff --cc include/linux/mod_devicetable.h > > index 935060955152,b8dae34eca10..000000000000 > > --- a/include/linux/mod_devicetable.h > > +++ b/include/linux/mod_devicetable.h > > @@@ -846,22 -846,28 +846,46 @@@ struct auxiliary_device_id=20 > > kernel_ulong_t driver_data; > > }; > > =20 > > +/* Surface System Aggregator Module */ > > + > > +#define SSAM_MATCH_TARGET 0x1 > > +#define SSAM_MATCH_INSTANCE 0x2 > > +#define SSAM_MATCH_FUNCTION 0x4 > > + > > +struct ssam_device_id { > > + __u8 match_flags; > > + > > + __u8 domain; > > + __u8 category; > > + __u8 target; > > + __u8 instance; > > + __u8 function; > > + > > + kernel_ulong_t driver_data; > > +}; > > + > > + /* > > + * DFL (Device Feature List) > > + * > > + * DFL defines a linked list of feature headers within the device MMI= O space to > > + * provide an extensible way of adding features. Software can walk th= rough these > > + * predefined data structures to enumerate features. It is now used i= n the FPGA. > > + * See Documentation/fpga/dfl.rst for more information. > > + * > > + * The dfl bus type is introduced to match the individual feature dev= ices (dfl > > + * devices) for specific dfl drivers. > > + */ > > +=20 > > + /** > > + * struct dfl_device_id - dfl device identifier > > + * @type: DFL FIU type of the device. See enum dfl_id_type. > > + * @feature_id: feature identifier local to its DFL FIU type. > > + * @driver_data: driver specific data. > > + */ > > + struct dfl_device_id { > > + __u16 type; > > + __u16 feature_id; > > + kernel_ulong_t driver_data; > > + }; > > +=20 > > #endif /* LINUX_MOD_DEVICETABLE_H */ > > diff --cc scripts/mod/devicetable-offsets.c > > index f078eeb0a961,1b14f3cde4e5..000000000000 > > --- a/scripts/mod/devicetable-offsets.c > > +++ b/scripts/mod/devicetable-offsets.c > > @@@ -246,13 -246,9 +246,17 @@@ int main(void > > DEVID(auxiliary_device_id); > > DEVID_FIELD(auxiliary_device_id, name); > > =20 > > + DEVID(ssam_device_id); > > + DEVID_FIELD(ssam_device_id, match_flags); > > + DEVID_FIELD(ssam_device_id, domain); > > + DEVID_FIELD(ssam_device_id, category); > > + DEVID_FIELD(ssam_device_id, target); > > + DEVID_FIELD(ssam_device_id, instance); > > + DEVID_FIELD(ssam_device_id, function); > > + > > + DEVID(dfl_device_id); > > + DEVID_FIELD(dfl_device_id, type); > > + DEVID_FIELD(dfl_device_id, feature_id); > > +=20 > > return 0; > > } > > diff --cc scripts/mod/file2alias.c > > index d21d2871387b,7ebabeb1e9c9..000000000000 > > --- a/scripts/mod/file2alias.c > > +++ b/scripts/mod/file2alias.c > > @@@ -1375,28 -1375,18 +1375,40 @@@ static int do_auxiliary_entry(const = cha > > return 1; > > } > > =20 > > +/* > > + * Looks like: ssam:dNcNtNiNfN > > + * > > + * N is exactly 2 digits, where each is an upper-case hex digit. > > + */ > > +static int do_ssam_entry(const char *filename, void *symval, char *al= ias) > > +{ > > + DEF_FIELD(symval, ssam_device_id, match_flags); > > + DEF_FIELD(symval, ssam_device_id, domain); > > + DEF_FIELD(symval, ssam_device_id, category); > > + DEF_FIELD(symval, ssam_device_id, target); > > + DEF_FIELD(symval, ssam_device_id, instance); > > + DEF_FIELD(symval, ssam_device_id, function); > > + > > + sprintf(alias, "ssam:d%02Xc%02X", domain, category); > > + ADD(alias, "t", match_flags & SSAM_MATCH_TARGET, target); > > + ADD(alias, "i", match_flags & SSAM_MATCH_INSTANCE, instance); > > + ADD(alias, "f", match_flags & SSAM_MATCH_FUNCTION, function); > > + > > + return 1; > > +} > > + > > + /* Looks like: dfl:tNfN */ > > + static int do_dfl_entry(const char *filename, void *symval, char *ali= as) > > + { > > + DEF_FIELD(symval, dfl_device_id, type); > > + DEF_FIELD(symval, dfl_device_id, feature_id); > > +=20 > > + sprintf(alias, "dfl:t%04Xf%04X", type, feature_id); > > +=20 > > + add_wildcard(alias); > > + return 1; > > + } > > +=20 > > /* Does namelen bytes of name exactly match the symbol? */ > > static bool sym_is(const char *name, unsigned namelen, const char *sy= mbol) > > { > > @@@ -1472,7 -1462,7 +1484,8 @@@ static const struct devtable devtable[ > > {"wmi", SIZE_wmi_device_id, do_wmi_entry}, > > {"mhi", SIZE_mhi_device_id, do_mhi_entry}, > > {"auxiliary", SIZE_auxiliary_device_id, do_auxiliary_entry}, > > + {"ssam", SIZE_ssam_device_id, do_ssam_entry}, > > + {"dfl", SIZE_dfl_device_id, do_dfl_entry}, > > }; > > =20 > > /* Create MODULE_ALIAS() statements. =20 >=20 > With the merge window about to open, this is a reminder that this > conflict still exists. This is now a conflict between the char-misc tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/D1xfNiQo4XdiSMLL8iqRR22 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmA0dmEACgkQAVBC80lX 0GyFvQf9EHd9IqAfYQhgFlwftYAuSNDmqMDbr8QFCA5CPV84ykrgXWm4xC0Bqst2 3DaUvEd9d85GlYkYMwyzpsQuM12G4xt9mySgKzkLb4bENZLGiNSYY89wV/HKiWOd zg278ikVVfb/yfBBNhq1KvQ2NJ3RJq0QGyTuLMux3wNoRC1qx4//kiUZmGbEubBt +Pb+QEAEYDrM886qtf7AjUImsGeBJqMPOyhhZq6AH2kBXGoHE4NlnpAJ0vNLgO7s fgtxOK6BSu9c/Zk8/KcuMNiOjTwGwpmxriIJtIkh5DpZcOlYV2sZqb2GEcR69Wte TL3R8yEOQIwT6JvH3/Ce1rNV6o7POA== =u76T -----END PGP SIGNATURE----- --Sig_/D1xfNiQo4XdiSMLL8iqRR22--