From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Rob Herring <robh@kernel.org>,
Christophe Ricard <christophe.ricard@gmail.com>,
Fabio Estevam <fabio.estevam@nxp.com>
Subject: Re: linux-next: manual merge of the tpmdd tree with Linus' tree
Date: Mon, 20 Jun 2016 17:33:50 +0300 [thread overview]
Message-ID: <20160620143350.GA7982@intel.com> (raw)
In-Reply-To: <20160620131345.1d6f64bd@canb.auug.org.au>
On Mon, Jun 20, 2016 at 01:13:45PM +1000, Stephen Rothwell wrote:
> Hi Jarkko,
>
> Today's linux-next merge of the tpmdd tree got a conflict in:
>
> Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
> 7aa5d38cfb77 ("of: Add Inforce Computing to vendor prefix list")
> 3eefa7e8cc85 ("dt-bindings: Add vendor prefix for TechNexion")
>
> from Linus' tree and commits:
>
> 45a33961f81a ("devicetree: Add infineon to vendor-prefix.txt")
> 3a34e75f6a91 ("devicetree: Add Trusted Computing Group to vendor-prefix.txt")
>
> from the tpmdd tree.
>
> BTW: commit 3a34e75f6a91 added the new entry out of alphabetical order.
>
> 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.
Got you, thanks.
> --
> Cheers,
> Stephen Rothwell
/Jarkko
>
> diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
> index d2bce2239769,717bae92e28a..000000000000
> --- a/Documentation/devicetree/bindings/vendor-prefixes.txt
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
> @@@ -125,10 -111,9 +125,11 @@@ hp Hewlett Packar
> i2se I2SE GmbH
> ibm International Business Machines (IBM)
> idt Integrated Device Technologies, Inc.
> +ifi Ingenieurburo Fur Ic-Technologie (I/F/I)
> iom Iomega Corporation
> img Imagination Technologies Ltd.
> + infineon Infineon Technologies
> +inforce Inforce Computing
> ingenic Ingenic Semiconductor
> innolux Innolux Corporation
> intel Intel Corporation
> @@@ -251,12 -227,10 +252,13 @@@ st STMicroelectronic
> startek Startek
> ste ST-Ericsson
> stericsson ST-Ericsson
> +syna Synaptics Inc.
> synology Synology, Inc.
> +SUNW Sun Microsystems, Inc
> tbs TBS Technologies
> -tcl Toby Churchill Ltd.
> + tcg Trusted Computing Group
> +tcl Toby Churchill Ltd.
> +technexion TechNexion
> technologic Technologic Systems
> thine THine Electronics, Inc.
> ti Texas Instruments
next prev parent reply other threads:[~2016-06-20 14:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 3:13 linux-next: manual merge of the tpmdd tree with Linus' tree Stephen Rothwell
2016-06-20 14:33 ` Jarkko Sakkinen [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-10-11 15:01 Mark Brown
2017-10-13 20:15 ` Jarkko Sakkinen
2017-12-08 2:25 Stephen Rothwell
2017-12-08 10:46 ` Jarkko Sakkinen
2021-04-23 2:39 Stephen Rothwell
2021-04-23 5:16 ` James Bottomley
2021-04-23 5:22 ` Stephen Rothwell
2023-06-05 0:55 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160620143350.GA7982@intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=christophe.ricard@gmail.com \
--cc=fabio.estevam@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robh@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=srinivas.kandagatla@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.