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,
Jiri Pirko <jpirko@redhat.com>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, John Sheehan <john.d.sheehan@gmail.com>
Subject: Re: linux-next: manual merge of the staging-next tree with the net tree
Date: Tue, 27 Apr 2010 08:13:35 -0700 [thread overview]
Message-ID: <20100427151335.GB7653@kroah.com> (raw)
In-Reply-To: <20100427142655.49673ff1.sfr@canb.auug.org.au>
On Tue, Apr 27, 2010 at 02:26:55PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/arlan/arlan-main.c between commit
> 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 ("net: convert multicast list to
> list_head") from the net tree and commit
> 8db2022b08e232bb237b2162f03ff5f6e7c0c35e ("staging: arlan: fix errors
> reported by checkpatch.pl tool") from the staging-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
That looks fine, thanks.
greg k-h
next prev parent reply other threads:[~2010-04-27 15:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-27 4:26 linux-next: manual merge of the staging-next tree with the net tree Stephen Rothwell
2010-04-27 15:13 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-06 4:05 Stephen Rothwell
2010-05-06 4:20 ` Greg KH
2010-05-06 4:21 ` Stephen Rothwell
2010-05-06 6:21 ` Greg KH
2010-07-23 5:03 Stephen Rothwell
2010-07-23 7:09 ` Sven Eckelmann
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=20100427151335.GB7653@kroah.com \
--to=greg@kroah.com \
--cc=davem@davemloft.net \
--cc=john.d.sheehan@gmail.com \
--cc=jpirko@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@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