From: Al Viro <viro@ZenIV•linux.org.uk>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Randy Dunlap <rdunlap@xenotime•net>,
linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
Richard Weinberger <richard@nod•at>,
Andrew Morton <akpm@linux-foundation•org>
Subject: Re: linux-next: Tree for May 23 (uml)
Date: Thu, 24 May 2012 00:47:30 +0100 [thread overview]
Message-ID: <20120523234730.GP11775@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20120524091306.e6f6b17d7240b29a124b44c3@canb.auug.org.au>
On Thu, May 24, 2012 at 09:13:06AM +1000, Stephen Rothwell wrote:
> > 2)
> > Cherry-picked these guys into signal.git, along with the rest
> > of signal prereqs for them. Merge with next/akpm-base yields a couple
> > of trivial conflicts in kernel/fork.c (with
> > sched, mm: Rework sched_{fork,exec} node assignment
> > removing INIT_LIST_HEAD right next to the place where we add one; conflict
> > resolution being just keep the one Oleg adds and remove the one Peter removes)
> > and in kernel/irq/manage.c (with
> > genirq: Be more informative on irq type mismatch
> > changing a couple of printks in there; conflict resolution: just remove
> > exit_irq_thread() in merged variant). That's for-next-variant2. With that
> > variant we get 5 more duplicates with next/akpm, obviously.
> >
> > Stephen, which way would you prefer it handled?
>
> So variant2 sits on top of variant1 and you are intending to push the
> work in variant2 in this merge window anyway? In that case variant2
> makes sense. The number of small conflicts don't matter to much (up to a
> point anyway :-)). Also, these cherry-picks are out of Andrew's tree,
> right (so they are already in linuc-next)? In which case I would
> probably go with variant2.
Fine by me... Pushed into for-next, should be on git.kernel.org shortly...
next prev parent reply other threads:[~2012-05-23 23:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-23 7:07 linux-next: Tree for May 23 Stephen Rothwell
2012-05-23 8:10 ` Nicholas A. Bellinger
2012-05-23 15:58 ` linux-next: Tree for May 23 (uml) Randy Dunlap
2012-05-23 18:19 ` Al Viro
2012-05-23 19:37 ` Al Viro
2012-05-23 23:13 ` Stephen Rothwell
2012-05-23 23:47 ` Al Viro [this message]
2012-05-23 20:51 ` Geert Uytterhoeven
2012-05-23 16:14 ` [PATCH -next] acpi: fix acpi_bus.h warnings when ACPI is not enabled Randy Dunlap
2012-06-04 4:32 ` Len Brown
2012-06-04 14:42 ` Randy Dunlap
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=20120523234730.GP11775@ZenIV.linux.org.uk \
--to=viro@zeniv$(echo .)linux.org.uk \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rdunlap@xenotime$(echo .)net \
--cc=richard@nod$(echo .)at \
--cc=sfr@canb$(echo .)auug.org.au \
/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