linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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,
	Paul Mundt <lethal@linux-sh.org>, Joe Perches <joe@perches.com>
Subject: Re: linux-next: manual merge of the staging tree with the fbdev tree
Date: Fri, 7 Jan 2011 14:39:42 -0800	[thread overview]
Message-ID: <20110107223942.GA19793@kroah.com> (raw)
In-Reply-To: <20110107133511.bcfc1e85.sfr@canb.auug.org.au>

On Fri, Jan 07, 2011 at 01:35:11PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/video/udlfb.c between commit realloc_framebuffer ("video: udlfb:
> Kill off special printk wrappers, use pr_fmt()") from the fbdev tree and
> commit 5b84cc781058bb452f869d84bb24442ec51948c4 ("staging: Use vzalloc")
> from the staging tree.
> 
> Another commit in the fbdev tree moves this file out of staging (from
> drivers/staging/udlfb/udlfb.c).
> 
> I fixed it up (see below) and can carry the fix as necessary.

Patch looks good to me, thanks for doing this.

greg k-h

  reply	other threads:[~2011-01-07 22:39 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-07  2:35 linux-next: manual merge of the staging tree with the fbdev tree Stephen Rothwell
2011-01-07 22:39 ` Greg KH [this message]
2011-08-24  4:41 Stephen Rothwell
2011-08-24  4:48 ` Greg KH
2011-10-13  6:02 Stephen Rothwell
2011-10-13 15:10 ` 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=20110107223942.GA19793@kroah.com \
    --to=greg@kroah.com \
    --cc=joe@perches.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 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).