LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Russell King <rmk+lkml@arm.linux.org.uk>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: schwidefsky@de.ibm.com, benh@kernel.crashing.org,
	linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
	Ingo Molnar <mingo@elte.hu>
Subject: Re: [patch 2/3] CONFIG_HIGHPTE vs. sub-page page tables.
Date: Mon, 4 Feb 2008 11:02:38 +0000	[thread overview]
Message-ID: <20080204110238.GB2791@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20080204025133.511ac3e2.akpm@linux-foundation.org>

On Mon, Feb 04, 2008 at 02:51:33AM -0800, Andrew Morton wrote:
> If this situation (conflicting changes and poor code quality) persists into
> the 2.6.25 cycle I will toss all the subsystem trees out of -mm, shall
> rebase -mm on mainline and shall merge first.  I had decided today to
> actually just do this, but on reflection I'll give it just one more shot.

Can I too whinge about that?

Shortly after the 2.6 merge window opened, various changes went in which
completely broke a number of the merged changes in the ARM tree.  That
resulted in the stuff which I thought was safe to merge becoming unsafe,
and with that I dropped all the changes which conflicted.

In some cases, these merge conflicts came about due to a bug fix I had
to put in to make the kernel bootable on ARM again.

I'm still in the middle of rebuilding the resulting mess from that - and
we're not yet back to where we were prior to the 2.6.24 release.  So, the
current version of the ARM tree which you most likely pulled for -mm1 is
incomplete with respect to what was planned to go in.  Therefore, you can
expect to see quite a number of apparantly "new" changes appearing in it
as these problems are resolved.

They're not really new, they're just the old stuff with the merge conflicts
fixed.

I don't see any end to these bun fights at the start of the merge window.
I believe it's inevitable given the work flow that we're now using.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

  reply	other threads:[~2008-02-04 11:03 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-12 14:30 [patch 0/3] page table changes schwidefsky
2007-11-12 14:30 ` [patch 1/3] add mm argument to pte/pmd/pud/pgd_free schwidefsky
2007-11-12 14:30 ` [patch 2/3] CONFIG_HIGHPTE vs. sub-page page tables schwidefsky
2008-01-02 20:44   ` Christoph Hellwig
2008-01-02 21:24     ` Geert Uytterhoeven
2008-01-02 21:28       ` Benjamin Herrenschmidt
2008-01-03 13:12     ` Andi Kleen
2008-01-03 14:01       ` Boaz Harrosh
2008-02-01 23:15   ` Andrew Morton
2008-02-03  5:37     ` Benjamin Herrenschmidt
2008-02-03  5:53       ` Andrew Morton
2008-02-03  6:46         ` Ingo Molnar
2008-02-04 10:36         ` Martin Schwidefsky
2008-02-04 10:51           ` Andrew Morton
2008-02-04 11:02             ` Russell King [this message]
2008-02-04 11:14               ` Andrew Morton
2008-02-05 14:39             ` Martin Schwidefsky
2008-02-05 18:46               ` Andrew Morton
2008-02-06  9:06                 ` Martin Schwidefsky
2008-02-06  9:09                   ` Andrew Morton
2008-02-06  9:15                     ` Ingo Molnar
2008-02-06 15:50                     ` Martin Schwidefsky
2007-11-12 14:30 ` [patch 3/3] arch_rebalance_pgtables call schwidefsky
2007-11-13 12:33   ` Nick Piggin
2007-11-14  9:26     ` Martin Schwidefsky
2007-11-14 10:06       ` Benjamin Herrenschmidt
2007-11-14 11:49         ` Martin Schwidefsky
2007-11-14 22:07           ` Benjamin Herrenschmidt
2007-11-15 17:13             ` Martin Schwidefsky

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=20080204110238.GB2791@flint.arm.linux.org.uk \
    --to=rmk+lkml@arm.linux.org.uk \
    --cc=akpm@linux-foundation.org \
    --cc=benh@kernel.crashing.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=schwidefsky@de.ibm.com \
    --subject='Re: [patch 2/3] CONFIG_HIGHPTE vs. sub-page page tables.' \
    /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

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).