From: Josh Triplett <josh@joshtriplett.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
John Stultz <john.stultz@linaro.org>,
Catalina Mocanu <catalina.mocanu@gmail.com>
Subject: Re: linux-next: manual merge of the tiny tree with the tip tree
Date: Mon, 24 Nov 2014 22:48:49 -0800 [thread overview]
Message-ID: <20141125064849.GA1691@thin> (raw)
In-Reply-To: <20141125061645.GA15512@gmail.com>
On Tue, Nov 25, 2014 at 07:16:45AM +0100, Ingo Molnar wrote:
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi Josh,
> >
> > Today's linux-next merge of the tiny tree got a conflict in
> > kernel/time/Makefile between commit fd866e2b116b ("time: Rename
> > udelay_test.c to test_udelay.c") from the tip tree and commit
> > d1f6d68d03ea ("kernel: time: Compile out NTP support") from the tiny
> > tree.
>
> So I think a timer subsystem commit d1f6d68d03ea with this
> magnitude of linecount increase:
>
> Signed-off-by: Catalina Mocanu <catalina.mocanu@gmail.com>
> [josh: Handle CONFIG_COMPAT=y.]
> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
> Signed-off-by: Josh Triplett <josh@joshtriplett.org>
> ---
> drivers/pps/Kconfig | 2 +-
> include/linux/timex.h | 15 +++++++++++++--
> init/Kconfig | 10 ++++++++++
> kernel/compat.c | 8 ++++++--
> kernel/sys_ni.c | 4 ++++
> kernel/time/Makefile | 3 ++-
> kernel/time/ntp_internal.h | 28 ++++++++++++++++++++++++++++
> kernel/time/posix-timers.c | 2 ++
> kernel/time/time.c | 2 ++
> kernel/time/timekeeping.c | 2 ++
> 10 files changed, 70 insertions(+), 6 deletions(-)
>
> at minimum needs the ack of timer folks, before it can be
> committed to Git. Or is the tiny tree plan to submit all
> patches to the appropriate subsystem or gather acks, before
> sending it upstream?
Yes, absolutely. I planned to send out a tinification patch review
series later this week with all 10 current patches (both those reviewed
on LKML and those only reviewed elsewhere).
- Josh Triplett
next prev parent reply other threads:[~2014-11-25 6:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-25 6:03 linux-next: manual merge of the tiny tree with the tip tree Stephen Rothwell
2014-11-25 6:16 ` Ingo Molnar
2014-11-25 6:30 ` John Stultz
2014-11-25 7:20 ` Josh Triplett
2014-11-25 6:48 ` Josh Triplett [this message]
2014-11-25 10:10 ` Ingo Molnar
2014-11-26 0:04 ` josh
2014-12-08 11:09 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2014-09-26 6:45 Stephen Rothwell
2014-09-23 4:32 Stephen Rothwell
2014-09-23 5:43 ` Ingo Molnar
2014-09-23 6:21 ` Josh Triplett
2014-09-23 8:36 ` Ingo Molnar
2014-10-29 15:52 ` Josh Triplett
2014-09-23 4:23 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=20141125064849.GA1691@thin \
--to=josh@joshtriplett.org \
--cc=catalina.mocanu@gmail.com \
--cc=hpa@zytor.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).