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 Bolle <pebolle@tiscali.nl>, Jiri Kosina <jkosina@suse.cz>,
H Hartley Sweeten <hartleys@visionengravers.com>
Subject: Re: linux-next: manual merge of the staging tree with the trivial tree
Date: Fri, 29 Jun 2012 11:55:59 -0400 [thread overview]
Message-ID: <20120629155559.GA21039@kroah.com> (raw)
In-Reply-To: <20120629155724.99c0b8d8ad0738fdc7ebca33@canb.auug.org.au>
On Fri, Jun 29, 2012 at 03:57:24PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/comedi/drivers/s626.h between commit 6ac7d11527a3
> ("treewide: Put a space between #include and FILE") from the trivial tree
> and commit 90fd56af25b7 ("staging: comedi: s626: remove private INLINE
> macro") from the staging tree.
>
> Just context changes. I fixed it up and can carry the fix as necessary.
Sounds fine with me, thanks.
greg k-h
next prev parent reply other threads:[~2012-06-29 15:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-29 5:57 linux-next: manual merge of the staging tree with the trivial tree Stephen Rothwell
2012-06-29 15:55 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-07-16 12:56 Stephen Rothwell
2011-07-17 9:16 ` Greg KH
2011-07-16 12:53 Stephen Rothwell
2011-07-17 9:16 ` Greg KH
2011-07-20 10:01 ` Jiri Kosina
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=20120629155559.GA21039@kroah.com \
--to=greg@kroah.com \
--cc=hartleys@visionengravers.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pebolle@tiscali.nl \
--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.