All of lore.kernel.org
 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,
	Jarod Wilson <jarod@redhat.com>,
	Mauro Carvalho Chehab <mchehab@redhat.com>
Subject: Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree
Date: Wed, 28 Jul 2010 06:51:49 -0700	[thread overview]
Message-ID: <20100728135149.GA12904@kroah.com> (raw)
In-Reply-To: <20100728152736.bcaa5d59.sfr@canb.auug.org.au>

On Wed, Jul 28, 2010 at 03:27:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/Kconfig between commit
> 44d349d2b19019e0b5912bc4e6c8531e50b394aa ("V4L/DVB: staging/lirc: wire up
> Kconfig and Makefile bits") from the v4l-dvb tree and several commits
> from the staging-next tree.
> 
> Just overlapping additions.  I fixed it up (see below) and can carry the
> fix as necessary.

Looks good to me.

thanks,

greg k-h

  reply	other threads:[~2010-07-28 13:56 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-28  5:27 linux-next: manual merge of the staging-next tree with the v4l-dvb tree Stephen Rothwell
2010-07-28 13:51 ` Greg KH [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-10-19  6:12 Stephen Rothwell
2010-10-19  6:23 ` Stephen Rothwell
2010-10-19 15:53   ` Greg KH
2010-10-21 10:58     ` Mauro Carvalho Chehab
2010-07-06  7:53 Stephen Rothwell
2010-07-07 15:14 ` Greg KH
2010-04-28  6:07 Stephen Rothwell
2010-04-28 15:26 ` Greg KH
2010-04-28 19:06   ` Mauro Carvalho Chehab

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=20100728135149.GA12904@kroah.com \
    --to=greg@kroah.com \
    --cc=jarod@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mchehab@redhat.com \
    --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.