* Re: [PATCH Resend2] Remove 'SBC8240 Wind River' Device Driver Code
From: Subrata Modak @ 2009-07-10 8:58 UTC (permalink / raw)
To: David Woodhouse
Cc: dedekind, Artem Bityutskiy, linux-mtd, carolyn.j.smith,
Stephen Rothwell, Jim Cromie, linux-kernel, Linuxppc-dev,
Sachin P Sant, linux-next, Scott Wood, Balbir Singh
In-Reply-To: <1247216007.29541.2.camel@macbook.infradead.org>
On Fri, 2009-07-10 at 09:53 +0100, David Woodhouse wrote:
> On Fri, 2009-07-10 at 14:17 +0530, Subrata Modak wrote:
> > Is it possible to get this patch through and before 2.6.31 stable is
> > released ?
>
Hi David,
> Hm, I was ignoring this until I was sure all the last-minute fixes for
> 2.6.31 were out of the way; I was planning to submit it for 2.6.32.
>
> Do we really need to submit it for 2.6.31? It's not a regression, is it?
> It's been like this for _ages_.
True. But it gives annoying build fails on randconfig next trees. And
we(Sachin & myself) has been reporting it from March/April. If you feel
there is still room to be pushed to 2.6.31, then please do it. Else,
2.6.32 will be fine. Thanks for your support.
Regards--
Subrata
>
^ permalink raw reply
* Re: [PATCH Resend2] Remove 'SBC8240 Wind River' Device Driver Code
From: David Woodhouse @ 2009-07-10 8:53 UTC (permalink / raw)
To: subrata
Cc: dedekind, Artem Bityutskiy, linux-mtd, carolyn.j.smith,
Stephen Rothwell, Jim Cromie, linux-kernel, Linuxppc-dev,
Sachin P Sant, linux-next, Scott Wood, Balbir Singh
In-Reply-To: <1247215625.6630.6.camel@subratamodak.linux.ibm.com>
On Fri, 2009-07-10 at 14:17 +0530, Subrata Modak wrote:
> Is it possible to get this patch through and before 2.6.31 stable is
> released ?
Hm, I was ignoring this until I was sure all the last-minute fixes for
2.6.31 were out of the way; I was planning to submit it for 2.6.32.
Do we really need to submit it for 2.6.31? It's not a regression, is it?
It's been like this for _ages_.
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply
* Re: [PATCH Resend2] Remove 'SBC8240 Wind River' Device Driver Code
From: Subrata Modak @ 2009-07-10 8:47 UTC (permalink / raw)
To: dedekind, dwmw2
Cc: Artem Bityutskiy, linux-mtd, carolyn.j.smith, Stephen Rothwell,
Jim Cromie, linux-kernel, Linuxppc-dev, Sachin P Sant, linux-next,
Scott Wood, Balbir Singh
In-Reply-To: <1247210095.20721.362.camel@localhost.localdomain>
On Fri, 2009-07-10 at 10:14 +0300, Artem Bityutskiy wrote:
> On Fri, 2009-07-10 at 12:42 +0530, Subrata Modak wrote:
> > On Fri, 2009-07-10 at 09:18 +0300, Artem Bityutskiy wrote:
> > > Subrata Modak wrote:
> > > > On Fri, 2009-07-10 at 08:59 +0300, Artem Bityutskiy wrote:
> > > >> On Mon, 2009-07-06 at 07:47 +0530, Subrata Modak wrote:
> > > >>> Hi,
> > > >>>
> > > >>> Is there somebody else whom i should also address to get an attention
> > > >>> for this patch ? I apolozise if i have not included someone. Kindly
> > > >>> connect to the concerned.
> > > >> I'm putting your patch to l2-mtd-2.6.git.
> > > >
> > > > Thanks very much. Would i receive some automatic confirmation once it
> > > > make to Linus tree ?
> > >
> > > I do not think so. I'm not MTD maintainer and in l2-mtd-2.6.git
> > > I just collect random patches, which the maintainer then usually
> > > takes from my tree.
> >
> > Thanks. I just want this through before 2.6.31 stable is released, so
> > that the build fails does not occur on next trees based on that stable
> > one.
>
> Then you should bug dwmw2.
Hmmm. I see.
Hi dwmw2,
Is it possible to get this patch through and before 2.6.31 stable is
released ?
Regards--
Subrata
>
^ permalink raw reply
* Re: [PATCH Resend2] Remove 'SBC8240 Wind River' Device Driver Code
From: Artem Bityutskiy @ 2009-07-10 7:14 UTC (permalink / raw)
To: subrata
Cc: Artem Bityutskiy, linux-mtd, carolyn.j.smith, Stephen Rothwell,
Jim Cromie, linux-kernel, Linuxppc-dev, Sachin P Sant, linux-next,
Scott Wood, dwmw2, Balbir Singh
In-Reply-To: <1247209961.6630.3.camel@subratamodak.linux.ibm.com>
On Fri, 2009-07-10 at 12:42 +0530, Subrata Modak wrote:
> On Fri, 2009-07-10 at 09:18 +0300, Artem Bityutskiy wrote:
> > Subrata Modak wrote:
> > > On Fri, 2009-07-10 at 08:59 +0300, Artem Bityutskiy wrote:
> > >> On Mon, 2009-07-06 at 07:47 +0530, Subrata Modak wrote:
> > >>> Hi,
> > >>>
> > >>> Is there somebody else whom i should also address to get an attention
> > >>> for this patch ? I apolozise if i have not included someone. Kindly
> > >>> connect to the concerned.
> > >> I'm putting your patch to l2-mtd-2.6.git.
> > >
> > > Thanks very much. Would i receive some automatic confirmation once it
> > > make to Linus tree ?
> >
> > I do not think so. I'm not MTD maintainer and in l2-mtd-2.6.git
> > I just collect random patches, which the maintainer then usually
> > takes from my tree.
>
> Thanks. I just want this through before 2.6.31 stable is released, so
> that the build fails does not occur on next trees based on that stable
> one.
Then you should bug dwmw2.
--
Best regards,
Artem Bityutskiy (Битюцкий Артём)
^ permalink raw reply
* Re: [PATCH Resend2] Remove 'SBC8240 Wind River' Device Driver Code
From: Subrata Modak @ 2009-07-10 7:12 UTC (permalink / raw)
To: Artem Bityutskiy
Cc: dedekind, linux-mtd, carolyn.j.smith, Stephen Rothwell,
Jim Cromie, linux-kernel, Linuxppc-dev, Sachin P Sant, linux-next,
Scott Wood, dwmw2, Balbir Singh
In-Reply-To: <4A56DD51.5040703@gmail.com>
On Fri, 2009-07-10 at 09:18 +0300, Artem Bityutskiy wrote:
> Subrata Modak wrote:
> > On Fri, 2009-07-10 at 08:59 +0300, Artem Bityutskiy wrote:
> >> On Mon, 2009-07-06 at 07:47 +0530, Subrata Modak wrote:
> >>> Hi,
> >>>
> >>> Is there somebody else whom i should also address to get an attention
> >>> for this patch ? I apolozise if i have not included someone. Kindly
> >>> connect to the concerned.
> >> I'm putting your patch to l2-mtd-2.6.git.
> >
> > Thanks very much. Would i receive some automatic confirmation once it
> > make to Linus tree ?
>
> I do not think so. I'm not MTD maintainer and in l2-mtd-2.6.git
> I just collect random patches, which the maintainer then usually
> takes from my tree.
Thanks. I just want this through before 2.6.31 stable is released, so
that the build fails does not occur on next trees based on that stable
one.
Regards--
Subrata
>
^ permalink raw reply
* Re: OOM with hackbench against next 0708
From: Sachin Sant @ 2009-07-10 7:04 UTC (permalink / raw)
To: Dave Hansen; +Cc: Stephen Rothwell, linux-next, LKML
In-Reply-To: <1247066549.14309.1029.camel@nimitz>
Dave Hansen wrote:
> This doesn't look like a kernel bug at all to me. You're out of memory,
> out of swap, and the thing that got killed was the thing allocating
> memory. You're also down to 65MB of pagecache, which is awfully low for
> a 6GB machine. That tells me it's also been effective in reclaiming
> disk cache.
>
> There are a couple of possibilities:
> 1. hackbench is broken, allocating too much memory and ooming, or it
> has been misconfigured by a user
> 2. hackbench broke because something the kernel is telling it is wrong
> 3. The kernel is leaking (or just plain using) some memory more than a
> few releases ago, and that caused the oom.
>
> I'd go back and carefully examine how hackbench is being run and that it
> is consistent. You should also double-check your finding that the
> several-day-old -next isn't seeing this issue.
>
Thanks Dave for the pointers.
I am able to consistently recreate this issue with next 0708. hackbench
creates 3600 tasks in my case. After starting the tests machine becomes
unresponsive and i finally have to reboot it.
The test ran successfully on next03, but unfortunately i did
not save the config file for that run. If i use the config file from
0708 and compile a 0703, the machine becomes unresponsive because
of OOM's. I can't explain why the test ran successfully against
0703 :-( in previous attempt.
Only data point i have at this time is the same tests runs successfully
against 2.6.31-rc2. But may be that's not even an argument :-)
Thanks
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
^ permalink raw reply
* Re: [PATCH Resend2] Remove 'SBC8240 Wind River' Device Driver Code
From: Artem Bityutskiy @ 2009-07-10 6:18 UTC (permalink / raw)
To: subrata
Cc: dedekind, linux-mtd, carolyn.j.smith, Stephen Rothwell,
Jim Cromie, linux-kernel, Linuxppc-dev, Sachin P Sant, linux-next,
Scott Wood, dwmw2, Balbir Singh
In-Reply-To: <1247206539.6630.0.camel@subratamodak.linux.ibm.com>
Subrata Modak wrote:
> On Fri, 2009-07-10 at 08:59 +0300, Artem Bityutskiy wrote:
>> On Mon, 2009-07-06 at 07:47 +0530, Subrata Modak wrote:
>>> Hi,
>>>
>>> Is there somebody else whom i should also address to get an attention
>>> for this patch ? I apolozise if i have not included someone. Kindly
>>> connect to the concerned.
>> I'm putting your patch to l2-mtd-2.6.git.
>
> Thanks very much. Would i receive some automatic confirmation once it
> make to Linus tree ?
I do not think so. I'm not MTD maintainer and in l2-mtd-2.6.git
I just collect random patches, which the maintainer then usually
takes from my tree.
--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)
^ permalink raw reply
* Re: [PATCH Resend2] Remove 'SBC8240 Wind River' Device Driver Code
From: Subrata Modak @ 2009-07-10 6:15 UTC (permalink / raw)
To: dedekind
Cc: linux-mtd, carolyn.j.smith, Stephen Rothwell, Jim Cromie,
linux-kernel, Linuxppc-dev, Sachin P Sant, linux-next, Scott Wood,
dwmw2, Balbir Singh
In-Reply-To: <1247205588.20721.353.camel@localhost.localdomain>
On Fri, 2009-07-10 at 08:59 +0300, Artem Bityutskiy wrote:
> On Mon, 2009-07-06 at 07:47 +0530, Subrata Modak wrote:
> > Hi,
> >
> > Is there somebody else whom i should also address to get an attention
> > for this patch ? I apolozise if i have not included someone. Kindly
> > connect to the concerned.
>
> I'm putting your patch to l2-mtd-2.6.git.
Thanks very much. Would i receive some automatic confirmation once it
make to Linus tree ?
Regards--
Subrata
>
^ permalink raw reply
* Re: [PATCH Resend2] Remove 'SBC8240 Wind River' Device Driver Code
From: Artem Bityutskiy @ 2009-07-10 5:59 UTC (permalink / raw)
To: subrata
Cc: linux-mtd, carolyn.j.smith, Stephen Rothwell, Jim Cromie,
linux-kernel, Linuxppc-dev, Sachin P Sant, linux-next, Scott Wood,
dwmw2, Balbir Singh
In-Reply-To: <1246846628.5743.2.camel@subratamodak.linux.ibm.com>
On Mon, 2009-07-06 at 07:47 +0530, Subrata Modak wrote:
> Hi,
>
> Is there somebody else whom i should also address to get an attention
> for this patch ? I apolozise if i have not included someone. Kindly
> connect to the concerned.
I'm putting your patch to l2-mtd-2.6.git.
--
Best regards,
Artem Bityutskiy (Битюцкий Артём)
^ permalink raw reply
* linux-next: Tree for July 10
From: Stephen Rothwell @ 2009-07-10 5:18 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7059 bytes --]
Hi all,
Changes since 20090709:
This tree fails to build for powerpc allyesconfig (final link problem).
Linus' tree lost its build failure.
The ttydev tree lost a conflict.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig.
These builds also have CONFIG_ENABLE_WARN_DEPRECATED,
CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 132 trees (counting Linus' and 19 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl-rc6
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging wireless/master
CONFLICT (delete/modify): drivers/net/wireless/p54/p54common.c deleted in wireless/master and modified in HEAD. Version HEAD of drivers/net/wireless/p54/p54common.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/wireless/zd1211rw/zd_usb.c
$ git rm -f drivers/net/wireless/p54/p54common.c
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/mips/kernel/smp-cmp.c
CONFLICT (content): Merge conflict in arch/powerpc/platforms/powermac/setup.c
Applying: rr/pmac: fix for cpumask accessor changes
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c
CONFLICT (content): Merge conflict in include/linux/usb/serial.h
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging edac-amd/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging tip/auto-latest
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: ttydev tree import failure
From: Stephen Rothwell @ 2009-07-10 1:20 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-next, linux-kernel
In-Reply-To: <20090710013411.32a68454@lxorguk.ukuu.org.uk>
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
On Fri, 10 Jul 2009 01:34:11 +0100 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> Fixed - chuckle
>
> the right patch was there but I forgot to remove the original patch which
> for some reason stgit didn't import properly so you had both in the file.
> Will push that tomorrow.
OK, thanks. Aren't tools wonderful sometimes? :-)
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: ttydev tree import failure
From: Alan Cox @ 2009-07-10 0:34 UTC (permalink / raw)
To: Alan Cox; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20090710004743.202b36e5@lxorguk.ukuu.org.uk>
Fixed - chuckle
the right patch was there but I forgot to remove the original patch which
for some reason stgit didn't import properly so you had both in the file.
Will push that tomorrow.
^ permalink raw reply
* Re: linux-next: manual merge of the ttydev tree with the usb.current tree
From: Greg KH @ 2009-07-10 0:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Alan Cox, linux-next, linux-kernel, Jason Wessel
In-Reply-To: <20090710100625.13e75cfd.sfr@canb.auug.org.au>
On Fri, Jul 10, 2009 at 10:06:25AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> On Thu, 9 Jul 2009 16:19:56 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > On Thu, Jul 09, 2009 at 01:04:30PM +1000, Stephen Rothwell wrote:
> > >
> > > Today's linux-next merge of the ttydev tree got conflicts in
> > > drivers/usb/serial/generic.c and include/linux/usb/serial.h between commit
> > > d8298d029cdd5d944c3d8369d2862de94d12ae4b ("USB: serial: regression fix to
> > > move sysrq from hot path") from the usb.current tree and commit
> > > cf8456fe1aaed1776bf4c26c18adef76e472b9fa ("tty-usb-fix-perf-regression")
> > > from the ttydev tree. Also between commit
> > > a2170a444ef9a89a7ec9acc72d79e5db433effc4 ("USB: serial: optimize sysrq
> > > function calls") from the usb.current tree and commit
> > > bfce6b042a47c9cdd55c7cd231e58710ec1fa4e1 ("tty-usb-fix-kref-leak") from
> > > the ttydev tree.
> > >
> > > The first two commits above seem to be trying to do the same thing (or
> > > similar) so I have used the ttydev version for now.
> > >
> > > I fixed them up (see below) and can carry the fixes as necessary.
> >
> > Thanks for the fix, I don't know what happened in the tty tree, I've not
> > touched the USB tree for a week or so now...
>
> In case you missed it, Alan has submitted the above two ttydev patches to
> Linus.
Ah, thanks, I'll handle the merge when they hit Linus's tree.
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the ttydev tree with the usb.current tree
From: Stephen Rothwell @ 2009-07-10 0:06 UTC (permalink / raw)
To: Greg KH; +Cc: Alan Cox, linux-next, linux-kernel, Jason Wessel
In-Reply-To: <20090709231956.GA1033@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]
Hi Greg,
On Thu, 9 Jul 2009 16:19:56 -0700 Greg KH <greg@kroah.com> wrote:
>
> On Thu, Jul 09, 2009 at 01:04:30PM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the ttydev tree got conflicts in
> > drivers/usb/serial/generic.c and include/linux/usb/serial.h between commit
> > d8298d029cdd5d944c3d8369d2862de94d12ae4b ("USB: serial: regression fix to
> > move sysrq from hot path") from the usb.current tree and commit
> > cf8456fe1aaed1776bf4c26c18adef76e472b9fa ("tty-usb-fix-perf-regression")
> > from the ttydev tree. Also between commit
> > a2170a444ef9a89a7ec9acc72d79e5db433effc4 ("USB: serial: optimize sysrq
> > function calls") from the usb.current tree and commit
> > bfce6b042a47c9cdd55c7cd231e58710ec1fa4e1 ("tty-usb-fix-kref-leak") from
> > the ttydev tree.
> >
> > The first two commits above seem to be trying to do the same thing (or
> > similar) so I have used the ttydev version for now.
> >
> > I fixed them up (see below) and can carry the fixes as necessary.
>
> Thanks for the fix, I don't know what happened in the tty tree, I've not
> touched the USB tree for a week or so now...
In case you missed it, Alan has submitted the above two ttydev patches to
Linus.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: ttydev tree import failure
From: Alan Cox @ 2009-07-09 23:47 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20090710091408.67c4da53.sfr@canb.auug.org.au>
On Fri, 10 Jul 2009 09:14:08 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Alan,
>
> Today's linux-next import of the ttydev tree failed like this:
>
> tty-usb-mos7720-modem
> error: usb/serial/mos7720.c: does not exist in index
>
> It looks like a -p0 patch was included in the comments? I removed the
> -p0 patch (hopefully that was the correct one).
Interesting - stgit seems totally happy with it all (and applied it to
the right place). I'll have a poke and sort it out.
^ permalink raw reply
* Re: linux-next: manual merge of the ttydev tree with the usb.current tree
From: Greg KH @ 2009-07-09 23:19 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Alan Cox, linux-next, linux-kernel, Jason Wessel
In-Reply-To: <20090709130430.090863dd.sfr@canb.auug.org.au>
On Thu, Jul 09, 2009 at 01:04:30PM +1000, Stephen Rothwell wrote:
> Hi Alan,
>
> Today's linux-next merge of the ttydev tree got conflicts in
> drivers/usb/serial/generic.c and include/linux/usb/serial.h between commit
> d8298d029cdd5d944c3d8369d2862de94d12ae4b ("USB: serial: regression fix to
> move sysrq from hot path") from the usb.current tree and commit
> cf8456fe1aaed1776bf4c26c18adef76e472b9fa ("tty-usb-fix-perf-regression")
> from the ttydev tree. Also between commit
> a2170a444ef9a89a7ec9acc72d79e5db433effc4 ("USB: serial: optimize sysrq
> function calls") from the usb.current tree and commit
> bfce6b042a47c9cdd55c7cd231e58710ec1fa4e1 ("tty-usb-fix-kref-leak") from
> the ttydev tree.
>
> The first two commits above seem to be trying to do the same thing (or
> similar) so I have used the ttydev version for now.
>
> I fixed them up (see below) and can carry the fixes as necessary.
Thanks for the fix, I don't know what happened in the tty tree, I've not
touched the USB tree for a week or so now...
thanks,
greg k-h
^ permalink raw reply
* linux-next: ttydev tree import failure
From: Stephen Rothwell @ 2009-07-09 23:14 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
Hi Alan,
Today's linux-next import of the ttydev tree failed like this:
tty-usb-mos7720-modem
error: usb/serial/mos7720.c: does not exist in index
It looks like a -p0 patch was included in the comments? I removed the
-p0 patch (hopefully that was the correct one).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for July 9 (x86/pci)
From: Randy Dunlap @ 2009-07-09 17:30 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20090709163031.acdb5439.sfr@canb.auug.org.au>
On Thu, 9 Jul 2009 16:30:31 +1000 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090708:
when ACPI is disabled (SFI=y):
arch/x86/pci/mmconfig_32.c: In function 'get_base_addr':
arch/x86/pci/mmconfig_32.c:34: error: invalid use of undefined type 'struct acpi_mcfg_allocation'
arch/x86/pci/mmconfig_32.c:34: error: dereferencing pointer to incomplete type
arch/x86/pci/mmconfig_32.c:35: error: dereferencing pointer to incomplete type
arch/x86/pci/mmconfig_32.c:36: error: dereferencing pointer to incomplete type
arch/x86/pci/mmconfig_32.c:37: error: dereferencing pointer to incomplete type
arch/x86/pci/mmconfig_32.c:38: error: dereferencing pointer to incomplete type
(X86_32, clearly)
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
* Re: linux-next: Tree for July 6-July 9 (percpu/x86)
From: Randy Dunlap @ 2009-07-09 17:22 UTC (permalink / raw)
To: lkml; +Cc: Stephen Rothwell, linux-next, Tejun Heo
In-Reply-To: <20090706095343.df21d4c9.rdunlap@xenotime.net>
On Mon, 6 Jul 2009 09:53:43 -0700 Randy Dunlap wrote:
> On Mon, 6 Jul 2009 16:26:32 +1000 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Changes since 20090703:
> >
> > The percpu tree lost all its conflicts but gained another against the tip
> > tree.
>
> arch/x86/mm/pageattr.c: In function 'cpa_process_alias':
> arch/x86/mm/pageattr.c:749: error: implicit declaration of function 'pcpu_lpage_remapped'
>
> config attached.
Still present in 20090709...
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
^ permalink raw reply
* Re: Merge request for the Thumb-2 branch
From: Stephen Rothwell @ 2009-07-09 9:30 UTC (permalink / raw)
To: Catalin Marinas; +Cc: Russell King - ARM Linux, linux-next
In-Reply-To: <1247129875.11409.8.camel@pc1117.cambridge.arm.com>
[-- Attachment #1: Type: text/plain, Size: 814 bytes --]
Hi Catalin,
On Thu, 09 Jul 2009 09:57:55 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> That's not a new ARM platform, it is affecting the core
My mistake (I must learn to read sometime :-))
> arch/arm/kernel/, arch/arm/mm/ etc. files so that they can be compiled
> to an alternative instruction set (mostly 16-bit instructions). So it
> should eventually be merged via Russell's tree (or get his ack and push
> directly)
>
> My intention is indeed to merge this in the upcoming window (unless
> Russell has any more comments to the code).
OK, then it will stay in linux-next unless Russell desires otherwise. I
can even cope if he decides to merges it into his tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: Merge request for the Thumb-2 branch
From: Catalin Marinas @ 2009-07-09 8:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Russell King - ARM Linux, linux-next
In-Reply-To: <20090709100626.1e40912d.sfr@canb.auug.org.au>
Hi Stephen,
On Thu, 2009-07-09 at 10:06 +1000, Stephen Rothwell wrote:
> On Wed, 08 Jul 2009 16:34:29 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
> >
> > On Fri, 2009-06-26 at 17:59 +0100, Catalin Marinas wrote:
> > > Could you please merge the thumb-2 branch into linux-next:
> > >
> > > git://linux-arm.org/linux-2.6.git thumb-2
> > >
> > > It adds support for compiling the ARM kernel to the Thumb-2 instruction
> > > set (16 or 32 bit opcodes) and it makes sense to check it doesn't break
> > > other things before the next merging window (it's a bit more intrusive
> > > but limited to arch/arm/* files).
[...]
> > Russell - are you OK with getting this branch merged during the next
> > window, assuming that any new comments are implemented and testing is
> > fine? If there are other issues, please let me know.
>
> From previous comments that Russell has made, I think he is OK with arm
> platforms being in linux-next separately (we already have 2 others), so I
> will add this today.
That's not a new ARM platform, it is affecting the core
arch/arm/kernel/, arch/arm/mm/ etc. files so that they can be compiled
to an alternative instruction set (mostly 16-bit instructions). So it
should eventually be merged via Russell's tree (or get his ack and push
directly)
My intention is indeed to merge this in the upcoming window (unless
Russell has any more comments to the code).
Thanks.
--
Catalin
^ permalink raw reply
* linux-next: Tree for July 9
From: Stephen Rothwell @ 2009-07-09 6:30 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7422 bytes --]
Hi all,
Changes since 20090708:
New tree: thumb-2
This tree fails to build for powerpc allyesconfig (final link problem).
Linus' tree gained a build failure for which I applied a patch.
The wireless tree gained a conflict against the wireless-current tree.
The block tree lost its build failure.
The ttydev tree lost its build failure but gained conflicts against the
usb.current tree.
The tip tree lost a conflict.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig.
These builds also have CONFIG_ENABLE_WARN_DEPRECATED,
CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 132 trees (counting Linus' and 19 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Applying: Fix up typo in KERN_ prefixes removal
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging thumb-2/thumb-2
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl-rc6
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging wireless/master
CONFLICT (delete/modify): drivers/net/wireless/p54/p54common.c deleted in wireless/master and modified in HEAD. Version HEAD of drivers/net/wireless/p54/p54common.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/wireless/zd1211rw/zd_usb.c
$ git rm -f drivers/net/wireless/p54/p54common.c
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/mips/kernel/smp-cmp.c
CONFLICT (content): Merge conflict in arch/powerpc/platforms/powermac/setup.c
Applying: rr/pmac: fix for cpumask accessor changes
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in drivers/char/pty.c
CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c
CONFLICT (content): Merge conflict in include/linux/usb/serial.h
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging edac-amd/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging tip/auto-latest
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: manual merge of the ttydev tree with the usb.current tree
From: Stephen Rothwell @ 2009-07-09 3:04 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-next, linux-kernel, Jason Wessel, Greg KH
Hi Alan,
Today's linux-next merge of the ttydev tree got conflicts in
drivers/usb/serial/generic.c and include/linux/usb/serial.h between commit
d8298d029cdd5d944c3d8369d2862de94d12ae4b ("USB: serial: regression fix to
move sysrq from hot path") from the usb.current tree and commit
cf8456fe1aaed1776bf4c26c18adef76e472b9fa ("tty-usb-fix-perf-regression")
from the ttydev tree. Also between commit
a2170a444ef9a89a7ec9acc72d79e5db433effc4 ("USB: serial: optimize sysrq
function calls") from the usb.current tree and commit
bfce6b042a47c9cdd55c7cd231e58710ec1fa4e1 ("tty-usb-fix-kref-leak") from
the ttydev tree.
The first two commits above seem to be trying to do the same thing (or
similar) so I have used the ttydev version for now.
I fixed them up (see below) and can carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/generic.c
index 48f6743,21dd6e7..0000000
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
diff --cc include/linux/usb/serial.h
index 4601e0d,0ec50ba..0000000
--- a/include/linux/usb/serial.h
+++ b/include/linux/usb/serial.h
@@@ -325,34 -330,6 +325,35 @@@ extern struct usb_serial_driver usb_ser
extern struct bus_type usb_serial_bus_type;
extern struct tty_driver *usb_serial_tty_driver;
- static inline int usb_serial_handle_sysrq_char(struct usb_serial_port *port,
++static inline int usb_serial_handle_sysrq_char(struct tty_struct *tty,
++ struct usb_serial_port *port,
+ unsigned int ch)
+{
+#ifdef CONFIG_MAGIC_SYSRQ
+ if (port->sysrq && port->console) {
+ if (ch && time_before(jiffies, port->sysrq)) {
- handle_sysrq(ch, tty_port_tty_get(&port->port));
++ handle_sysrq(ch, tty);
+ port->sysrq = 0;
+ return 1;
+ }
+ port->sysrq = 0;
+ }
+#endif /* CONFIG_MAGIC_SYSRQ */
+ return 0;
+}
+
+static inline int usb_serial_handle_break(struct usb_serial_port *port)
+{
+#ifdef CONFIG_MAGIC_SYSRQ
+ if (!port->sysrq) {
+ port->sysrq = jiffies + HZ*5;
+ return 1;
+ }
+ port->sysrq = 0;
+#endif /* CONFIG_MAGIC_SYSRQ */
+ return 0;
+}
+
static inline void usb_serial_debug_data(int debug,
struct device *dev,
const char *function, int size,
^ permalink raw reply
* linux-next: manual merge of the wireless tree with the wireless-current tree
From: Stephen Rothwell @ 2009-07-09 1:40 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Hin-Tak Leung, Pascal Terjan
Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/zd1211rw/zd_usb.c between a couple of commits from
the wireless-current tree and commit
04755d92e9d150a3f308dd39664f859cc2182536 ("zd1211rw: sort vid/pid pairs
by numerical value") from the wireless tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/zd1211rw/zd_usb.c
index 0e6e446,2c24dd9..0000000
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@@ -36,58 -36,57 +36,58 @@@
static struct usb_device_id usb_ids[] = {
/* ZD1211 */
+ { USB_DEVICE(0x0105, 0x145f), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0586, 0x3401), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0586, 0x3402), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0586, 0x3409), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x079b, 0x004a), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x0ace, 0x1211), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x0ace, 0xa211), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x126f, 0xa006), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0b05, 0x170c), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0b3b, 0x1630), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x0b3b, 0x5630), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x0df6, 0x9071), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x0df6, 0x9075), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x079b, 0x004a), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x1740, 0x2000), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x157e, 0x3204), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0586, 0x3402), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0b3b, 0x5630), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0b05, 0x170c), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x126f, 0xa006), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x129b, 0x1666), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x13b1, 0x001e), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x1435, 0x0711), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0586, 0x3409), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0b3b, 0x1630), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0586, 0x3401), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x14ea, 0xab13), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x13b1, 0x001e), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0586, 0x3407), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x129b, 0x1666), .driver_info = DEVICE_ZD1211 },
{ USB_DEVICE(0x157e, 0x300a), .driver_info = DEVICE_ZD1211 },
- { USB_DEVICE(0x0105, 0x145f), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x157e, 0x300b), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x157e, 0x3204), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x1740, 0x2000), .driver_info = DEVICE_ZD1211 },
+ { USB_DEVICE(0x6891, 0xa727), .driver_info = DEVICE_ZD1211 },
/* ZD1211B */
+ { USB_DEVICE(0x0053, 0x5301), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0411, 0x00da), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0471, 0x1237), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x054c, 0x0257), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0ace, 0xb215), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0586, 0x340a), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0586, 0x340f), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0586, 0x3410), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0586, 0x3412), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0586, 0x3413), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x079b, 0x0062), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x050d, 0x705c), .driver_info = DEVICE_ZD1211B },
++ { USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x07fa, 0x1196), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x083a, 0xe503), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x083a, 0xe506), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x083a, 0x4505), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0471, 0x1236), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0586, 0x340f), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0ace, 0x1215), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x0ace, 0xb215), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x0b05, 0x171b), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0586, 0x3410), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x0baf, 0x0121), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0586, 0x3412), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0586, 0x3413), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0053, 0x5301), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0411, 0x00da), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x2019, 0x5303), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x129b, 0x1667), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x0cde, 0x001a), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0586, 0x340a), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x0471, 0x1237), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x07fa, 0x1196), .driver_info = DEVICE_ZD1211B },
{ USB_DEVICE(0x0df6, 0x0036), .driver_info = DEVICE_ZD1211B },
- { USB_DEVICE(0x07b8, 0x6001), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x129b, 0x1667), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x13b1, 0x0024), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x1582, 0x6003), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x157e, 0x300d), .driver_info = DEVICE_ZD1211B },
+ { USB_DEVICE(0x2019, 0x5303), .driver_info = DEVICE_ZD1211B },
/* "Driverless" devices that need ejecting */
{ USB_DEVICE(0x0ace, 0x2011), .driver_info = DEVICE_INSTALLER },
{ USB_DEVICE(0x0ace, 0x20ff), .driver_info = DEVICE_INSTALLER },
^ permalink raw reply
* linux-next: origin tree build failure
From: Stephen Rothwell @ 2009-07-09 0:28 UTC (permalink / raw)
To: Linus; +Cc: linux-next, linux-kernel, Joe Perches, David S. Miller, netdev
Hi Linus,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/net/fealnx.c: In function 'fealnx_tx_timeout':
drivers/net/fealnx.c:1219: error: 'PR_CONT' undeclared (first use in this function)
drivers/net/fealnx.c:1219: error: (Each undeclared identifier is reported only once
drivers/net/fealnx.c:1219: error: for each function it appears in.)
drivers/net/fealnx.c:1219: error: expected ')' before string constant
drivers/net/fealnx.c:1224: error: expected ')' before string constant
drivers/net/fealnx.c:1225: error: expected ')' before string constant
Caused by commit ad361c9884e809340f6daca80d56a9e9c871690a ("Remove
multiple KERN_ prefixes from printk formats"). I applied the following
patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 9 Jul 2009 10:23:07 +1000
Subject: [PATCH] Fix up typo in KERN_ prefixes removal
This fixes a type in commit ad361c9884e809340f6daca80d56a9e9c871690a
"Remove multiple KERN_ prefixes from printk formats".
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/fealnx.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index 053fb49..48385c4 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -1216,13 +1216,13 @@ static void fealnx_tx_timeout(struct net_device *dev)
{
printk(KERN_DEBUG " Rx ring %p: ", np->rx_ring);
for (i = 0; i < RX_RING_SIZE; i++)
- printk(PR_CONT " %8.8x",
+ printk(KERN_CONT " %8.8x",
(unsigned int) np->rx_ring[i].status);
printk(KERN_CONT "\n");
printk(KERN_DEBUG " Tx ring %p: ", np->tx_ring);
for (i = 0; i < TX_RING_SIZE; i++)
- printk(PR_CONT " %4.4x", np->tx_ring[i].status);
- printk(PR_CONT "\n");
+ printk(KERN_CONT " %4.4x", np->tx_ring[i].status);
+ printk(KERN_CONT "\n");
}
spin_lock_irqsave(&np->lock, flags);
--
1.6.3.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
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