From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Vitaliy Ivanov <vitalivanov@gmail.com>,
Jiri Kosina <jkosina@suse.cz>
Subject: Re: linux-next: manual merge of the staging tree with the trivial tree
Date: Sun, 17 Jul 2011 11:16:10 +0200 [thread overview]
Message-ID: <20110717091610.GE25824@kroah.com> (raw)
In-Reply-To: <20110716225643.426f99dafa7fcebab4cd9be8@canb.auug.org.au>
On Sat, Jul 16, 2011 at 10:56:43PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h
> drivers/staging/westbridge/astoria/gadget/cyasgadget.h between commit
> e44ba033c565 ("treewide: remove duplicate includes") from the trivial
> tree and commit 78f23926dff9 ("Staging: delete westbridge code") from the
> staging tree.
>
> The latter removes the files, so I did that.
Thanks, that is correct.
next prev parent reply other threads:[~2011-07-17 9:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-16 12:56 linux-next: manual merge of the staging tree with the trivial tree Stephen Rothwell
2011-07-17 9:16 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-06-29 5:57 Stephen Rothwell
2012-06-29 15:55 ` Greg KH
2011-07-16 12:53 Stephen Rothwell
2011-07-17 9:16 ` Greg KH
2011-07-20 10:01 ` Jiri Kosina
2011-06-21 5:10 Stephen Rothwell
2011-06-21 5:10 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=20110717091610.GE25824@kroah.com \
--to=greg@kroah.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vitalivanov@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 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).