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,
Vitaliy Ivanov <vitalivanov@gmail•com>,
Jiri Kosina <jkosina@suse•cz>,
Roland Vossen <rvossen@broadcom•com>,
Arend van Spriel <arend@broadcom•com>,
Franky Lin <frankyl@broadcom•com>
Subject: Re: linux-next: manual merge of the staging tree with the net and trivial trees
Date: Thu, 7 Jul 2011 06:43:04 -0700 [thread overview]
Message-ID: <20110707134304.GB26939@kroah.com> (raw)
In-Reply-To: <20110707153840.c70fde0f5881bbe0c82eb6dc@canb.auug.org.au>
On Thu, Jul 07, 2011 at 03:38:40PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/bcm/headers.h
> drivers/staging/brcm80211/brcmfmac/dhd_linux.c
> drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
> drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h between commits
> 219eb47e6f35 ("net/staging: add needed interrupt.h and hardirq.h
> includes") from the net tree and e44ba033c565 ("treewide: remove
> duplicate includes") from the trivial tree and various commits from the
> staging tree.
>
> I fixed thme up (see below) and can carry the fixes as necessary.
Looks correct, thanks.
greg k-h
prev parent reply other threads:[~2011-07-07 13:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-07 5:38 linux-next: manual merge of the staging tree with the net and trivial trees Stephen Rothwell
2011-07-07 13:43 ` 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=20110707134304.GB26939@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=arend@broadcom$(echo .)com \
--cc=frankyl@broadcom$(echo .)com \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rvossen@broadcom$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=vitalivanov@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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