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,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Florian Tobias Schandinat <FlorianSchandinat@gmx.de>,
linux-fbdev@vger.kernel.org, Aaro Koskinen <aaro.koskinen@iki.fi>
Subject: Re: linux-next: manual merge of the staging tree with the fbdev tree
Date: Thu, 13 Oct 2011 09:10:14 -0600 [thread overview]
Message-ID: <20111013151014.GA28061@kroah.com> (raw)
In-Reply-To: <20111013170225.254bc2d590deee544913ab6c@canb.auug.org.au>
On Thu, Oct 13, 2011 at 05:02:25PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/xgifb/XGI_main_26.c between commit 0d5c6ca30bb0
> ("staging: xgifb: use display information in info not in var for
> panning") from the fbdev tree and commit fd26d42019cb ("staging: xgifb:
> avoid direct references xgi_video_info") from the staging tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
The fix looks correct to me, thanks.
greg k-h
next prev parent reply other threads:[~2011-10-13 15:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-13 6:02 linux-next: manual merge of the staging tree with the fbdev tree Stephen Rothwell
2011-10-13 15:10 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-24 4:41 Stephen Rothwell
2011-08-24 4:48 ` Greg KH
2011-01-07 2:35 Stephen Rothwell
2011-01-07 22:39 ` Greg KH
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=20111013151014.GA28061@kroah.com \
--to=greg@kroah.com \
--cc=FlorianSchandinat@gmx.de \
--cc=aaro.koskinen@iki.fi \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-fbdev@vger.kernel.org \
--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 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).