From: Paul Gortmaker <paul.gortmaker@windriver•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Felipe Balbi <balbi@ti•com>, Greg KH <greg@kroah•com>
Subject: Re: linux-next: manual merge of the moduleh tree with the usb tree
Date: Tue, 6 Mar 2012 09:56:51 -0500 [thread overview]
Message-ID: <4F5625B3.9020400@windriver.com> (raw)
In-Reply-To: <20120306165053.c42cdb7ff8e6772a0a8ebbd5@canb.auug.org.au>
On 12-03-06 12:50 AM, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> drivers/usb/dwc3/dwc3-omap.c between commit 45b3cd4ad79b ("usb: dwc3:
> omap: convert pdata to of property") from the usb tree and commit
> 13ae246db4a0 ("includecheck: delete any duplicate instances of module.h")
> from the moduleh tree.
>
> Just context changes. I fixed it up and can carry the fix as necessary.
Thanks Stephen,
I had a look and the instance being deleted is really the right
one to delete, so this conflict will have to stay carried it seems.
Paul.
prev parent reply other threads:[~2012-03-06 14:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-06 5:50 linux-next: manual merge of the moduleh tree with the usb tree Stephen Rothwell
2012-03-06 14:56 ` Paul Gortmaker [this message]
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=4F5625B3.9020400@windriver.com \
--to=paul.gortmaker@windriver$(echo .)com \
--cc=balbi@ti$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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