From: Greg KH <greg@kroah.com>
To: Vitaliy Ivanov <vitalivanov@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiri Kosina <jkosina@suse.cz>, David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: Re: linux-next: manual merge of the staging tree with the trivial and net trees
Date: Tue, 21 Jun 2011 17:10:09 -0700 [thread overview]
Message-ID: <20110622001009.GA9627@kroah.com> (raw)
In-Reply-To: <BANLkTimmy0GJMgho4YK62gru6QXGox6Eqg@mail.gmail.com>
On Wed, Jun 22, 2011 at 01:40:48AM +0300, Vitaliy Ivanov wrote:
> Stephen,
>
> On Tue, Jun 21, 2011 at 8:10 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/staging/brcm80211/brcmfmac/wl_iw.c between commit e44ba033c565
> > ("treewide: remove duplicate includes") from the trivial tree, commit
> > 219eb47e6f35 ("net/staging: add needed interrupt.h and hardirq.h
> > includes") from the net tree and various commits from the staging tree.
> >
> > I fixed them up (see below) and can carry the fix as necessary.
>
> This one and all the others look good to me.
Me too, thanks for doing this.
greg k-h
prev parent reply other threads:[~2011-06-22 0:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-21 5:10 linux-next: manual merge of the staging tree with the trivial and net trees Stephen Rothwell
2011-06-21 5:10 ` Stephen Rothwell
2011-06-21 22:40 ` Vitaliy Ivanov
2011-06-22 0:10 ` Greg KH [this message]
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=20110622001009.GA9627@kroah.com \
--to=greg@kroah.com \
--cc=davem@davemloft.net \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vitalivanov@gmail.com \
/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.