* Re: linux-next: Linus' tree build warnings
From: Ingo Molnar @ 2009-03-02 8:37 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Venkatesh Pallipadi, Suresh Siddha
In-Reply-To: <20090302183511.a1415086.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next build (i386 defconfig) produced these warnings:
>
> In file included from drivers/gpu/drm/i915/i915_drv.h:36,
> from drivers/gpu/drm/i915/i915_drv.c:35:
> include/linux/io-mapping.h: In function 'io_mapping_map_wc':
> include/linux/io-mapping.h:95: warning: ISO C90 forbids mixed declarations and code
>
> And several more of the same.
yes, a patch for that was already sent.
Ingo
^ permalink raw reply
* Re: linux-next: kvm tree build warnings
From: Sheng Yang @ 2009-03-02 8:00 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Avi Kivity, linux-next, Marcelo Tosatti
In-Reply-To: <20090302174915.91ccbe7f.sfr@canb.auug.org.au>
On Monday 02 March 2009 14:49:15 Stephen Rothwell wrote:
> Hi Avi,
Hi Stephen
Thanks for the notice! It's my fault...
I would post a patch to fix it. And Avi is offline this week, Marcelo is in
charge of maintenance now.
--
regards
Yang, Sheng
>
> Today's linux-next build (powerpc ppc44x_config) produced these warnings:
>
> In file included from arch/powerpc/kernel/asm-offsets.c:52:
> include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside
> parameter list include/linux/kvm_host.h:368: warning: its scope is only
> this definition or declaration, which is probably not what you want In file
> included from arch/powerpc/kvm/booke.c:24:
> include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside
> parameter list include/linux/kvm_host.h:368: warning: its scope is only
> this definition or declaration, which is probably not what you want In file
> included from arch/powerpc/kvm/booke_emulate.c:21:
> include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside
> parameter list include/linux/kvm_host.h:368: warning: its scope is only
> this definition or declaration, which is probably not what you want In file
> included from arch/powerpc/kvm/44x.c:21:
> include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside
> parameter list include/linux/kvm_host.h:368: warning: its scope is only
> this definition or declaration, which is probably not what you want In file
> included from arch/powerpc/kvm/44x_tlb.c:24:
> include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside
> parameter list include/linux/kvm_host.h:368: warning: its scope is only
> this definition or declaration, which is probably not what you want In file
> included from arch/powerpc/include/asm/kvm_ppc.h:31,
> from arch/powerpc/kvm/44x_emulate.c:21:
> include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside
> parameter list include/linux/kvm_host.h:368: warning: its scope is only
> this definition or declaration, which is probably not what you want In file
> included from arch/powerpc/kvm/../../../virt/kvm/coalesced_mmio.c:13:
> include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside
> parameter list include/linux/kvm_host.h:368: warning: its scope is only
> this definition or declaration, which is probably not what you want In file
> included from arch/powerpc/kvm/../../../virt/kvm/kvm_main.c:21:
> include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside
> parameter list include/linux/kvm_host.h:368: warning: its scope is only
> this definition or declaration, which is probably not what you want In file
> included from arch/powerpc/kvm/emulate.c:25:
> include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside
> parameter list include/linux/kvm_host.h:368: warning: its scope is only
> this definition or declaration, which is probably not what you want In file
> included from arch/powerpc/kvm/powerpc.c:24:
> include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside
> parameter list include/linux/kvm_host.h:368: warning: its scope is only
> this definition or declaration, which is probably not what you want
>
> Probably caused by commit 71c8a3f871fab4b54f7cace7d4626e67dfb51b2d ("KVM:
> Unify the delivery of IOAPIC and MSI interrupts").
^ permalink raw reply
* linux-next: Linus' tree build warnings
From: Stephen Rothwell @ 2009-03-02 7:35 UTC (permalink / raw)
To: LKML; +Cc: linux-next, Venkatesh Pallipadi, Suresh Siddha, Ingo Molnar
[-- Attachment #1: Type: text/plain, Size: 631 bytes --]
Hi all,
Today's linux-next build (i386 defconfig) produced these warnings:
In file included from drivers/gpu/drm/i915/i915_drv.h:36,
from drivers/gpu/drm/i915/i915_drv.c:35:
include/linux/io-mapping.h: In function 'io_mapping_map_wc':
include/linux/io-mapping.h:95: warning: ISO C90 forbids mixed declarations and code
And several more of the same.
Caused by commit 4ab0d47d0ab311eb181532c1ecb6d02905685071 ("gpu/drm, x86, PAT: io_mapping_create_wc and resource_size_t") from Linus' 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: linux-next: manual merge of the firmware tree with the tree
From: Takashi Iwai @ 2009-03-02 7:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Woodhouse, linux-next, Ben Hutchings, David S. Miller
In-Reply-To: <20090302141106.7e14b17d.sfr@canb.auug.org.au>
At Mon, 2 Mar 2009 14:11:06 +1100,
Stephen Rothwell wrote:
>
> Hi David,
>
> Today's linux-next merge of the firmware tree got a conflict in
> firmware/Makefile between commit 06e1f9ffa023c030bc87491e75f625f5da4e7d97
> ("tehuti: Use request_firmware()") from the net tree and commit
> f2fd247da0abaa330c39922aa1f6729eff051f73 ("ALSA: wavefront - Always use
> request_firmware()") from the firmware tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
>
> David, is there any chance that (some of) these changes could be
> distributed to their respective maintainers?
I'm fine to take the sound part patch (it originally came from me ;-)
but I guess it won't help to resolve the conflict with net tree?
thanks,
Takashi
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> diff --cc firmware/Makefile
> index aa2e02d,bf8445e..0000000
> --- a/firmware/Makefile
> +++ b/firmware/Makefile
> @@@ -49,10 -55,9 +55,11 @@@ fw-shipped-$(CONFIG_SND_SB16_CSP) += sb
> sb16/ima_adpcm_capture.csp
> fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
> yamaha/ds1e_ctrl.fw
> + fw-shipped-$(CONFIG_SND_WAVEFRONT) += yamaha/yss225_registers.bin
> +fw-shipped-$(CONFIG_TEHUTI) += tehuti/bdx.bin
> fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
> tigon/tg3_tso5.bin
> +fw-shipped-$(CONFIG_TYPHOON) += 3com/typhoon.bin
> fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
> fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
> emi26/bitstream.fw
>
^ permalink raw reply
* linux-next: Tree for March 2
From: Stephen Rothwell @ 2009-03-02 7:22 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8911 bytes --]
Hi all,
Changes since 20090227:
Undropped trees:
wireless
Dropped trees (temporary):
acpi (build failure)
v4l-dvb (build failure)
The v4l-dvb tree gained a build failure so it was dropped for today.
The net tree gained a build failure the required 2 commits to be reverted
for today.
The wireless tree lost its build failure.
The firmware tree gained 2 conflicts against the net tree.
----------------------------------------------------------------------------
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,
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 133 trees (counting Linus' and 18 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 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
CONFLICT (content): Merge conflict in arch/arm/mach-at91/gpio.c
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
CONFLICT (rename/modify): Merge conflict in arch/arm/plat-pxa/dma.c
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/elf.h
CONFLICT (delete/modify): arch/x86/mach-default/setup.c deleted in x86/auto-x86-next and modified in HEAD. Version HEAD of arch/x86/mach-default/setup.c left in tree.
$ git rm -f arch/x86/mach-default/setup.c
Merging xtensa/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging tracing/auto-tracing-next
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging genirq/auto-genirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pcie/portdrv_pci.c
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c
$ git reset --hard HEAD^
Merging quota/for_next
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/ocfs2.h
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-tx.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c
Merging cpufreq/next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (delete/modify): arch/x86/include/asm/es7000/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/es7000/apic.h left in tree.
CONFLICT (delete/modify): arch/x86/include/asm/numaq/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/numaq/apic.h left in tree.
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in kernel/module.c
$ git rm -f arch/x86/include/asm/es7000/apic.h
$ git rm -f arch/x86/include/asm/numaq/apic.h
Applying: rr: fixup for cpumask:remove-address-of-CPU_MASK_ALL
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_proc.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in mm/Makefile
Merging generic-ipi/auto-generic-ipi-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging quilt/staging
Merging scsi-post-merge/master
[master]: created 3ae24ed: "Revert "RDS: Kconfig and Makefile""
[master]: created a50c0bd: "Revert "RDS: Congestion-handling code""
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: net tree build failure
From: Stephen Rothwell @ 2009-03-02 7:05 UTC (permalink / raw)
To: David S. Miller; +Cc: linux-next, Andy Grover
[-- Attachment #1: Type: text/plain, Size: 828 bytes --]
Hi Dave,
Today's linux-next build (powerpc allyesconfig) failed like this:
net/rds/cong.c: In function 'rds_cong_set_bit':
net/rds/cong.c:284: error: implicit declaration of function 'generic___set_le_bit'
net/rds/cong.c: In function 'rds_cong_clear_bit':
net/rds/cong.c:298: error: implicit declaration of function 'generic___clear_le_bit'
net/rds/cong.c: In function 'rds_cong_test_bit':
net/rds/cong.c:309: error: implicit declaration of function 'generic_test_le_bit'
Caused by commit 922cb17a5c812fcc9ebee249f4109db099896941 ("RDS:
Congestion-handling code").
I have reverted that commit and commit
fe17f84f5f2a7d6c1a31c04c06a016d4ad5f7dec ("RDS: Kconfig and Makefile")
that makes it all build.
--
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
* linux-next: kvm tree build warnings
From: Stephen Rothwell @ 2009-03-02 6:49 UTC (permalink / raw)
To: Avi Kivity; +Cc: linux-next, Sheng Yang
[-- Attachment #1: Type: text/plain, Size: 3151 bytes --]
Hi Avi,
Today's linux-next build (powerpc ppc44x_config) produced these warnings:
In file included from arch/powerpc/kernel/asm-offsets.c:52:
include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside parameter list
include/linux/kvm_host.h:368: warning: its scope is only this definition or declaration, which is probably not what you want
In file included from arch/powerpc/kvm/booke.c:24:
include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside parameter list
include/linux/kvm_host.h:368: warning: its scope is only this definition or declaration, which is probably not what you want
In file included from arch/powerpc/kvm/booke_emulate.c:21:
include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside parameter list
include/linux/kvm_host.h:368: warning: its scope is only this definition or declaration, which is probably not what you want
In file included from arch/powerpc/kvm/44x.c:21:
include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside parameter list
include/linux/kvm_host.h:368: warning: its scope is only this definition or declaration, which is probably not what you want
In file included from arch/powerpc/kvm/44x_tlb.c:24:
include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside parameter list
include/linux/kvm_host.h:368: warning: its scope is only this definition or declaration, which is probably not what you want
In file included from arch/powerpc/include/asm/kvm_ppc.h:31,
from arch/powerpc/kvm/44x_emulate.c:21:
include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside parameter list
include/linux/kvm_host.h:368: warning: its scope is only this definition or declaration, which is probably not what you want
In file included from arch/powerpc/kvm/../../../virt/kvm/coalesced_mmio.c:13:
include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside parameter list
include/linux/kvm_host.h:368: warning: its scope is only this definition or declaration, which is probably not what you want
In file included from arch/powerpc/kvm/../../../virt/kvm/kvm_main.c:21:
include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside parameter list
include/linux/kvm_host.h:368: warning: its scope is only this definition or declaration, which is probably not what you want
In file included from arch/powerpc/kvm/emulate.c:25:
include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside parameter list
include/linux/kvm_host.h:368: warning: its scope is only this definition or declaration, which is probably not what you want
In file included from arch/powerpc/kvm/powerpc.c:24:
include/linux/kvm_host.h:368: warning: 'struct kvm_ioapic' declared inside parameter list
include/linux/kvm_host.h:368: warning: its scope is only this definition or declaration, which is probably not what you want
Probably caused by commit 71c8a3f871fab4b54f7cace7d4626e67dfb51b2d ("KVM:
Unify the delivery of IOAPIC and MSI interrupts").
--
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: manual merge of the firmware tree with the tree
From: David Miller @ 2009-03-02 4:29 UTC (permalink / raw)
To: sfr; +Cc: dwmw2, linux-next, ben
In-Reply-To: <20090302141103.d1c369d0.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Mar 2009 14:11:03 +1100
> Today's linux-next merge of the firmware tree got conflicts in
> firmware/WHENCE between commits 06e1f9ffa023c030bc87491e75f625f5da4e7d97
> ("tehuti: Use request_firmware()") and
> b775a750c3afacbfac884537d466d34d50b1023b ("typhoon: Use request_firmware
> ()") from the net tree and various commits from the firmware tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Yeah, I think you'll need to carry this one.
^ permalink raw reply
* linux-next: manual merge of the firmware tree with the tree
From: Stephen Rothwell @ 2009-03-02 3:11 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Ben Hutchings, David S. Miller, Takashi Iwai
Hi David,
Today's linux-next merge of the firmware tree got a conflict in
firmware/Makefile between commit 06e1f9ffa023c030bc87491e75f625f5da4e7d97
("tehuti: Use request_firmware()") from the net tree and commit
f2fd247da0abaa330c39922aa1f6729eff051f73 ("ALSA: wavefront - Always use
request_firmware()") from the firmware tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
David, is there any chance that (some of) these changes could be
distributed to their respective maintainers?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc firmware/Makefile
index aa2e02d,bf8445e..0000000
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@@ -49,10 -55,9 +55,11 @@@ fw-shipped-$(CONFIG_SND_SB16_CSP) += sb
sb16/ima_adpcm_capture.csp
fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
yamaha/ds1e_ctrl.fw
+ fw-shipped-$(CONFIG_SND_WAVEFRONT) += yamaha/yss225_registers.bin
+fw-shipped-$(CONFIG_TEHUTI) += tehuti/bdx.bin
fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
tigon/tg3_tso5.bin
+fw-shipped-$(CONFIG_TYPHOON) += 3com/typhoon.bin
fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
emi26/bitstream.fw
^ permalink raw reply
* linux-next: manual merge of the firmware tree with the tree
From: Stephen Rothwell @ 2009-03-02 3:11 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, Ben Hutchings, David S. Miller
Hi David,
Today's linux-next merge of the firmware tree got conflicts in
firmware/WHENCE between commits 06e1f9ffa023c030bc87491e75f625f5da4e7d97
("tehuti: Use request_firmware()") and
b775a750c3afacbfac884537d466d34d50b1023b ("typhoon: Use request_firmware
()") from the net tree and various commits from the firmware tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc firmware/WHENCE
index ea4fc2e,25f9bbd..0000000
--- a/firmware/WHENCE
+++ b/firmware/WHENCE
@@@ -436,60 -422,61 +436,119 @@@ Found in hex form in kernel source, wit
--------------------------------------------------------------------------
+ Driver: SCSI_QLOGIC_1280 - Qlogic QLA 1240/1x80/1x160 SCSI support
+
+ File: qlogic/1040.bin
+ File: qlogic/1280.bin
+ File: qlogic/12160.bin
+
+ Licence: Allegedly GPLv2+, but no source visible. Marked:
+
+ QLOGIC LINUX SOFTWARE
+ QLogic ISP1280/ device driver for Linux 2.2.x and 2.4.x
+ Copyright (C) 2001 Qlogic Corporation (www.qlogic.com)
+
+ --------------------------------------------------------------------------
+
+ Driver: SCSI_ADVANSYS - AdvanSys SCSI
+
+ File: advansys/mcode.bin
+ File: advansys/3550.bin
+ File: advansys/38C0800.bin
+ File: advansys/38C1600.bin
+
+ Licence: Allegedly GPLv2+, but no source visible.
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+Driver: TEHUTI - Tehuti Networks 10G Ethernet
+
+File: tehuti/bdx.bin
+
+Licence:
+
+ Copyright (C) 2007 Tehuti Networks Ltd.
+
+ Permission is hereby granted for the distribution of this firmware data
+ in hexadecimal or equivalent format, provided this copyright notice is
+ accompanying it.
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
+
+ Driver: SCSI_QLOGICPTI - PTI Qlogic, ISP Driver
+
+ File: qlogic/isp1000.bin
+
+ Licence: Unknown
+
+ Found in hex form in kernel source.
+
+ --------------------------------------------------------------------------
+
+Driver: TYPHOON - 3cr990 series Typhoon
+
+File: 3com/typhoon.bin
+
+Licence:
+/*
+ * Copyright 1999-2004 3Com Corporation. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms of the 3c990img.h
+ * microcode software are permitted provided that the following conditions
+ * are met:
+ * 1. Redistribution of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of 3Com may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY 3COM ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * USER ACKNOWLEDGES AND AGREES THAT PURCHASE OR USE OF THE 3c990img.h
+ * MICROCODE SOFTWARE WILL NOT CREATE OR GIVE GROUNDS FOR A LICENSE BY
+ * IMPLICATION, ESTOPPEL, OR OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS
+ * (PATENT, COPYRIGHT, TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT)
+ * EMBODIED IN ANY OTHER 3COM HARDWARE OR SOFTWARE EITHER SOLELY OR IN
+ * COMBINATION WITH THE 3c990img.h MICROCODE SOFTWARE
+ */
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------
++
+ Driver: DVB AV7110 -- AV7110 cards
+
+ File: av7110/bootcode.bin
+
+ Licence: GPLv2 or later
+
+ ARM assembly source code available at http://www.linuxtv.org/downloads/firmware/Boot.S
+
+ --------------------------------------------------------------------------
+
+ Driver: wavefront - ISA WaveFront sound card
+
+ File: yamaha/yss225_registers.bin
+
+ Licence: Allegedly GPLv2+, but no source visible.
+
+ Found in hex form in kernel source, with the following comment:
+ Copyright (c) 1998-2002 by Paul Davis <pbd@op.net>
+
+
+ --------------------------------------------------------------------------
^ permalink raw reply
* Re: linux-next: v4l-dvb tree build failure
From: Mauro Carvalho Chehab @ 2009-03-02 2:52 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Michael Krufky, linux-next
In-Reply-To: <20090302113000.4d3514bf.sfr@canb.auug.org.au>
On Mon, 2 Mar 2009, Stephen Rothwell wrote:
> Hi Michael,
>
> On Sun, 01 Mar 2009 19:08:49 -0500 Michael Krufky <mkrufky@linuxtv.org> wrote:
>>
>> Thanks for the heads up -- I fixed that a few days ago:
>>
>> http://linuxtv.org/hg/v4l-dvb/raw-rev/eae32c526e78
>>
>> I'm sure the fix will be included with Mauro's next push.
Yes. I'll merge the fix on my next -git update probably today afternoon.x
>
> Thanks.
>
>
--
Cheers,
Mauro Carvalho Chehab
http://linuxtv.org
mchehab@infradead.org
^ permalink raw reply
* Re: linux-next: v4l-dvb tree build failure
From: Stephen Rothwell @ 2009-03-02 0:30 UTC (permalink / raw)
To: Michael Krufky; +Cc: Mauro Carvalho Chehab, linux-next
In-Reply-To: <49AB2391.3020200@linuxtv.org>
[-- Attachment #1: Type: text/plain, Size: 400 bytes --]
Hi Michael,
On Sun, 01 Mar 2009 19:08:49 -0500 Michael Krufky <mkrufky@linuxtv.org> wrote:
>
> Thanks for the heads up -- I fixed that a few days ago:
>
> http://linuxtv.org/hg/v4l-dvb/raw-rev/eae32c526e78
>
> I'm sure the fix will be included with Mauro's next push.
Thanks.
--
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: v4l-dvb tree build failure
From: Michael Krufky @ 2009-03-02 0:08 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Mauro Carvalho Chehab, linux-next
In-Reply-To: <20090302110549.38778423.sfr@canb.auug.org.au>
Stephen,
Thanks for the heads up -- I fixed that a few days ago:
http://linuxtv.org/hg/v4l-dvb/raw-rev/eae32c526e78
I'm sure the fix will be included with Mauro's next push.
Regards,
Mike Krufky
Stephen Rothwell wrote:
> Hi Mauro,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> ERROR: "sms_dbg" [drivers/media/dvb/siano/smsusb.ko] undefined!
> ERROR: "sms_dbg" [drivers/media/dvb/siano/smsdvb.ko] undefined!
>
> Probably caused by commit 33b67084d284779ee2a30deebd2115f79b8435b9
> ("V4L/DVB (10751): sms1xxx: fix checkpatch.pl violations introduced by
> previous changeset").
>
> I have dropped the v4l-dvb tree for today.
>
^ permalink raw reply
* linux-next: v4l-dvb tree build failure
From: Stephen Rothwell @ 2009-03-02 0:05 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, Michael Krufky
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
Hi Mauro,
Today's linux-next build (x86_64 allmodconfig) failed like this:
ERROR: "sms_dbg" [drivers/media/dvb/siano/smsusb.ko] undefined!
ERROR: "sms_dbg" [drivers/media/dvb/siano/smsdvb.ko] undefined!
Probably caused by commit 33b67084d284779ee2a30deebd2115f79b8435b9
("V4L/DVB (10751): sms1xxx: fix checkpatch.pl violations introduced by
previous changeset").
I have dropped the v4l-dvb tree for today.
--
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: manual merge of the net tree with Linus' tree
From: David Miller @ 2009-02-27 7:17 UTC (permalink / raw)
To: sfr
Cc: linux-next, fenghua.yu, David.Woodhouse, bhavesh, chrisw,
tomas.winkler, samuel.ortiz, reinette.chatre, linville
In-Reply-To: <20090226134859.402ed4df.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 26 Feb 2009 13:48:59 +1100
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/iwlwifi/iwl-tx.c between commit
> 6aa03ab06978e97b3e0720f83280d7841051916b ("Fix iwlan DMA mapping
> direction") from Linus' tree and commit
> 7aaa1d79e3a2d573ac469744506f17b1c9386840 ("iwlwifi: Add TFD library
> operations") from the net tree.
>
> The latter moved some code that the former modified. I fixed it up (see
> below) and can carry it for a while.
I'll sort this out, thanks Stephen.
^ permalink raw reply
* linux-next: Tree for February 27
From: Stephen Rothwell @ 2009-02-27 6:55 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8602 bytes --]
Hi all,
Changes since 20090226:
Undropped trees:
sound
Dropped trees (temporary):
acpi (build failure)
wireless (build failure)
The ext4 tree lost its conflict but gained another against the quota tree.
The wireless tree lost its conflict but gained a build failure and was
dropped for today.
The sound tree lost its build failure.
The drm tree gained a conflict against the x86 tree.
----------------------------------------------------------------------------
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,
ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and
i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 133 trees (counting Linus' and 18 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 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
CONFLICT (content): Merge conflict in arch/arm/mach-at91/gpio.c
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
CONFLICT (rename/modify): Merge conflict in arch/arm/plat-pxa/dma.c
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/elf.h
CONFLICT (delete/modify): arch/x86/mach-default/setup.c deleted in x86/auto-x86-next and modified in HEAD. Version HEAD of arch/x86/mach-default/setup.c left in tree.
$ git rm -f arch/x86/mach-default/setup.c
Merging xtensa/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging tracing/auto-tracing-next
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging genirq/auto-genirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pcie/portdrv_pci.c
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging v4l-dvb/master
Merging quota/for_next
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
$ git reset --hard HEAD^
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-tx.c
Applying: net: iwl-agn merge fixup
Merging wireless/master
$ git reset --hard HEAD^
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c
Merging cpufreq/next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (delete/modify): arch/x86/include/asm/es7000/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/es7000/apic.h left in tree.
CONFLICT (delete/modify): arch/x86/include/asm/numaq/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/numaq/apic.h left in tree.
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in kernel/module.c
$ git rm -f arch/x86/include/asm/es7000/apic.h
$ git rm -f arch/x86/include/asm/numaq/apic.h
Applying: rr: fixup for cpumask:remove-address-of-CPU_MASK_ALL
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_proc.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in mm/Makefile
Merging generic-ipi/auto-generic-ipi-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* [PATCH] at76c50x-usb: use dev_name() instead of struct device.bus_id
From: Kalle Valo @ 2009-02-27 5:50 UTC (permalink / raw)
To: linville-2XuSBdqkA4R54TAoqtyWWQ
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA, Kay Sievers, Greg KH,
linux-wireless-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20090227134411.54e99731.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Stephen Rothwell reported that bus_id from struct device will be removed, use
dev_name() instead.
Signed-off-by: Kalle Valo <kalle.valo-X3B1VOXEql0@public.gmane.org>
---
drivers/net/wireless/at76c50x-usb.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index cc2a267..0c02f1c 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -2268,7 +2268,7 @@ static int at76_init_new_device(struct at76_priv *priv,
printk(KERN_INFO "%s: USB %s, MAC %s, firmware %d.%d.%d-%d\n",
wiphy_name(priv->hw->wiphy),
- interface->dev.bus_id, mac2str(priv->mac_addr),
+ dev_name(&interface->dev), mac2str(priv->mac_addr),
priv->fw_version.major, priv->fw_version.minor,
priv->fw_version.patch, priv->fw_version.build);
printk(KERN_INFO "%s: regulatory domain 0x%02x: %s\n",
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related
* linux-next: manual merge of the drm tree with the x86 tree
From: Stephen Rothwell @ 2009-02-27 5:08 UTC (permalink / raw)
To: Dave Airlie
Cc: linux-next, Ben Gamari, Eric Anholt, Jaswinder Singh Rajput,
Ingo Molnar
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/drm_proc.c between commit
804852e4ffc983f9ee7600f78218698546fdc58d ("drm_proc.c fix compilation
warning") from the x86 tree and commit
a584bb1ed4de35a9206a8ed42fc7de18b3d46b5a ("drm: Convert proc files to
seq_file and introduce debugfs") from the drm tree.
The former fixed a warning in code removed by the latter. I just dropped
the former change.
--
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: [PATCH] net: fix hp-plus build error
From: David Miller @ 2009-02-27 5:02 UTC (permalink / raw)
To: randy.dunlap; +Cc: sfr, linux-next, linux-kernel, netdev, shemminger, akpm
In-Reply-To: <49A76A6B.7020709@oracle.com>
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 26 Feb 2009 20:22:03 -0800
> hp-plus needs to call __alloc_eip_netdev() instead of
> __alloc_ei_netdev() since it is linked with 8390p.o.
>
> Fixes this build error:
> ERROR: "__alloc_ei_netdev" [drivers/net/hp-plus.ko] undefined!
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Applied to net-2.6, thanks Randy.
^ permalink raw reply
* [PATCH] net: fix hp-plus build error
From: Randy Dunlap @ 2009-02-27 4:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, LKML, netdev, David Miller, Stephen Hemminger, akpm
In-Reply-To: <49A4248F.6090202@oracle.com>
From: Randy Dunlap <randy.dunlap@oracle.com>
hp-plus needs to call __alloc_eip_netdev() instead of
__alloc_ei_netdev() since it is linked with 8390p.o.
Fixes this build error:
ERROR: "__alloc_ei_netdev" [drivers/net/hp-plus.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/net/hp-plus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- mmotm-2009-0226-1658.orig/drivers/net/hp-plus.c
+++ mmotm-2009-0226-1658/drivers/net/hp-plus.c
@@ -467,7 +467,7 @@ init_module(void)
if (this_dev != 0) break; /* only autoprobe 1st one */
printk(KERN_NOTICE "hp-plus.c: Presently autoprobing (not recommended) for a single card.\n");
}
- dev = alloc_ei_netdev();
+ dev = alloc_eip_netdev();
if (!dev)
break;
dev->irq = irq[this_dev];
^ permalink raw reply
* linux-next: wireless tree build failure
From: Stephen Rothwell @ 2009-02-27 2:44 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, Kalle Valo, Kay Sievers, Greg KH
[-- Attachment #1: Type: text/plain, Size: 760 bytes --]
Hi John,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/net/wireless/at76c50x-usb.c: In function 'at76_init_new_device':
drivers/net/wireless/at76c50x-usb.c:2271: error: 'struct device' has no member named 'bus_id'
Caused by commit 26b9886dbb1e6930a8a5df9dcf64d8dacb80597b ("at76c50x-usb:
add driver") from the wireless tree interacting with commit
d3592c7c13d14e410ffbf0e86dcd7abb3a23077f ("driver core: get rid of struct
device's bus_id string array") from the driver-core tree.
This can be fixed by using dev_name() which is already available in
Linus' tree.
I have dropped the wireless tree for today.
--
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
* linux-next: manual merge of the ext4 tree with the tree
From: Stephen Rothwell @ 2009-02-27 2:03 UTC (permalink / raw)
To: Theodore Tso; +Cc: linux-next, Aneesh Kumar K.V, Mingming Cao, Jan Kara
Hi Ted,
Today's linux-next merge of the ext4 tree got a conflict in
fs/ext4/inode.c between commit ext4_da_update_reserve_space ("ext4: quota
reservation for delayed allocation") from the quota tree and commit
ext4_da_update_reserve_space ("ext4: Fix discard of inode prealloc space
with delayed allocation") from the ext4 tree.
I think this is just overlapping additions. I fixed it up by taking both
changes (see below) but it is worth a look.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc fs/ext4/inode.c
index a2845b5,8815b9c..0000000
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@@ -1050,11 -1054,13 +1065,19 @@@ static void ext4_da_update_reserve_spac
spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
/*
+ * free those over-booking quota for metadata blocks
+ */
+
+ if (mdb_free)
+ vfs_dq_release_reservation_block(inode, mdb_free);
++
++ /*
+ * If have done all the pending block allocation and if the we
+ * don't have any writer on the inode, we can discard the
+ * inode's preallocations.
+ */
+ if (!total && (atomic_read(&inode->i_writecount) == 0))
+ ext4_discard_preallocations(inode);
}
/*
^ permalink raw reply
* Re: [Staging/p9auth] Feb 26 Next: build failure
From: Stephen Rothwell @ 2009-02-27 0:18 UTC (permalink / raw)
To: Greg KH; +Cc: Randy Dunlap, Sachin P. Sant, linux-next, LKML, ashwin.ganti
In-Reply-To: <20090226174243.GC23465@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
Hi Greg,
On Thu, 26 Feb 2009 09:42:43 -0800 Greg KH <greg@kroah.com> wrote:
>
> Now done, it will show up in tomorrow's -next tree.
Thanks.
--
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: [Staging/p9auth] Feb 26 Next: build failure
From: Greg KH @ 2009-02-26 17:42 UTC (permalink / raw)
To: Randy Dunlap
Cc: Sachin P. Sant, Stephen Rothwell, linux-next, LKML, ashwin.ganti
In-Reply-To: <49A6CA74.7000809@oracle.com>
On Thu, Feb 26, 2009 at 08:59:32AM -0800, Randy Dunlap wrote:
> Greg KH wrote:
> > On Thu, Feb 26, 2009 at 04:40:10PM +0530, Sachin P. Sant wrote:
> >> Feb 26 Next tree randconfig build fails with
> >>
> >> drivers/staging/p9auth/p9auth.c: In function cap_write:
> >> drivers/staging/p9auth/p9auth.c:249: error: implicit declaration of
> >> function current_uid
> >> drivers/staging/p9auth/p9auth.c:261: error: implicit declaration of
> >> function prepare_creds
> >> drivers/staging/p9auth/p9auth.c:261: warning: assignment makes pointer from
> >> integer without a cast
> >> drivers/staging/p9auth/p9auth.c:266: error: dereferencing pointer to
> >> incomplete type
> >> drivers/staging/p9auth/p9auth.c:267: error: dereferencing pointer to
> >> incomplete type
> >> drivers/staging/p9auth/p9auth.c:268: error: implicit declaration of
> >> function commit_creds
> >> make[3]: *** [drivers/staging/p9auth/p9auth.o] Error 1
> >
> > Wierd, I thought cred.h would be pulled in with the current include
> > files.
>
> Even if it were, that's not what we want. We want explicit #includes
> for macros or structs etc. that are used in a source file.
>
> > With this .config, if you add:
> > #include <linux/cred.h>
> > to drivers/staging/p9auth/p9auth.c does it solve the build error?
> >
> > I'll go add it just to be safe :)
>
> It needs both cred.h and sched.h in my testing.
Now done, it will show up in tomorrow's -next tree.
thanks,
greg k-h
^ permalink raw reply
* Re: [Staging/p9auth] Feb 26 Next: build failure
From: Greg KH @ 2009-02-26 17:35 UTC (permalink / raw)
To: Randy Dunlap
Cc: Sachin P. Sant, Stephen Rothwell, linux-next, LKML, ashwin.ganti
In-Reply-To: <49A6CA74.7000809@oracle.com>
On Thu, Feb 26, 2009 at 08:59:32AM -0800, Randy Dunlap wrote:
> Greg KH wrote:
> > On Thu, Feb 26, 2009 at 04:40:10PM +0530, Sachin P. Sant wrote:
> >> Feb 26 Next tree randconfig build fails with
> >>
> >> drivers/staging/p9auth/p9auth.c: In function cap_write:
> >> drivers/staging/p9auth/p9auth.c:249: error: implicit declaration of
> >> function current_uid
> >> drivers/staging/p9auth/p9auth.c:261: error: implicit declaration of
> >> function prepare_creds
> >> drivers/staging/p9auth/p9auth.c:261: warning: assignment makes pointer from
> >> integer without a cast
> >> drivers/staging/p9auth/p9auth.c:266: error: dereferencing pointer to
> >> incomplete type
> >> drivers/staging/p9auth/p9auth.c:267: error: dereferencing pointer to
> >> incomplete type
> >> drivers/staging/p9auth/p9auth.c:268: error: implicit declaration of
> >> function commit_creds
> >> make[3]: *** [drivers/staging/p9auth/p9auth.o] Error 1
> >
> > Wierd, I thought cred.h would be pulled in with the current include
> > files.
>
> Even if it were, that's not what we want. We want explicit #includes
> for macros or structs etc. that are used in a source file.
I agree, sorry, I didn't mean to assume otherwise.
> > With this .config, if you add:
> > #include <linux/cred.h>
> > to drivers/staging/p9auth/p9auth.c does it solve the build error?
> >
> > I'll go add it just to be safe :)
>
> It needs both cred.h and sched.h in my testing.
Ok, I'll go add both.
thanks,
greg k-h
^ 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