From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Masahiro Yamada <yamada.masahiro@socionext•com>
Cc: Jarkko Sakkinen <jarkko.sakkinen@linux•intel.com>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Sumit Garg <sumit.garg@linaro•org>
Subject: Re: linux-next: manual merge of the tpmdd tree with the kbuild tree
Date: Wed, 27 Nov 2019 07:32:18 +1100 [thread overview]
Message-ID: <20191127073218.7b7a61fd@canb.auug.org.au> (raw)
In-Reply-To: <20191118123944.5fbeec1e@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 915 bytes --]
Hi all,
On Mon, 18 Nov 2019 12:39:44 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the tpmdd tree got a conflict in:
>
> include/Kbuild
>
> between commit:
>
> fcbb8461fd23 ("kbuild: remove header compile test")
>
> from the kbuild tree and commit:
>
> 47f9c2796891 ("KEYS: trusted: Create trusted keys subsystem")
>
> from the tpmdd tree.
>
> I fixed it up (I just removed the file) 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.
This is now a conflict between the kbuild tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-11-26 20:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 1:39 linux-next: manual merge of the tpmdd tree with the kbuild tree Stephen Rothwell
2019-11-26 20:32 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-01-07 4:33 Stephen Rothwell
2022-01-07 4:43 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=20191127073218.7b7a61fd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jarkko.sakkinen@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sumit.garg@linaro$(echo .)org \
--cc=yamada.masahiro@socionext$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox