From: Pekka Enberg <penberg@cs.helsinki.fi>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Lameter <cl@linux-foundation.org>,
linux-next@vger.kernel.org,
Randy Dunlap <randy.dunlap@oracle.com>,
Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>,
vegard.nossum@gmail.com
Subject: Re: linux-next: manual merge of the slab tree
Date: Wed, 13 Aug 2008 10:10:47 +0300 [thread overview]
Message-ID: <48A288F7.6060901@cs.helsinki.fi> (raw)
In-Reply-To: <20080813171116.6cce0139.sfr@canb.auug.org.au>
Hi Stephen,
Stephen Rothwell wrote:
> You should *never* base anything on linux-next if it is to be included in
> linux-next. What you should do is merge in Linus' latest tree (since
> that is the other side of the conflict, in this case) and you will get the
> same conflict and you can fix it in the merge that you do. Then tomorrow,
> I won't see the conflict when I do my merge of your updated tree.
OK, thanks! But what about kmemcheck then? We have conflicts there that
won't be resolved until 2.6.28. Does this mean I should grab the
kmemcheck patches to my tree now to fix them?
next prev parent reply other threads:[~2008-08-13 7:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-13 4:57 linux-next: manual merge of the slab tree Stephen Rothwell
2008-08-13 6:19 ` Pekka Enberg
2008-08-13 7:11 ` Stephen Rothwell
2008-08-13 7:10 ` Pekka Enberg [this message]
2008-08-13 7:36 ` Stephen Rothwell
2008-08-13 7:21 ` Pekka Enberg
2008-08-13 7:40 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-10-21 4:55 Stephen Rothwell
2008-11-03 4:07 Stephen Rothwell
2008-11-03 9:38 ` Pekka Enberg
2008-11-03 4:19 Stephen Rothwell
2008-11-03 4:52 ` KOSAKI Motohiro
2008-11-03 9:39 ` Pekka Enberg
2008-11-03 4:26 Stephen Rothwell
2008-11-03 9:39 ` Pekka Enberg
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=48A288F7.6060901@cs.helsinki.fi \
--to=penberg@cs.helsinki.fi \
--cc=cl@linux-foundation.org \
--cc=eduard.munteanu@linux360.ro \
--cc=linux-next@vger.kernel.org \
--cc=randy.dunlap@oracle.com \
--cc=sfr@canb.auug.org.au \
--cc=vegard.nossum@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.