public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@linux-foundation.org>
To: Ingo Molnar <mingo@elte.hu>,
	linux-kernel@vger.kernel.org,
	Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [v2.6.26] what's brewing in x86.git for v2.6.26
Date: Thu, 17 Apr 2008 01:14:01 -0700	[thread overview]
Message-ID: <20080417011401.ea3e70f0.akpm@linux-foundation.org> (raw)
In-Reply-To: <20080417002552.5742ad65.akpm@linux-foundation.org>

On Thu, 17 Apr 2008 00:25:52 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:

> A quick grep indicates that only 644 of
> these 884 patches are in -mm.  And a lot of them only turned up a week or
> two ago.

I did a test merge.

- About 13 patch rejects agaisnt git-kvm

- Multiple minor rejects aginst the IDE tree, the PCI tree

- Minor bustage of git-semaphore

- Several core MM patches which I also had merged.  I didn't check fully
  whether they are the same.

- extensive damage to the page-flags patches

  Did you check that all architectures and configurations still have
  sufficient page flags for us to be able to consume another one for
  kmemcheck?  The MM developers have put much, much effort into avoiding
  running out of flags over numerous years and afaik none of them even know
  that this debug feature is using one of the few remaining ones.

  What do we do when we run out?

- rejects in capabilities-implement-per-process-securebits.patch

- The proposed PR_GET_TSC and PR_SET_TSC have the same values as
  PR_GET_SECUREBITS and PR_SET_SECUREBITS.  Because we never knew this
  before we didn't get to discuss which one needs to be altered as we
  normally would.

- several rejects in
  x86-olpc-add-one-laptop-per-child-architecture-support.patch

- several bitops patches (use-__fls-for-fls64-on-64-bit-archs, etc) were
  also in -mm.  I did not check for differences between the two versions.

  These are not x86 patches.

- maybe ten-odd minor rejects in other places.


So not as bad as it might have been.  kvm and page-flags are the major
problems.  Of course, none of this has been compiled and this proposed code
combination has never been tested by anyone at runtime.


  parent reply	other threads:[~2008-04-17  8:14 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-16 20:23 [v2.6.26] what's brewing in x86.git for v2.6.26 Ingo Molnar
2008-04-16 20:37 ` Roland Dreier
2008-04-16 22:18   ` Suresh Siddha
2008-04-16 20:50 ` Andi Kleen
2008-04-17 10:06   ` Alexander van Heukelum
2008-04-17 10:51     ` Andi Kleen
2008-04-17 13:33       ` Alexander van Heukelum
2008-04-18  8:38     ` Ingo Molnar
2008-04-18 10:51       ` Andi Kleen
2008-04-17  7:25 ` Andrew Morton
2008-04-17  7:45   ` Pekka Enberg
2008-04-17  8:20     ` Andrew Morton
2008-04-17  8:32       ` Pekka J Enberg
2008-04-17  8:34         ` Pekka Enberg
2008-04-17  8:40           ` Ingo Molnar
2008-04-17  8:42           ` Andrew Morton
2008-04-17 11:49             ` Christoph Hellwig
2008-04-17 11:56               ` Ingo Molnar
2008-04-17 18:01               ` Andrew Morton
2008-04-17 18:51                 ` Ingo Molnar
2008-04-17 19:57                   ` Andrew Morton
2008-04-17 20:18                     ` Ingo Molnar
2008-04-18  9:33                   ` Tomasz Kłoczko
2008-04-18  9:42                     ` Ingo Molnar
2008-04-17  8:14   ` Andrew Morton [this message]
2008-04-17  8:57     ` Avi Kivity
2008-04-17 10:32     ` Johannes Weiner
2008-04-17 10:50       ` Andrew Morton
2008-04-17 11:49     ` Christoph Hellwig
2008-04-17 17:36       ` Andrew Morton
2008-04-17  8:30   ` Ingo Molnar
2008-04-17  8:40     ` Andrew Morton
2008-04-17  8:45       ` David Miller
2008-04-17  8:54         ` Andrew Morton
2008-04-17  8:56           ` Andrew Morton
2008-04-17  9:19           ` David Miller
2008-04-17  9:33             ` Andrew Morton
2008-04-17  9:06       ` Ingo Molnar
2008-04-17  9:18         ` Andrew Morton
2008-04-17  9:30           ` Ingo Molnar
2008-04-17  9:36             ` Andrew Morton
2008-04-17  9:46               ` Ingo Molnar
2008-04-17 10:06                 ` Andrew Morton
2008-04-17 10:11               ` Andi Kleen
2008-04-17 10:18                 ` Andrew Morton
2008-04-17 10:29                   ` Andi Kleen
2008-04-17 10:19               ` Pekka Enberg
2008-04-17 10:33                 ` Andrew Morton
2008-04-17 10:38                   ` Ingo Molnar
2008-04-17 10:42                     ` Pekka Enberg
2008-04-18 11:12                       ` Nick Piggin
2008-04-17 14:01                     ` Arjan van de Ven
2008-04-17 15:26                       ` Ingo Molnar
2008-04-18 12:41                       ` Ingo Molnar
2008-04-17 10:41                   ` Pekka Enberg
2008-04-17 18:47               ` Vegard Nossum
2008-04-17 19:27                 ` Ingo Molnar
2008-04-17 19:35                   ` Ingo Molnar
2008-04-17 19:39                     ` Vegard Nossum
2008-04-17 19:43                 ` Andrew Morton
2008-04-17 20:39                   ` Vegard Nossum
2008-04-17 20:55                     ` Andrew Morton
2008-04-17  9:53             ` Andrew Morton
2008-04-17  7:48 ` Andrew Morton
2008-04-18  6:27 ` Andrew Morton
2008-04-18  6:38   ` David Miller
2008-04-18  7:47     ` Ingo Molnar
2008-04-18  8:00       ` Andrew Morton
2008-04-18  8:11         ` Christoph Hellwig
2008-04-18  8:18           ` David Miller
2008-04-18 12:48             ` Ingo Molnar

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=20080417011401.ea3e70f0.akpm@linux-foundation.org \
    --to=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=torvalds@linux-foundation.org \
    /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