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,
	Joe Perches <joe@perches.com>, Jiri Kosina <jkosina@suse.cz>
Subject: Re: linux-next: manual merge of the staging tree with the trivial tree
Date: Sun, 17 Jul 2011 11:16:00 +0200	[thread overview]
Message-ID: <20110717091600.GD25824@kroah.com> (raw)
In-Reply-To: <20110716225343.4a0a0472fb944c9ba79f9590@canb.auug.org.au>

On Sat, Jul 16, 2011 at 10:53:43PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/generic_serial/ser_a2232.c between commit 28f65c11f2ff
> ("treewide: Convert uses of struct resource to resource_size(ptr)") from
> the trivial tree and commit bb2a97e9ccd5 ("Staging: delete generic_serial
> drivers") from the staging tree.
> 
> The latter removes the file, so I did that.

Thank you, that is the correct fix :)

  reply	other threads:[~2011-07-17  9:18 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-16 12:53 linux-next: manual merge of the staging tree with the trivial tree Stephen Rothwell
2011-07-17  9:16 ` Greg KH [this message]
2011-07-20 10:01   ` Jiri Kosina
  -- strict thread matches above, loose matches on Subject: below --
2012-06-29  5:57 Stephen Rothwell
2012-06-29 15:55 ` Greg KH
2011-07-16 12:56 Stephen Rothwell
2011-07-17  9:16 ` Greg KH
2011-06-21  5:10 Stephen Rothwell
2011-06-21  5:10 Stephen Rothwell

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=20110717091600.GD25824@kroah.com \
    --to=greg@kroah.com \
    --cc=jkosina@suse.cz \
    --cc=joe@perches.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.