From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the moduleh tree
Date: Wed, 5 Oct 2011 00:00:06 -0400 [thread overview]
Message-ID: <20111005040005.GB14123@windriver.com> (raw)
In-Reply-To: <20111004175703.0e319ee270c9dcd1ff253164@canb.auug.org.au>
[linux-next: manual merge of the moduleh tree] On 04/10/2011 (Tue 17:57) Stephen Rothwell wrote:
> Hi Paul,
>
> I also dropped the following already applied patches:
>
> wireless-ath6kl-use-of-module_param-requires-the-inc.patch
> staging-add-module.h-to-various-iio-drivers.patch
I've dropped these, plus the usb dwc3 patch which I see Greg picked
up. I've also added the five new fixups for the staging and ath6l that
you posted from the previous tree -- only two of them need to be in the
post-merge queue long term (the export.h ones).
Series delta is below.
Thanks,
Paul.
---
diff --git a/series b/series
index eccd196..d99df0f 100644
--- a/series
+++ b/series
@@ -1,7 +1,6 @@
drivers-md-change-module.h-export.h-in-persistent-da.patch
block-bsg-lib.c-change-module.h-export.h-in-power-co.patch
drivers-base-change-module.h-export.h-in-power-commo.patch
-wireless-ath6kl-use-of-module_param-requires-the-inc.patch
rtlwifi-use-of-module_param-requires-the-inclusion-o.patch
mmc-using-module_param-requires-the-inclusion-of-mod.patch
NFC-use-of-module-facilities-requires-the-inclusion-.patch
@@ -14,7 +13,10 @@ drivers-net-Add-module.h-to-wireless-ath-ath6kl-sdio.patch
drivers-net-wireless-ath-ath5k-debug.c-does-not-need.patch
drivers-bcma-driver_chipcommon_pmu.c-needs-export.h-.patch
drivers-base-Add-export.h-to-regmap-regcache.c.patch
-drivers-usb-Add-module.h-to-various-dwc3-drivers.patch
-staging-add-module.h-to-various-iio-drivers.patch
staging-Add-export.h-to-rts5139-rts51x_scsi.c.patch
pinctrl-EXPORT_SYMBOL-needs-export.h.patch
+staging-Add-export.h-for-EXPORT_SYMBOL-to-drivers-st.patch
+ath6kl-THIS_MODULES-needs-export.h.patch
+ath6kl-module_param-needs-the-inclusion-of-modulepar.patch
+staging-iio-adc-add-includes-of-module.h-and-stat.h.patch
+staging-r8712u-include-module.h-where-needed.patch
next prev parent reply other threads:[~2011-10-05 4:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-04 6:57 linux-next: manual merge of the moduleh tree Stephen Rothwell
2011-10-05 4:00 ` Paul Gortmaker [this message]
2011-10-05 7:20 ` 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=20111005040005.GB14123@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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