linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Arend van Spriel <arend@broadcom.com>, Greg KH <greg@kroah.com>
Subject: linux-next: manual merge of the moduleh tree with the staging tree
Date: Thu, 13 Oct 2011 17:20:05 +1100	[thread overview]
Message-ID: <20111013172005.3fddf0e3ef5f5b5c5736b04a@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 584 bytes --]

Hi Paul,

Today's linux-next merge of the moduleh tree got conflicts in
drivers/staging/brcm80211/brcmfmac/bcmsdh.c,
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c,
drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c between commit fc2d6e573be6
("staging: brcm80211: remove brcm80211 driver from the staging tree")
from the staging tree and commits from the moduleh tree.

The former removed the files, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2011-10-13  6:20 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-13  6:20 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-10-06  5:31 linux-next: manual merge of the moduleh tree with the staging tree Stephen Rothwell
2011-09-29  5:55 Stephen Rothwell
2011-09-29 15:15 ` Paul Gortmaker
2011-09-28  6:44 Stephen Rothwell
2011-09-28  6:48 ` Stephen Rothwell
2011-09-28 14:56   ` Paul Gortmaker
2011-09-28  6:40 Stephen Rothwell
2011-08-24  5:00 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=20111013172005.3fddf0e3ef5f5b5c5736b04a@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arend@broadcom.com \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=paul.gortmaker@windriver.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).