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,
Aaro Koskinen <aaro.koskinen@iki.fi>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Paul Mundt <lethal@linux-sh.org>
Subject: Re: linux-next: manual merge of the staging tree with the fbdev tree
Date: Tue, 23 Aug 2011 21:48:56 -0700 [thread overview]
Message-ID: <20110824044856.GA1122@kroah.com> (raw)
In-Reply-To: <20110824144134.00bd3a688fb39b5d5563ff13@canb.auug.org.au>
On Wed, Aug 24, 2011 at 02:41:34PM +1000, 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 c42a3d543d2b
> ("staging: xgifb: use display information in info not in var for
> panning") from the fbdev tree and commit c39aada6926c ("staging: xgifb:
> eliminate #ifdef XGIFB_PAN") from the staging tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Wonderful, thanks for the fix.
greg k-h
next prev parent reply other threads:[~2011-08-24 4:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-24 4:41 linux-next: manual merge of the staging tree with the fbdev tree Stephen Rothwell
2011-08-24 4:48 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-10-13 6:02 Stephen Rothwell
2011-10-13 6:02 ` Stephen Rothwell
2011-10-13 15:10 ` Greg KH
2011-10-13 15:10 ` 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=20110824044856.GA1122@kroah.com \
--to=greg@kroah.com \
--cc=aaro.koskinen@iki.fi \
--cc=laurent.pinchart@ideasonboard.com \
--cc=lethal@linux-sh.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 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.