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>,
Ralf Baechle <ralf@linux-mips•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Qais Yousef <qais.yousef@imgtec•com>,
Hauke Mehrtens <hauke@hauke-m•de>
Subject: linux-next: manual merge of the tip tree with the mips tree
Date: Mon, 14 Mar 2016 13:18:52 +1100 [thread overview]
Message-ID: <20160314131852.20068d5a@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/mips/Kconfig
between commit:
7a50e4688dab ("MIPS: Fix build error when SMP is used without GIC")
from the mips tree and commit:
7eb8c99db26c ("MIPS: Delete smp-gic.c")
from the tip tree.
I fixed it up (I used the tip tree version since that removed the lines
updated by the mips tree patch) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-03-14 2:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-14 2:18 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-09-04 4:19 linux-next: manual merge of the tip tree with the mips tree Stephen Rothwell
2015-04-13 5:59 Stephen Rothwell
2015-04-17 15:33 ` Jiri Olsa
2014-10-09 4:09 Stephen Rothwell
2014-01-15 5:06 Stephen Rothwell
2014-01-15 5:00 Stephen Rothwell
2011-11-23 2:01 Stephen Rothwell
2011-11-23 2:07 ` Deng-Cheng Zhu
2009-11-23 5:46 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=20160314131852.20068d5a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hauke@hauke-m$(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=qais.yousef@imgtec$(echo .)com \
--cc=ralf@linux-mips$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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