* linux-next: manual merge of the ptrace tree with the sparc tree
From: Stephen Rothwell @ 2011-10-14 4:47 UTC (permalink / raw)
To: Tejun Heo, Oleg Nesterov
Cc: linux-next, linux-kernel, Matt Fleming, David Miller
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
Hi all,
Today's linux-next merge of the ptrace tree got conflicts in
arch/sparc/kernel/signal32.c, arch/sparc/kernel/signal_32.c and
arch/sparc/kernel/signal_64.c between commit faddf598f0ba ("sparc: Use
set_current_blocked()") from the sparc tree and commit 383fe35697e4
("sparc: Use set_current_blocked() and block_sigmask()") from the ptrace
tree.
I used ther version from the ptrace tree as these seem to go further (and
have a later Auther Date).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the trivial tree with the mips tree
From: Stephen Rothwell @ 2011-10-14 3:31 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Paul Bolle, Manuel Lauss, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 1029 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/ide/Kconfig between commit a60891de4357 ("MIPS: Alchemy: remove
all CONFIG_SOC_AU1??? defines") from the mips tree and commit
6af677ea59fb ("Kconfig: remove redundant CONFIG_ prefix on two symbols")
from the trivial tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/ide/Kconfig
index ff7c6bb,76b6d98..0000000
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@@ -681,8 -681,8 +681,8 @@@ config BLK_DEV_IDE_AU1XX
select IDE_XFER_MODE
choice
prompt "IDE Mode for AMD Alchemy Au1200"
- default CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA
+ default BLK_DEV_IDE_AU1XXX_PIO_DBDMA
- depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX
+ depends on BLK_DEV_IDE_AU1XXX
config BLK_DEV_IDE_AU1XXX_PIO_DBDMA
bool "PIO+DbDMA IDE for AMD Alchemy Au1200"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Mike Frysinger @ 2011-10-14 3:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111013174358.b20fedb97c7b53db2ba82ff6@canb.auug.org.au>
On Thu, Oct 13, 2011 at 02:43, Stephen Rothwell wrote:
> blackfin
i was waiting for hpa to get back to me so i could get my repo enabled
again on git.kernel.org ... but maybe that'll take until/post LKS ?
-mike
^ permalink raw reply
* Re: linux-next: problem fetching the moduleh tree
From: Paul Gortmaker @ 2011-10-14 3:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20111014095826.cf6c8f622e411dff5d04d187@canb.auug.org.au>
[linux-next: problem fetching the moduleh tree] On 14/10/2011 (Fri 09:58) Stephen Rothwell wrote:
> Hi Paul,
>
> when trying to fetch the moduleh tree
> (git://openlinux.windriver.com/people/paulg/linux-next#for-sfr) today, I
> get a connection to the server, but it just hangs after that. I will use
> what I have from yesterday.
I'm seeing the same thing -- I've put in a service request and will get
folks to get it fixed up. Sorry about that.
Yesterday's will be fine -- it was just going to be the integration of
the conflict (deleted files) cleanups based on what you'd reported for
the Oct13 tree.
Paul.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Phillip Lougher @ 2011-10-14 1:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111013174358.b20fedb97c7b53db2ba82ff6@canb.auug.org.au>
> squashfs
git://gitorious.org/squashfs-linux-next/squashfs-linux-next.git master
I don't have anything queued up at the moment, though...
Thanks
Phillip
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Stephen Rothwell @ 2011-10-14 0:33 UTC (permalink / raw)
To: Randy Dunlap; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <4E97807C.1060209@xenotime.net>
[-- Attachment #1: Type: text/plain, Size: 290 bytes --]
Hi Randy,
On Thu, 13 Oct 2011 17:21:16 -0700 Randy Dunlap <rdunlap@xenotime.net> wrote:
>
> > docs
>
> I think that I have this restored now. We'll see....
Looks good.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Randy Dunlap @ 2011-10-14 0:21 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111013174358.b20fedb97c7b53db2ba82ff6@canb.auug.org.au>
On 10/12/2011 11:43 PM, Stephen Rothwell wrote:
> Hi all,
>
> docs
I think that I have this restored now. We'll see....
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* linux-next: import of rr series failed
From: Stephen Rothwell @ 2011-10-13 23:36 UTC (permalink / raw)
To: Rusty Russell; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
Hi Rusty,
Importing the rr series today I got this error:
$ git am ../quilt/rr/virtio:dont_add_config_to_list_for_per_vq_vector.patch
Patch format detection failed.
I added a From line to the top using the address from the first SOB line.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Stephen Rothwell @ 2011-10-13 23:00 UTC (permalink / raw)
To: Bob Copeland; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <CAEKwDSDdLvNHYugPLGTj49kWPN0JnxECkjDFaam6ZA8agExCiQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 453 bytes --]
Hi Bob,
On Thu, 13 Oct 2011 11:15:38 -0400 Bob Copeland <me@bobcopeland.com> wrote:
>
> > omfs
>
> git://github.com/bcopeland/omfs.git for-next
>
> Though I don't have anything queued for 3.2 (should have some updates
> for 3.3 though).
OK, I have switched to that. Let me know if I need to switch back to
kernel.org some time.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: problem fetching the moduleh tree
From: Stephen Rothwell @ 2011-10-13 22:58 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, LKML
[-- Attachment #1: Type: text/plain, Size: 338 bytes --]
Hi Paul,
when trying to fetch the moduleh tree
(git://openlinux.windriver.com/people/paulg/linux-next#for-sfr) today, I
get a connection to the server, but it just hangs after that. I will use
what I have from yesterday.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH -next] infiniband: fix printk format in hw/nes_cm.c
From: Randy Dunlap @ 2011-10-13 22:08 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, Andrew Morton, Faisal Latif, Linux RDMA,
Roland Dreier, Sean Hefty, Hal Rosenstock
In-Reply-To: <20111013181606.a204565fad9caaa0fe680b75@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime.net>
Fix printk format warning seen on x86_64:
drivers/infiniband/hw/nes/nes_cm.c:3190:2: warning: format '%zu' expects type 'size_t', but argument 11 has type 'int'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Faisal Latif <faisal.latif@intel.com>
---
drivers/infiniband/hw/nes/nes_cm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- next-2011-1013.orig/drivers/infiniband/hw/nes/nes_cm.c
+++ next-2011-1013/drivers/infiniband/hw/nes/nes_cm.c
@@ -3189,7 +3189,7 @@ int nes_accept(struct iw_cm_id *cm_id, s
nes_debug(NES_DBG_CM, "QP%u, Destination IP = 0x%08X:0x%04X, local = "
"0x%08X:0x%04X, rcv_nxt=0x%08X, snd_nxt=0x%08X, mpa + "
- "private data length=%zu.\n", nesqp->hwqp.qp_id,
+ "private data length=%u.\n", nesqp->hwqp.qp_id,
ntohl(cm_id->remote_addr.sin_addr.s_addr),
ntohs(cm_id->remote_addr.sin_port),
ntohl(cm_id->local_addr.sin_addr.s_addr),
^ permalink raw reply
* Re: [alsa-devel] linux-next: Tree for Oct 12 (sound/soc/codecs/wm1250-ev1)
From: Mark Brown @ 2011-10-13 21:58 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, alsa-devel, linux-next, LKML, Liam Girdwood
In-Reply-To: <4E972DE1.9020308@xenotime.net>
On Thu, Oct 13, 2011 at 11:28:49AM -0700, Randy Dunlap wrote:
> You are listed as MODULE_AUTHOR(). Can we expect a fix?
I dunno; like I say I don't see an issue in the driver here (the driver
usage of the GPIOs is optional), the GPIO build options are pretty
fiddly and I just wrote the mail below.
> I don't see how stubs help with source lines like:
> struct wm1250_priv {
> struct gpio gpios[WM1250_EV1_NUM_GPIOS];
> };
So, clearly there's an issue with the API not stubbing itself out
terribly well here; the obvious solution would appear to be to have a
definition of the struct to go along with the stubs. I guess you see
some sort of problem with this, though? It does work well enough for
other similar APIs like regulator_bulk_*() so I'd expect it to work here.
To be honest though I'm more concerned that this is being reported as an
issue in a specific driver than I am about the actual issue (which one
does have to try pretty hard to see, I'd be astonished if someone saw it
outside of deliberate testing). As a result of the number of randconfig
type tests you do I'd guess you're aware of the APIs like GPIO which are
expected to stub themselves out when disabled. As with the usage in
this driver there's a huge proportion of users which can optionally use
the API but don't actually need it and which therefore shouldn't have
build time dependencies, and clearly scattering ifdefs throughout the
code isn't great either. These things do fix the *configs but they
reduce the coverage we get with our automated testing and they make the
code harder to work with.
The main reason I'm pushing back in this way is that as we start to get
more and more embedded hardware in subsystems maintained by people from
a PC background it becomes more and more important that people like you
who do this who do a lot of this kernel wide testing are directing these
issues appropriately by checking to see if what's going wrong is a
result of the driver or if it's a result of one of the service APIs like
GPIO or regulator (and hopefully soon clk) not being transparent enough.
Subsystem maintainers who usually work on PCs likely won't be aware of
what's going on with this sort of stuff except in so far as they get
reports of *config issues since PCs don't generally have to deal with
the haphazard board dependant setup that is so common in the embedded
space and random driver authors aren't going to be reliably familiar
with either that or build coverage type things either as the
configurations that break are generally not too realistic anyway.
I don't mean to get at you personally here - while you do do a lot of
good work here you're not the only person who does this sort of testing
and hence reports issues in this manner, and obviously there's a lot of
maintainers too. I think it's mostly an education thing but I'm not
sure what the best way to go about spreading the word is, if nothing
else I don't know how to reach all the build coverage people (who I
think are key here).
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Konrad Rzeszutek Wilk @ 2011-10-13 18:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111013174358.b20fedb97c7b53db2ba82ff6@canb.auug.org.au>
> swiotlb
> ibft
I don't have anything yet there for 3.2, but was going to resurrect those
trees once my GPG key got enough signatures to send it to hpa for kernel.org
access.
^ permalink raw reply
* Re: [alsa-devel] linux-next: Tree for Oct 12 (sound/soc/codecs/wm1250-ev1)
From: Randy Dunlap @ 2011-10-13 18:28 UTC (permalink / raw)
To: Mark Brown; +Cc: Stephen Rothwell, alsa-devel, linux-next, LKML, Liam Girdwood
In-Reply-To: <20111013102427.GG1098@sirena.org.uk>
On 10/13/2011 03:24 AM, Mark Brown wrote:
> On Wed, Oct 12, 2011 at 05:46:01PM -0700, Randy Dunlap wrote:
>
>> When no GPIO kconfig options are enabled:
>> (not GPIOLIB, not GENERIC_GPIO):
>
> As ever the consumer side GPIO API is supposed to stub itself out when
> not in use.
You are listed as MODULE_AUTHOR(). Can we expect a fix?
I don't see how stubs help with source lines like:
struct wm1250_priv {
struct gpio gpios[WM1250_EV1_NUM_GPIOS];
};
--
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: build failure after merge of the gpio tree
From: Grant Likely @ 2011-10-13 17:31 UTC (permalink / raw)
To: Tomoya MORINAGA
Cc: Nobuhiro Iwamatsu, Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <4E969FAE.5000909@dsn.lapis-semi.com>
On Thu, Oct 13, 2011 at 05:22:06PM +0900, Tomoya MORINAGA wrote:
> (2011/10/13 12:57), Grant Likely wrote:
> >I've temporarily pushed out a commit that makes the pch and ml_ioh
> >bool instead of tristate. If that other patch gets acked by Thomas,
> >then I should probably take it through the gpio tree.
> Let me clarify your intention.
> Does previous patch for generic-chip posted by Nobuhiro enable
> pch/ml_ioh gpio driver works on both module and built-in ?
> If yes, why do you need to change tristate to bool ?
Thomas requested changes to that patch. I cannot pick it up until I
see the new patch and get an ack from Thomas.
g.
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Bob Copeland @ 2011-10-13 15:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111013174358.b20fedb97c7b53db2ba82ff6@canb.auug.org.au>
On Thu, Oct 13, 2011 at 2:43 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> With the mrege window approaching (sometime) I thought I would see how
> many of the 200 odd trees that are included in linux-next are actually
> currently inaccessible.
> omfs
git://github.com/bcopeland/omfs.git for-next
Though I don't have anything queued for 3.2 (should have some updates
for 3.3 though).
--
Bob Copeland %% www.bobcopeland.com
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the fbdev tree
From: Greg KH @ 2011-10-13 15:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Laurent Pinchart,
Florian Tobias Schandinat, linux-fbdev, Aaro Koskinen
In-Reply-To: <20111013170225.254bc2d590deee544913ab6c@canb.auug.org.au>
On Thu, Oct 13, 2011 at 05:02:25PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/xgifb/XGI_main_26.c between commit 0d5c6ca30bb0
> ("staging: xgifb: use display information in info not in var for
> panning") from the fbdev tree and commit fd26d42019cb ("staging: xgifb:
> avoid direct references xgi_video_info") from the staging tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
The fix looks correct to me, thanks.
greg k-h
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Stephen Rothwell @ 2011-10-13 13:54 UTC (permalink / raw)
To: Dave Airlie; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <CAPM=9tyWaL=ySxs=Zgfdde8Um4JbsB2Nem8Rsfaq7voLBv+Pqg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 430 bytes --]
Hi Dave,
On Thu, 13 Oct 2011 14:53:27 +0100 Dave Airlie <airlied@gmail.com> wrote:
>
> > OK, I will switch to that. What should I do about the agp tree. It just
> > has three commits that are also in Linus' tree (as different commits).
>
> drop it, I've pretty much pushed agp via drm tree now.
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Dave Airlie @ 2011-10-13 13:53 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111014003341.36bd655d41bf31804d720174@canb.auug.org.au>
On Thu, Oct 13, 2011 at 2:33 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dave,
>
> On Thu, 13 Oct 2011 13:36:01 +0100 Dave Airlie <airlied@gmail.com> wrote:
>>
>> > drm
>> > agp
>>
>> git://people.freedesktop.org/~airlied/linux.git drm-next
>
> OK, I will switch to that. What should I do about the agp tree. It just
> has three commits that are also in Linus' tree (as different commits).
>
drop it, I've pretty much pushed agp via drm tree now.
Dave.
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Stephen Rothwell @ 2011-10-13 13:33 UTC (permalink / raw)
To: Dave Airlie; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <CAPM=9tyuHeKgrh6iyJVUKF3rdy8-izwSJuJRBwCOSsz4DDsccQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 430 bytes --]
Hi Dave,
On Thu, 13 Oct 2011 13:36:01 +0100 Dave Airlie <airlied@gmail.com> wrote:
>
> > drm
> > agp
>
> git://people.freedesktop.org/~airlied/linux.git drm-next
OK, I will switch to that. What should I do about the agp tree. It just
has three commits that are also in Linus' tree (as different commits).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Dave Airlie @ 2011-10-13 12:36 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111013174358.b20fedb97c7b53db2ba82ff6@canb.auug.org.au>
> drm
> agp
git://people.freedesktop.org/~airlied/linux.git drm-next
Dave.
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Josh Boyer @ 2011-10-13 11:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111013174358.b20fedb97c7b53db2ba82ff6@canb.auug.org.au>
On Thu, Oct 13, 2011 at 2:43 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Some of these may be no longer useful (please tell me). Some may have no
> commits for v3.2. But I bet that at leaset some do.
> 4xx
I don't have anything queued for 3.2 that isn't already in Ben's tree.
I'll likely have to move the 4xx tree elsewhere for the 3.3 merge
window, given that getting my key signed is going to take longer.
I'll let you know when I've moved it. Thanks for the reminder.
josh
^ permalink raw reply
* Re: [alsa-devel] linux-next: Tree for Oct 12 (sound/soc/codecs/wm1250-ev1)
From: Mark Brown @ 2011-10-13 10:24 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, alsa-devel, linux-next, LKML, Liam Girdwood
In-Reply-To: <4E9634C9.3020404@xenotime.net>
On Wed, Oct 12, 2011 at 05:46:01PM -0700, Randy Dunlap wrote:
> When no GPIO kconfig options are enabled:
> (not GPIOLIB, not GENERIC_GPIO):
As ever the consumer side GPIO API is supposed to stub itself out when
not in use.
^ permalink raw reply
* Re: linux-next: Tree for Oct 13
From: Sedat Dilek @ 2011-10-13 9:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20111013181606.a204565fad9caaa0fe680b75@canb.auug.org.au>
On Thu, Oct 13, 2011 at 9:16 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> The linux-next tree is still available from
> git://github.com/sfrothwell/linux-next.git as a temporary measure while
> the kernel.org servers are unavailable.
>
> It may also turn up on git.kernel.org (depending on the mirroring). The
> patch is still absent, however.
>
> Tomorrow will be the last linux-next release before (probably) November
> 1st (and therefore presumably the merge window for v3.2).
>
> Changes since 20111012:
>
[...]
> ----------------------------------------------------------------------------
>
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> (patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ).
Just FYI...
http://www.kernel.org/pub/linux/kernel/v2.6/next/
Not Found
The requested URL /pub/linux/kernel/v2.6/next/ was not found on this server.
- Sedat -
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the net tree
From: Arend van Spriel @ 2011-10-13 9:08 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Miller, netdev@vger.kernel.org, Jiri Pirko, Eliad Peller,
John W. Linville
In-Reply-To: <20111013164353.09c495e1b63d23e380cca1f7@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 537 bytes --]
On 10/13/2011 07:43 AM, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflicts in
> drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
> drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commits from the
> net-next tree and commit fc2d6e573be6 ("staging: brcm80211: remove
> brcm80211 driver from the staging tree") from the staging tree.
>
> The latter removed the files, so I did that
Great. The move to drivers/net/wireless has completed. Thanks for this.
Gr. AvS
[-- Attachment #1.2: 0xB5E1A116.asc --]
[-- Type: application/pgp-keys, Size: 3165 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 900 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox