From: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the uprobes tree with the tip tree
Date: Wed, 14 Mar 2012 10:25:44 +0530 [thread overview]
Message-ID: <20120314045544.GA4644@linux.vnet.ibm.com> (raw)
In-Reply-To: <20120314151444.a34eef495739e13506ac5b1a@canb.auug.org.au>
> The linux-next merge of the uprobes tree gets several conflicts against
> the tip tree because the same patches appear in both threes and there are
> further changes to some files in the uprobes tree.
>
> Merging uprobes/for-next (1fe509b uprobes/core: Handle breakpoint and singlestep exception.)
> CONFLICT (add/add): Merge conflict in kernel/events/uprobes.c
> CONFLICT (content): Merge conflict in kernel/events/Makefile
> CONFLICT (add/add): Merge conflict in include/linux/uprobes.h
> CONFLICT (add/add): Merge conflict in arch/x86/kernel/uprobes.c
> CONFLICT (add/add): Merge conflict in arch/x86/include/asm/uprobes.h
>
> The easiest way to remove these conflicts would be for you to rebase the
> uprobes tree onto the perl/uprobes branch of the tip tree (I assume that
> all the uprobes code will eventually be merged to Linus via the tip tree)
> or a subset of that branch that is the common set of patches.
Okay, I will go with this suggestion. Infact this is actually easier for
me.
--
Thanks and Regards
Srikar
next prev parent reply other threads:[~2012-03-14 4:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-14 4:14 linux-next: manual merge of the uprobes tree with the tip tree Stephen Rothwell
2012-03-14 4:55 ` Srikar Dronamraju [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-13 5:52 Stephen Rothwell
2012-03-13 5:52 Stephen Rothwell
2012-03-13 5:52 Stephen Rothwell
2012-03-13 5:41 Stephen Rothwell
2012-02-27 2:58 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=20120314045544.GA4644@linux.vnet.ibm.com \
--to=srikar@linux.vnet.ibm.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--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