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,
Jason Baldus <jason.baldus@gmail.com>,
H Hartley Sweeten <hartleys@visionengravers.com>
Subject: Re: linux-next: manual merge of the staging-next tree with the staging.current tree
Date: Wed, 28 Apr 2010 08:25:58 -0700 [thread overview]
Message-ID: <20100428152558.GC4483@kroah.com> (raw)
In-Reply-To: <20100428160803.29fc7fe8.sfr@canb.auug.org.au>
On Wed, Apr 28, 2010 at 04:08:03PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/dt3155/dt3155_drv.c between commit
> 19ba984dd7d8dcf67cebc2ba55abbe454e318fb3 ("Staging: dt3155: fix 50Hz
> configuration") from the staging.current tree and commit
> da7bcc953ecf52d33b76b983ad5491d4d29f5f6a ("Staging: dt3155: fix
> parentheses and bracket spacing style issues") from the staging-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
The fix looks fine, thanks.
greg k-h
prev parent reply other threads:[~2010-04-28 15:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-28 6:08 linux-next: manual merge of the staging-next tree with the staging.current tree Stephen Rothwell
2010-04-28 15:25 ` Greg KH [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=20100428152558.GC4483@kroah.com \
--to=greg@kroah.com \
--cc=hartleys@visionengravers.com \
--cc=jason.baldus@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.