From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
"Luck, Tony" <tony.luck@intel•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Ard Biesheuvel <ard.biesheuvel@linaro•org>,
Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the tip tree with the ia64 tree
Date: Mon, 19 Aug 2019 14:52:07 +1000 [thread overview]
Message-ID: <20190819145207.6646acd9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/ia64/include/asm/sn/sn_sal.h
between commit:
cf07cb1ff4ea ("ia64: remove support for the SGI SN2 platform")
from the ia64 tree and commit:
5828efb95bc4 ("efi: ia64: move SAL systab handling out of generic EFI code")
from the tip tree.
I fixed it up (the former removed the code updated by the latter) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2019-08-19 4:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190819145207.6646acd9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ard.biesheuvel@linaro$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tony.luck@intel$(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