* Re: linux-next: build warning after merge of the final tree (tty tree related)
From: Alan Cox @ 2010-10-27 9:11 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Greg KH, linux-next, linux-kernel
In-Reply-To: <20101027110307.e754ef59.sfr@canb.auug.org.au>
On Wed, 27 Oct 2010 11:03:07 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Greg,
>
> On Mon, 27 Sep 2010 15:31:51 +1000 Stephen Rothwell
> <sfr@canb.auug.org.au> wrote:
> >
> > After merging the final tree, today's linux-next build (x86_64
> > allmodconfig) produced this warning:
> >
> > drivers/char/nozomi.c: In function 'ntty_ioctl':
> > drivers/char/nozomi.c:1831: warning: unused variable 'argp'
> >
> > Introduced by commit dd612b1a8edb7fb3a117c388bfb520476e04ed18 ("tty:
> > icount changeover for other main devices").
>
> This warning is now in Linus' tree ...
Already re-sent GregKH the fix. Guess it got eaten in the post last
time.
Alan
^ permalink raw reply
* Re: linux-next: build failure after merge of the slab tree
From: Pekka Enberg @ 2010-10-27 7:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Pekka Enberg, Christoph Lameter, linux-next, linux-kernel
In-Reply-To: <20101027113341.e77169cc.sfr@canb.auug.org.au>
On Wed, Oct 27, 2010 at 3:33 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the slab tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> gcc: /scratch/sfr/next/Documentation/vm/slabinfo.c: No such file or directory
> gcc: no input files
>
> Caused by commit f5ac4916e9840292edd33c7a52b10364526547f3 ("slub: move
> slabinfo.c to tools/slub/slabinfo.c"). Missing update to
> Documentation/vm/Makefile?
Oh, we have one of those. Sorry about the breakage, I'll fix it up later today.
^ permalink raw reply
* linux-next: Tree for October 27
From: Stephen Rothwell @ 2010-10-27 2:49 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10871 bytes --]
Hi all,
Reminder: do not add 2.6.38 destined stuff to linux-next until after
2.6.37-rc1 is released.
Reminder 2: if what you ask Linus to merge turns out to be a little
different from what you have in linux-next (or Linus' fixes things up a
little), please updtae your linux-next submission so I don't have to
worry about those differences.
Changes since 20101026:
The nfsd tree lost its conflict.
The scsi tree lost its build failure.
The kgdb tree lost its conflict.
The slab tree gained a build failure so I used the version from
next-20101026.
The alacrity lost a conflict.
The xen tree gained merge conflicts against Linus' tree that needed a
fixup patch.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). 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 - this fails its final link) 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 176 trees (counting Linus' and 22 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 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/rc-fixes
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.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 ide-curent/master
Merging dwmw2/master
Merging gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dev-audio.c
Merging tegra/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 drivers/usb/host/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/host/Makefile
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
CONFLICT (content): Merge conflict in drivers/video/sh_mobile_hdmi.c
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/mballoc.c
Applying: ext4: merge fix for blkdev_issue_zeroout API change
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/mtd_blkdevs.c
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
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 mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
$ git reset --hard HEAD^
Merging refs/next/20101026/slab
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/sh_mobile_sdhi.c
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
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 quilt/aoe
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/ct-ca9x4.c
CONFLICT (content): Merge conflict in arch/arm/mm/flush.c
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
CONFLICT (content): Merge conflict in arch/x86/xen/mmu.c
Applying: xen: merge fixup for reserve_early name change
Merging swiotlb-xen/master
CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h
CONFLICT (content): Merge conflict in drivers/pci/Makefile
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in arch/powerpc/sysdev/fsl_soc.c
CONFLICT (content): Merge conflict in drivers/scsi/sd.c
CONFLICT (content): Merge conflict in drivers/usb/gadget/rndis.c
CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/host/Makefile
CONFLICT (delete/modify): drivers/uwb/wlp/wss-lc.c deleted in HEAD and modified in quilt/usb. Version quilt/usb of drivers/uwb/wlp/wss-lc.c left in tree.
$ git rm -f drivers/uwb/wlp/wss-lc.c
Merging staging-next/staging-next
CONFLICT (rename/modify): Merge conflict in drivers/misc/ti-st/st_core.c
CONFLICT (rename/modify): Merge conflict in drivers/misc/ti-st/st_kim.c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c
CONFLICT (content): Merge conflict in drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/batman-adv/hard-interface.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio-upstream.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio.h
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/Makefile deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/Makefile left in tree.
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/intel-mid-touch.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/intel-mid-touch.c left in tree.
CONFLICT (delete/modify): drivers/staging/ti-st/st.h deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/ti-st/st.h left in tree.
CONFLICT (delete/modify): drivers/staging/ti-st/st_core.h deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/ti-st/st_core.h left in tree.
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
$ git rm -f drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c
$ git rm -f drivers/staging/ti-st/st.h drivers/staging/ti-st/st_core.h
Applying: staging: ath6kl: Fixing the driver to use modified mmc_host structure
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the xen tree
From: Stephen Rothwell @ 2010-10-27 2:02 UTC (permalink / raw)
To: Jeremy Fitzhardinge, Xen Devel; +Cc: linux-next, linux-kernel
Hi all,
After merging the xen tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
arch/x86/xen/setup.c: In function 'xen_add_extra_mem':
arch/x86/xen/setup.c:65: error: implicit declaration of function 'reserve_early'
Caused by commit 42ee1471e9b879479a15debac752314a596c738e ("xen:
implement "extra" memory to reserve space for pages not present at boot")
interacting with commit a9ce6bc15100023b411f8117e53a016d61889800 ("x86,
memblock: Replace e820_/_early string with memblock_"). This latter
commit was in the xen tree yesterday (via a merge of tip/core/memblock)
but has been removed today (but it is in Linus' tree).
Linus will need this fixup patch when he merges the xen tree. I have
applied it to linux-next today and can carry it as necessary.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 27 Oct 2010 12:57:06 +1100
Subject: [PATCH] xen: merge fixup for reserve_early name change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/x86/xen/setup.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 1163bc5..105db25 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -62,7 +62,7 @@ static __init void xen_add_extra_mem(unsigned long pages)
e820_add_region(extra_start, size, E820_RAM);
sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
- reserve_early(extra_start, extra_start + size, "XEN EXTRA");
+ memblock_x86_reserve_range(extra_start, extra_start + size, "XEN EXTRA");
xen_extra_mem_size += size;
--
1.7.2.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
* linux-next: manual merge of the xen tree with Linus' tree
From: Stephen Rothwell @ 2010-10-27 1:00 UTC (permalink / raw)
To: Jeremy Fitzhardinge, Xen Devel; +Cc: linux-next, linux-kernel
Hi all,
Today's linux-next merge of the xen tree got a conflict in
arch/x86/xen/mmu.c between commit
fef5ba797991f9335bcfc295942b684f9bf613a1 ("xen: Cope with unmapped pages
when initializing kernel pagetable") from Linus' tree and commit
41f2e4771a4f1ba26c35438daf32917b9ef7858d ("xen: add support for PAT")
from the xen tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/xen/mmu.c
index f72d18c,6ba8f8a..0000000
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@@ -56,7 -55,7 +56,8 @@@
#include <asm/e820.h>
#include <asm/linkage.h>
#include <asm/page.h>
+#include <asm/init.h>
+ #include <asm/pat.h>
#include <asm/xen/hypercall.h>
#include <asm/xen/hypervisor.h>
^ permalink raw reply
* Re: linux-next: build warning from Linus' tree
From: Jesse Gross @ 2010-10-27 0:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, netdev, linux-next, linux-kernel
In-Reply-To: <20101027112904.461a0143.sfr@canb.auug.org.au>
On Tue, Oct 26, 2010 at 5:29 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> While building Linus' tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
>
> drivers/net/igb/igb_main.c: In function 'igb_xmit_frame_ring_adv':
> drivers/net/igb/igb_main.c:4110: warning: unused variable 'adapter'
>
> Introduced by commit eab6d18d20fc5b5ba04a7e7fcd6f357197870e51 ("vlan:
> Don't check for vlan group before vlan_tx_tag_present").
Patch sent out to resolve this.
^ permalink raw reply
* linux-next: build failure after merge of the slab tree
From: Stephen Rothwell @ 2010-10-27 0:33 UTC (permalink / raw)
To: Pekka Enberg, Christoph Lameter; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 536 bytes --]
Hi all,
After merging the slab tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
gcc: /scratch/sfr/next/Documentation/vm/slabinfo.c: No such file or directory
gcc: no input files
Caused by commit f5ac4916e9840292edd33c7a52b10364526547f3 ("slub: move
slabinfo.c to tools/slub/slabinfo.c"). Missing update to
Documentation/vm/Makefile?
I have used the slab tree from next-20101026 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build warning from Linus' tree
From: Stephen Rothwell @ 2010-10-27 0:29 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Jesse Gross
[-- Attachment #1: Type: text/plain, Size: 524 bytes --]
Hi all,
While building Linus' tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:
drivers/net/igb/igb_main.c: In function 'igb_xmit_frame_ring_adv':
drivers/net/igb/igb_main.c:4110: warning: unused variable 'adapter'
Introduced by commit eab6d18d20fc5b5ba04a7e7fcd6f357197870e51 ("vlan:
Don't check for vlan group before vlan_tx_tag_present").
Sorry I didn't catch it earlier.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build warning after merge of the final tree (tty tree related)
From: Stephen Rothwell @ 2010-10-27 0:03 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Alan Cox
In-Reply-To: <20100927153151.9bf66022.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 595 bytes --]
Hi Greg,
On Mon, 27 Sep 2010 15:31:51 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (x86_64
> allmodconfig) produced this warning:
>
> drivers/char/nozomi.c: In function 'ntty_ioctl':
> drivers/char/nozomi.c:1831: warning: unused variable 'argp'
>
> Introduced by commit dd612b1a8edb7fb3a117c388bfb520476e04ed18 ("tty:
> icount changeover for other main devices").
This warning is now in Linus' tree ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: build warning from Linus' tree
From: Stephen Rothwell @ 2010-10-27 0:00 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: linux-next, linux-kernel, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
Hi ,
While building Linus' tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:
drivers/char/pcmcia/synclink_cs.c:2194: warning: 'mgslpc_get_icount' defined but not used
Introduced by commit 0587102cf9f427c185bfdeb2cef41e13ee0264b1 ("tty:
icount changeover for other main devices").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for October 6
From: Ingo Molnar @ 2010-10-26 17:52 UTC (permalink / raw)
To: Trond Myklebust
Cc: Charles Edward Lever, Zimny Lech, Stephen Rothwell,
linux-next-u79uwXL29TY76Z2rM5mHXA, LKML,
linux-nfs-u79uwXL29TY76Z2rM5mHXA, Linus Torvalds
In-Reply-To: <20101026124113.GA10872-X9Un+BFzKDI@public.gmane.org>
* Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org> wrote:
>
> * Trond Myklebust <Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org> wrote:
>
> > Anyhow, does the following fix the bug?
>
> Thanks, trying it.
It has done the trick.
Tested-by: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org>
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" 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
* RE: linux-next: build warnings after merge of the final tree (mtd tree related)
From: H Hartley Sweeten @ 2010-10-26 16:43 UTC (permalink / raw)
To: David Woodhouse, Stephen Rothwell
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <1288090180.29264.26.camel@macbook.infradead.org>
On Tuesday, October 26, 2010 3:50 AM, David Woodhouse wrote:
> On Tue, 2010-10-26 at 09:51 +0100, David Woodhouse wrote:
>> On Tue, 2010-10-26 at 13:49 +1100, Stephen Rothwell wrote:
>>>
>>> I am not sure where these came from ...
>>
>> It's a config issue. You have chosen to build NOR flash support.
>>
>> NOR flash can be wired up many ways. It could be four 8-bit chips in
>> parallel in a 32-bit bus, two 16-bit chips in a 32-bit bus, 2 8-bit
>> chips in a 16-bit bus, one 16-bit chip in a 16-bus bus, etc...
>>
>> You have elected to support *none* of those configurations. No NOR chip
>> support can work.
>>
>> You don't get to choose individual geometry options unless you set
>> CONFIG_MTD_ADV_OPTIONS -- by default you get a fully versatile driver
>> which can cope with anything at runtime.
>>
>> I'll build a ppc44x_defconfig and work out what's going wrong. I'd
>> expect this kind of thing with randconfig, but not a defconfig.
>
> Fixed by reverting the offending commit:
> http://git.infradead.org/mtd-2.6.git/commitdiff/6411bf6cd
I didn't follow the logic for the MTD_MAP_BANK_WIDTH_* all the way thru.
Honestly I still don't quite get it. If MTD_CFI_GEOMETRY is n wouldn't
all the MTD_MAP_BANK_WIDTH_* also be n?
Sorry about the trouble.
Hartley
^ permalink raw reply
* RE: linux-next: build warnings after merge of the final tree (mtd tree related)
From: David Woodhouse @ 2010-10-26 16:48 UTC (permalink / raw)
To: H Hartley Sweeten
Cc: Stephen Rothwell, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <0D753D10438DA54287A00B027084269764818E2136@AUSP01VMBX24.collaborationhost.net>
On Tue, 2010-10-26 at 11:43 -0500, H Hartley Sweeten wrote:
> I didn't follow the logic for the MTD_MAP_BANK_WIDTH_* all the way thru.
>
> Honestly I still don't quite get it. If MTD_CFI_GEOMETRY is n wouldn't
> all the MTD_MAP_BANK_WIDTH_* also be n?
config MTD_CFI_GEOMETRY
bool "Specific CFI Flash geometry selection"
depends on MTD_CFI_ADV_OPTIONS
help
This option does not affect the code directly, but will enable
some other configuration options which would allow you to reduce
the size of the kernel by including support for only certain
arrangements of CFI chips. If unsure, say 'N' and all options
which are supported by the current code will be enabled.
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply
* Re: linux-next: Tree for October 20
From: Arnaud Lacombe @ 2010-10-26 16:22 UTC (permalink / raw)
To: Michal Marek
Cc: Christoph Hellwig, Stephen Rothwell, linux-next, LKML, Zimny Lech
In-Reply-To: <4CC54437.8050607@suse.cz>
Hi,
On Mon, Oct 25, 2010 at 4:47 AM, Michal Marek <mmarek@suse.cz> wrote:
> On 21.10.2010 15:09, Christoph Hellwig wrote:
>> I can't even get the required userspace code make oldconfig to compile:
>>
>> hch@brick:~/work/linux-2.6/obj-kvm$ make oldconfig
>> make -C /home/hch/work/linux-2.6 O=/home/hch/work/linux-2.6/obj-kvm/. oldconfig
>> GEN /home/hch/work/linux-2.6/obj-kvm/Makefile
>> HOSTCC scripts/kconfig/zconf.tab.o
>> In file included from scripts/kconfig/zconf.tab.c:2481:
>> scripts/kconfig/lex.zconf.c:2425: error: conflicting types for 'zconf_curname'
>> /home/hch/work/linux-2.6/scripts/kconfig/lkc.h:79: note: previous declaration of 'zconf_curname' was here
>> scripts/kconfig/lex.zconf.c: In function 'zconf_curname':
>> scripts/kconfig/lex.zconf.c:2427: warning: return discards qualifiers from pointer target type
>
> The zconf_curname() prototype was changed in 2e7a091 and the
> scripts/kconfig/lex.zconf.c_shipped file was updated as well. What
> probably happened is that you ended up using an updated
> scripts/kconfig/lkc.h header versus an old version of
> scripts/kconfig/lex.zconf.c. Ie. the rule that copies
> scripts/kconfig/lex.zconf.c_shipped to scripts/kconfig/lex.zconf.c did
> not trigger, very strange. I'll look further.
>
this is at least the third time there is such a report. I did
reproduce this issue while using an external build directory:
From what I remind:
% gmake menuconfig # generate lex.zconf.c
% gmake O=/foo menuconfig # generate lex.zconf.c
% touch scripts/kconfig/lex.zconf.c_shipped
% gmake menuconfig # re-generated lex.zconf.c
% gmake O=/foo menuconfig # did _not_ re-generate lex.zconf.c
However, this tree was dirty (ie. included WIP stuff), switching to a
clean tree, and certainly updating a bunch of timestamps, make it
disappear.
- Arnaud
^ permalink raw reply
* Re: linux-next: Tree for October 25 (netfilter/nf_conntrack_reasm)
From: David Miller @ 2010-10-26 16:09 UTC (permalink / raw)
To: randy.dunlap; +Cc: sfr, netfilter-devel, netdev, linux-next, linux-kernel
In-Reply-To: <20101025.220316.39174493.davem@davemloft.net>
From: David Miller <davem@davemloft.net>
Date: Mon, 25 Oct 2010 22:03:16 -0700 (PDT)
> From: Randy Dunlap <randy.dunlap@oracle.com>
> Date: Mon, 25 Oct 2010 16:55:29 -0700
>
>> On Mon, 25 Oct 2010 14:58:34 +1100 Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Reminder: do not add 2.6.38 destined stuff to linux-next until after
>>> 2.6.37-rc1 is released.
>>
>> net/ipv6/netfilter/nf_conntrack_reasm.c:628: error: 'nf_ct_frag6_sysctl_header' undeclared (first use in this function)
>> net/ipv6/netfilter/nf_conntrack_reasm.c:628: error: 'nf_net_netfilter_sysctl_path' undeclared (first use in this function)
>> net/ipv6/netfilter/nf_conntrack_reasm.c:629: error: 'nf_ct_frag6_sysctl_table' undeclared (first use in this function)
>> net/ipv6/netfilter/nf_conntrack_reasm.c:640: error: 'nf_ct_frag6_sysctl_header' undeclared (first use in this function)
>>
>>
>> config file is attached.
>
> Should also be fixed by the commit I just pointed you to.
Actually it isn't :-) I'll commit the following to fix this,
thanks!
--------------------
netfilter: Add missing CONFIG_SYSCTL checks in ipv6's nf_conntrack_reasm.c
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/ipv6/netfilter/nf_conntrack_reasm.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 489d71b..3a3f129 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -625,21 +625,24 @@ int nf_ct_frag6_init(void)
inet_frags_init_net(&nf_init_frags);
inet_frags_init(&nf_frags);
+#ifdef CONFIG_SYSCTL
nf_ct_frag6_sysctl_header = register_sysctl_paths(nf_net_netfilter_sysctl_path,
nf_ct_frag6_sysctl_table);
if (!nf_ct_frag6_sysctl_header) {
inet_frags_fini(&nf_frags);
return -ENOMEM;
}
+#endif
return 0;
}
void nf_ct_frag6_cleanup(void)
{
+#ifdef CONFIG_SYSCTL
unregister_sysctl_table(nf_ct_frag6_sysctl_header);
nf_ct_frag6_sysctl_header = NULL;
-
+#endif
inet_frags_fini(&nf_frags);
nf_init_frags.low_thresh = 0;
--
1.7.3.2
^ permalink raw reply related
* Re: linux-next: build failure after merge of the scsi tree
From: James Bottomley @ 2010-10-26 15:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, James Smart, Alex Iannicelli
In-Reply-To: <20101026111944.9139ee1b.sfr@canb.auug.org.au>
On Tue, 2010-10-26 at 11:19 +1100, Stephen Rothwell wrote:
> Hi James,
>
> After merging the scsi tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/scsi/lpfc/lpfc_hbadisc.c: In function 'lpfc_mbx_cmpl_fcf_rr_read_fcf_rec':
> drivers/scsi/lpfc/lpfc_hbadisc.c:2332: error: implicit declaration of function 'msleep'
>
> Caused by commit 2c09c56c0967ff6a0974ebe2b03da39b26073dd0 ("[SCSI] lpfc
> 8.3.18: Add logic to detect last devloss timeout").
>
> I have used the scsi tree from next-20101025 for today.
I've fixed this up in scsi-misc (by adding an explicit delay.h to
lpfc_hbadisc.c). So hopefully the scsi branch should work for the next
build.
James
^ permalink raw reply
* Re: linux-next: manual merge of the swiotlb-xen tree with the tip tree
From: Konrad Rzeszutek Wilk @ 2010-10-26 14:47 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Jeremy Fitzhardinge, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra, Dirk Brandewie
In-Reply-To: <20101026130332.002937e5.sfr@canb.auug.org.au>
On Tue, Oct 26, 2010 at 01:03:32PM +1100, Stephen Rothwell wrote:
> Hi Konrad,
>
> Today's linux-next merge of the swiotlb-xen tree got a conflict in
> arch/x86/include/asm/io_apic.h between commit
> 23f9b267159b4c7ff59d2e6c8ed31693eff841e3 ("x86: apic: Move
> probe_nr_irqs_gsi() into ioapic_init_mappings()") from the tip tree and
> commit 7b586d71858091f0958e5808b7e3d5390c2ae47d ("x86/io_apic: add
> get_nr_irqs_gsi()") from the swiotlb-xen tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thank you.
^ permalink raw reply
* Re: linux-next: Tree for October 6
From: Stephen Rothwell @ 2010-10-26 12:57 UTC (permalink / raw)
To: Ingo Molnar
Cc: Trond Myklebust, Charles Edward Lever, Zimny Lech, linux-next,
LKML, linux-nfs, Linus Torvalds
In-Reply-To: <20101026124113.GA10872@elte.hu>
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
On Tue, 26 Oct 2010 14:41:13 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Actually
Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for October 6
From: Ingo Molnar @ 2010-10-26 12:41 UTC (permalink / raw)
To: Trond Myklebust
Cc: Charles Edward Lever, Zimny Lech, Stephen Rothwell, linux-next,
LKML, linux-nfs, Linus Torvalds
In-Reply-To: <1288096333.3123.9.camel@heimdal.trondhjem.org>
* Trond Myklebust <Trond.Myklebust@netapp.com> wrote:
> Anyhow, does the following fix the bug?
Thanks, trying it.
> Stephen Rothwell reports:
>
> > /home/test/linux-2.6/fs/nfs/nfsroot.c: In function 'nfs_root_debug':
> > /home/test/linux-2.6/fs/nfs/nfsroot.c:110:2: error: 'nfs_debug'
> > undeclared (first use in this function)
> > /home/test/linux-2.6/fs/nfs/nfsroot.c:110:2: note: each undeclared
> > identifier is reported only once for each function it appears in
> > make[3]: *** [fs/nfs/nfsroot.o] Error 1
> > make[2]: *** [fs/nfs] Error 2
> > make[1]: *** [fs] Error 2
> > make: *** [sub-make] Error 2
>
> Which is caused by commit 306a075362a288683f6346185f97dd0e06df19da
> (NFS: Allow NFSROOT debugging messages to be enabled dynamically)
>
> Fix is to disable this code when RPC_DEBUG is disabled.
>
> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
The commit also needs this tag:
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thanks,
Ingo
^ permalink raw reply
* Re: linux-next: Tree for October 6
From: Trond Myklebust @ 2010-10-26 12:32 UTC (permalink / raw)
To: Ingo Molnar, Charles Edward Lever
Cc: Zimny Lech, Stephen Rothwell, linux-next-u79uwXL29TY76Z2rM5mHXA,
LKML, linux-nfs-u79uwXL29TY76Z2rM5mHXA, Linus Torvalds
In-Reply-To: <20101026080822.GA10520-X9Un+BFzKDI@public.gmane.org>
On Tue, 2010-10-26 at 10:08 +0200, Ingo Molnar wrote:
> * Zimny Lech <napohybelskurwysynom2010-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>
> > 2010/10/6 Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>:
> > > Hi all,
> > >
> > > Changes since 20101005:
> >
> > It looka like a bug or a beetle or something like that
> >
> > /home/test/linux-2.6/fs/nfs/nfsroot.c: In function 'nfs_root_debug':
> > /home/test/linux-2.6/fs/nfs/nfsroot.c:110:2: error: 'nfs_debug'
> > undeclared (first use in this function)
> > /home/test/linux-2.6/fs/nfs/nfsroot.c:110:2: note: each undeclared
> > identifier is reported only once for each function it appears in
> > make[3]: *** [fs/nfs/nfsroot.o] Error 1
> > make[2]: *** [fs/nfs] Error 2
> > make[1]: *** [fs] Error 2
> > make: *** [sub-make] Error 2
>
> This build bug has now been pushed upstream and triggers rather easily. Trond?
>
> Thanks,
>
> Ingo
Grrr.... Chuck, I forwarded this report to you almost 3 weeks ago.
Anyhow, does the following fix the bug?
Cheers
Trond
----------------------------------------------------------------------------------------
NFS: Fix a compile issue in nfs_root
From: Trond Myklebust <Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org>
Stephen Rothwell reports:
> /home/test/linux-2.6/fs/nfs/nfsroot.c: In function 'nfs_root_debug':
> /home/test/linux-2.6/fs/nfs/nfsroot.c:110:2: error: 'nfs_debug'
> undeclared (first use in this function)
> /home/test/linux-2.6/fs/nfs/nfsroot.c:110:2: note: each undeclared
> identifier is reported only once for each function it appears in
> make[3]: *** [fs/nfs/nfsroot.o] Error 1
> make[2]: *** [fs/nfs] Error 2
> make[1]: *** [fs] Error 2
> make: *** [sub-make] Error 2
Which is caused by commit 306a075362a288683f6346185f97dd0e06df19da
(NFS: Allow NFSROOT debugging messages to be enabled dynamically)
Fix is to disable this code when RPC_DEBUG is disabled.
Signed-off-by: Trond Myklebust <Trond.Myklebust-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org>
---
fs/nfs/nfsroot.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index 460df36..903908a 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -101,6 +101,7 @@ static char nfs_export_path[NFS_MAXPATHLEN + 1] __initdata = "";
/* server:export path string passed to super.c */
static char nfs_root_device[NFS_MAXPATHLEN + 1] __initdata = "";
+#ifdef RPC_DEBUG
/*
* When the "nfsrootdebug" kernel command line option is specified,
* enable debugging messages for NFSROOT.
@@ -112,6 +113,7 @@ static int __init nfs_root_debug(char *__unused)
}
__setup("nfsrootdebug", nfs_root_debug);
+#endif
/*
* Parse NFS server and directory information passed on the kernel
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" 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
* Re: linux-next: build warnings after merge of the final tree (mtd tree related)
From: David Woodhouse @ 2010-10-26 10:49 UTC (permalink / raw)
To: Stephen Rothwell, H Hartley Sweeten; +Cc: linux-next, linux-kernel
In-Reply-To: <1288083108.29264.14.camel@macbook.infradead.org>
On Tue, 2010-10-26 at 09:51 +0100, David Woodhouse wrote:
> On Tue, 2010-10-26 at 13:49 +1100, Stephen Rothwell wrote:
> >
> > I am not sure where these came from ...
>
> It's a config issue. You have chosen to build NOR flash support.
>
> NOR flash can be wired up many ways. It could be four 8-bit chips in
> parallel in a 32-bit bus, two 16-bit chips in a 32-bit bus, 2 8-bit
> chips in a 16-bit bus, one 16-bit chip in a 16-bus bus, etc...
>
> You have elected to support *none* of those configurations. No NOR chip
> support can work.
>
> You don't get to choose individual geometry options unless you set
> CONFIG_MTD_ADV_OPTIONS -- by default you get a fully versatile driver
> which can cope with anything at runtime.
>
> I'll build a ppc44x_defconfig and work out what's going wrong. I'd
> expect this kind of thing with randconfig, but not a defconfig.
Fixed by reverting the offending commit:
http://git.infradead.org/mtd-2.6.git/commitdiff/6411bf6cd
Thanks.
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply
* Re: linux-next: build warnings after merge of the final tree (mtd tree related)
From: David Woodhouse @ 2010-10-26 9:15 UTC (permalink / raw)
To: Stephen Rothwell, H Hartley Sweeten; +Cc: linux-next, linux-kernel
In-Reply-To: <20101026134959.86b807d1.sfr@canb.auug.org.au>
On Tue, 2010-10-26 at 13:49 +1100, Stephen Rothwell wrote:
> Hi David,
>
> After merging the final tree, today's linux-next build (powerpc
> ppc44x_defconfig) produced these warnings:
>
> In file included from drivers/mtd/mtdchar.c:36:
> include/linux/mtd/map.h:145:2: warning: #warning "No CONFIG_MTD_MAP_BANK_WIDTH_xx selected. No NOR chip support can work"
432dc821c90114f9b0e00f6752a700e937516ade is the first bad commit
commit 432dc821c90114f9b0e00f6752a700e937516ade
Author: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Thu Aug 19 18:18:21 2010 -0700
mtd: cleanup Kconfig dependencies
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply
* Re: linux-next: error importing i2c quilt series
From: Jean Delvare @ 2010-10-26 9:07 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jesse Barnes
In-Reply-To: <20101025211327.9d40f4a1.sfr@canb.auug.org.au>
Hi Stephen,
On Mon, 25 Oct 2010 21:13:27 +1100, Stephen Rothwell wrote:
> Hi Jean,
>
> On Mon, 25 Oct 2010 11:25:19 +0200 Jean Delvare <khali@linux-fr.org> wrote:
> >
> > I thought it was NEXT_BASE, with an underscore not dash?
>
> Ah, yes, sorry ... (but my scripts actually handle either)
>
> > And I also expected the trees to be merged in the order shows in:
> > http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=blob;f=Next/Trees;hb=HEAD
> >
> > As pci is listed before i2c, I (wrongly) concluded that everything
> > would be fine even without using NEXT_BASE. I stand corrected.
>
> What actually happens is
> I fetch all the trees and quilt series
> I import the quilt series to git branches
> I merge the trees.
>
> So you cannot depend on the merge order (which sometimes changes as
> well). This makes sense since I have no influence over the order that
> the trees get merged by Linus ... If there are dependencies, they need to
> be explicit, sorry, using NEXT_BASE in quilt series or merging (sub)
> trees for git.
OK, I take note. I seem to remember that last time I used NEXT_BASE, I
was told that I should only use it if I really had to as it made your
work more difficult and was normally not needed. Maybe I understood you
wrong back then, or maybe things changed meanwhile. Either way, I'll
make sure to use NEXT_BASE from now on each time this seems to be
needed.
--
Jean Delvare
^ permalink raw reply
* Re: linux-next: build warnings after merge of the final tree (mtd tree related)
From: David Woodhouse @ 2010-10-26 8:51 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20101026134959.86b807d1.sfr@canb.auug.org.au>
On Tue, 2010-10-26 at 13:49 +1100, Stephen Rothwell wrote:
>
> I am not sure where these came from ...
It's a config issue. You have chosen to build NOR flash support.
NOR flash can be wired up many ways. It could be four 8-bit chips in
parallel in a 32-bit bus, two 16-bit chips in a 32-bit bus, 2 8-bit
chips in a 16-bit bus, one 16-bit chip in a 16-bus bus, etc...
You have elected to support *none* of those configurations. No NOR chip
support can work.
You don't get to choose individual geometry options unless you set
CONFIG_MTD_ADV_OPTIONS -- by default you get a fully versatile driver
which can cope with anything at runtime.
I'll build a ppc44x_defconfig and work out what's going wrong. I'd
expect this kind of thing with randconfig, but not a defconfig.
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply
* Re: linux-next: Tree for October 6
From: Ingo Molnar @ 2010-10-26 8:08 UTC (permalink / raw)
To: Zimny Lech
Cc: Stephen Rothwell, linux-next, LKML, Trond Myklebust, linux-nfs,
Linus Torvalds
In-Reply-To: <AANLkTimb2NxXcfj-o=F18S1u2rn-o851F+1sgQ_2uOVQ@mail.gmail.com>
* Zimny Lech <napohybelskurwysynom2010@gmail.com> wrote:
> 2010/10/6 Stephen Rothwell <sfr@canb.auug.org.au>:
> > Hi all,
> >
> > Changes since 20101005:
>
> It looka like a bug or a beetle or something like that
>
> /home/test/linux-2.6/fs/nfs/nfsroot.c: In function 'nfs_root_debug':
> /home/test/linux-2.6/fs/nfs/nfsroot.c:110:2: error: 'nfs_debug'
> undeclared (first use in this function)
> /home/test/linux-2.6/fs/nfs/nfsroot.c:110:2: note: each undeclared
> identifier is reported only once for each function it appears in
> make[3]: *** [fs/nfs/nfsroot.o] Error 1
> make[2]: *** [fs/nfs] Error 2
> make[1]: *** [fs] Error 2
> make: *** [sub-make] Error 2
This build bug has now been pushed upstream and triggers rather easily. Trond?
Thanks,
Ingo
^ 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