* Re: linux-next: Tree for October 13
From: Andrew Morton @ 2010-10-14 0:47 UTC (permalink / raw)
To: H. Peter Anvin
Cc: Stephen Rothwell, linux-next, LKML, Ingo Molnar, Thomas Gleixner,
Feng Tang
In-Reply-To: <4CB651A4.60205@zytor.com>
On Wed, 13 Oct 2010 17:41:08 -0700
"H. Peter Anvin" <hpa@zytor.com> wrote:
> On 10/13/2010 05:38 PM, Andrew Morton wrote:
> > On Wed, 13 Oct 2010 15:45:22 +1100
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> >> I have created today's linux-next tree at
> >> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> >
> > In an i386 allmodconfig build, compilation of
> > arch/x86/kernel/early_printk_mrst.c is emitting a call to
> > __this_fixmap_does_not_exist().
>
> Will look at it. Do you happen to have toolchain versions?
>
gcc-4.1.0. Which is actually an officially banned compiler version:
# if __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ <= 1
# error Your version of gcc miscompiles the __weak directive
lazyass here needs to find a new cross-compiler.
^ permalink raw reply
* Re: linux-next: Tree for October 13
From: Feng Tang @ 2010-10-14 9:41 UTC (permalink / raw)
To: Andrew Morton
Cc: H. Peter Anvin, Stephen Rothwell, linux-next@vger.kernel.org,
LKML, Ingo Molnar, Thomas Gleixner
In-Reply-To: <20101013174740.f48e4ec2.akpm@linux-foundation.org>
Hi Andrew,
On Thu, 14 Oct 2010 08:47:40 +0800
Andrew Morton <akpm@linux-foundation.org> wrote:
> On Wed, 13 Oct 2010 17:41:08 -0700
> "H. Peter Anvin" <hpa@zytor.com> wrote:
>
> > On 10/13/2010 05:38 PM, Andrew Morton wrote:
> > > On Wed, 13 Oct 2010 15:45:22 +1100
> > > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > >> I have created today's linux-next tree at
> > >> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> > >
> > > In an i386 allmodconfig build, compilation of
> > > arch/x86/kernel/early_printk_mrst.c is emitting a call to
> > > __this_fixmap_does_not_exist().
> >
> > Will look at it. Do you happen to have toolchain versions?
> >
>
> gcc-4.1.0. Which is actually an officially banned compiler version:
>
> # if __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ <= 1
> # error Your version of gcc miscompiles the __weak directive
>
> lazyass here needs to find a new cross-compiler.
I just compiled with allmodconfig on X86_32 with gcc 4.4.3 (ubuntu 4.4.3-4ubuntu5)
and X86_64 with gcc 4.4.4 (Debian 4.4.4-1), haven't see the error yet.
Thanks,
Feng
^ permalink raw reply
* linux-next: build failure after merge of the spi tree
From: Stephen Rothwell @ 2010-10-14 1:55 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, linux-kernel, Mingkai Hu
[-- Attachment #1: Type: text/plain, Size: 672 bytes --]
Hi Grant,
After merging the spi tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/mtd/devices/m25p80.c: In function 'm25p_probe':
drivers/mtd/devices/m25p80.c:927: error: 'struct device' has no member named 'of_node'
drivers/mtd/devices/m25p80.c:929: error: 'struct device' has no member named 'of_node'
Caused by commit 2bf990280d6074228f6e4c18ad01c0674c5c11c8 ("mtd/m25p80:
add support to parse the partitions by OF node"). CONFIG_OF is not set
for this build.
I have used the spi tree form next-20101013 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
* Re: linux-next: build failure after merge of the spi tree
From: Grant Likely @ 2010-10-14 1:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mingkai Hu
In-Reply-To: <20101014125553.dc4ea7be.sfr@canb.auug.org.au>
On Wed, Oct 13, 2010 at 7:55 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Grant,
>
> After merging the spi tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/mtd/devices/m25p80.c: In function 'm25p_probe':
> drivers/mtd/devices/m25p80.c:927: error: 'struct device' has no member named 'of_node'
> drivers/mtd/devices/m25p80.c:929: error: 'struct device' has no member named 'of_node'
Oops, I wasn't supposed to push that patch yet. I'll pull it out.
g.
>
> Caused by commit 2bf990280d6074228f6e4c18ad01c0674c5c11c8 ("mtd/m25p80:
> add support to parse the partitions by OF node"). CONFIG_OF is not set
> for this build.
>
> I have used the spi tree form next-20101013 for today.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* linux-next: build warning after merge of the spi tree
From: Stephen Rothwell @ 2010-10-14 1:59 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-next, linux-kernel, Masayuki Ohtake
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
Hi Grant,
After merging the rcu tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:
drivers/spi/spi_topcliff_pch.c: In function 'pch_spi_process_messages':
drivers/spi/spi_topcliff_pch.c:752: warning: 'data' is used uninitialized in this function
and, indeed it is ...
--
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: manual merge of the tip tree with the sh tree
From: Stephen Rothwell @ 2010-10-14 2:19 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Paul Mundt
Hi all,
Today's linux-next merge of the tip tree got a conflict in
arch/sh/kernel/perf_event.c between commit
51c6c9bb34fcd112d4ab8b8f5c1d1b6a10a00e71 ("sh: perf: Set up
perf_max_events") from the sh tree and commit
a4eaf7f14675cb512d69f0c928055e73d0c6d252 ("perf: Rework the PMU methods")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/sh/kernel/perf_event.c
index ecef1fe,036f7a9..0000000
--- a/arch/sh/kernel/perf_event.c
+++ b/arch/sh/kernel/perf_event.c
@@@ -319,13 -365,13 +365,14 @@@ int __cpuinit register_sh_pmu(struct sh
{
if (sh_pmu)
return -EBUSY;
- sh_pmu = pmu;
+ sh_pmu = _pmu;
- pr_info("Performance Events: %s support registered\n", pmu->name);
+ pr_info("Performance Events: %s support registered\n", _pmu->name);
- WARN_ON(pmu->num_events > MAX_HWEVENTS);
- perf_max_events = pmu->num_events;
+ WARN_ON(_pmu->num_events > MAX_HWEVENTS);
++ perf_max_events = _pmu->num_events;
+ perf_pmu_register(&pmu);
perf_cpu_notifier(sh_pmu_notifier);
return 0;
}
^ permalink raw reply
* Re: linux-next: Tree for October 13
From: Tony Breeds @ 2010-10-14 2:55 UTC (permalink / raw)
To: Andrew Morton
Cc: H. Peter Anvin, Stephen Rothwell, linux-next, LKML, Ingo Molnar,
Thomas Gleixner, Feng Tang
In-Reply-To: <20101013174740.f48e4ec2.akpm@linux-foundation.org>
On Wed, Oct 13, 2010 at 05:47:40PM -0700, Andrew Morton wrote:
> gcc-4.1.0. Which is actually an officially banned compiler version:
>
> # if __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ <= 1
> # error Your version of gcc miscompiles the __weak directive
>
> lazyass here needs to find a new cross-compiler.
*cough*
http://kernel.org/pub/tools/crosstool/files/bin/
If there are problems let me know.
Yours Tony
^ permalink raw reply
* linux-next: Tree for October 14
From: Stephen Rothwell @ 2010-10-14 4:26 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 11417 bytes --]
Hi all,
Changes since 20101013:
The kvm tree lost its conflicts.
The drm tree lost its conflicts.
The spi tree gained a build failure so I used the version from
next-20101014.
The tip tree gained a conflict against the sh tree,
----------------------------------------------------------------------------
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
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-cpuimx27.c
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
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
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
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
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
Applying: xfs: fix up mismerge of __xfs_inode_clear_reclaim_tag
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 swiotlb-xen/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging wireless/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3pandora.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom-peripherals.c
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/if_sdio.c
Merging net/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (delete/modify): drivers/ieee1394/eth1394.c deleted in HEAD and modified in net/master. Version net/master of drivers/ieee1394/eth1394.c left in tree.
$ git rm -f drivers/ieee1394/eth1394.c
Merging mtd/master
Merging crypto/master
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
Merging sound-asoc/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dev-audio.c
CONFLICT (content): Merge conflict in drivers/video/sh_mobile_hdmi.c
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
CONFLICT (content): Merge conflict in drivers/input/keyboard/Kconfig
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ext4/mballoc.c
Applying: ext4: merge fix for blkdev_issue_zeroout API change
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/smc91c92_cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
CONFLICT (content): Merge conflict in drivers/char/sysrq.c
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/sh_mobile_sdhi.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in net/irda/irnet/irnet_ppp.c
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
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
CONFLICT (content): Merge conflict in MAINTAINERS
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
$ git reset --hard HEAD^
Merging refs/next/20101013/spi
Merging omap_dss2/for-next
Merging xen/upstream/xen
Merging rcu/rcu/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/sh/kernel/perf_event.c
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in net/core/dev.c
Merging edac-amd/for-next
Merging oprofile/for-next
CONFLICT (content): Merge conflict in arch/arm/oprofile/common.c
CONFLICT (content): Merge conflict in kernel/perf_event.c
Applying: perf events: fix up merge conflict
Merging percpu/for-next
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in mm/percpu.c
Merging workqueues/for-next
CONFLICT (content): Merge conflict in fs/gfs2/main.c
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 drivers/usb/gadget/rndis.c
Applying: scsi/sd: update for hw_sector_size rename
Merging staging-next/staging-next
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 (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.
$ 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
CONFLICT (content): Merge conflict in drivers/block/ataflop.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4000_cs.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4040_cs.c
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
Merging bkl-llseek/llseek
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb4/device.c
Merging bkl-vfs/vfs
CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c
CONFLICT (content): Merge conflict in fs/nilfs2/super.c
Merging bkl-config/config
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
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
* Re: linux-next: build warning after merge of the spi tree
From: Grant Likely @ 2010-10-14 5:00 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Masayuki Ohtake
In-Reply-To: <20101014125952.e4be4c9b.sfr@canb.auug.org.au>
On Thu, Oct 14, 2010 at 12:59:52PM +1100, Stephen Rothwell wrote:
> Hi Grant,
>
> After merging the rcu tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
>
> drivers/spi/spi_topcliff_pch.c: In function 'pch_spi_process_messages':
> drivers/spi/spi_topcliff_pch.c:752: warning: 'data' is used uninitialized in this function
>
> and, indeed it is ...
Oops, so it is. I messed that up in the refactoring patch.
Fortunately this is a new driver so it is not a regression. I'll push
out the fix this evening.
g.
^ permalink raw reply
* linux-next: build failure after merge of the final tree (tip tree related)
From: Stephen Rothwell @ 2010-10-14 5:49 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
Hi all,
After merging the final tree, linux-next builds (arm corgi_defconfig,
spitz_defconfig) fail like this:
arch/arm/kernel/perf_event.c: In function 'armpmu_event_init':
arch/arm/kernel/perf_event.c:543: error: request for member 'num_events' in something not a structure or union
Caused by commit 15ac9a395a753cb28c674e7ea80386ffdff21785 ("perf: Remove
the sysfs bits").
This seems to have broken in next-20100913 and noone has noticed/bothered
to fix it.
--
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 failure after merge of the final tree (tip tree related)
From: Ingo Molnar @ 2010-10-14 6:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, H. Peter Anvin, Peter Zijlstra, linux-next,
linux-kernel
In-Reply-To: <20101014164925.4fa16b75.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the final tree, linux-next builds (arm corgi_defconfig,
> spitz_defconfig) fail like this:
>
> arch/arm/kernel/perf_event.c: In function 'armpmu_event_init':
> arch/arm/kernel/perf_event.c:543: error: request for member 'num_events' in something
not a structure or union
>
> Caused by commit 15ac9a395a753cb28c674e7ea80386ffdff21785 ("perf: Remove
> the sysfs bits").
Thanks, fixed.
> This seems to have broken in next-20100913 and noone has noticed/bothered
> to fix it.
What appears to have happened is the following: the build bug depends on
CONFIG_HW_PERF_EVENTS=y, which is off by default on ARM (which default
to a v5 CPU type - while hw pmu support is for v6+ cpus).
So the regular ARM defconfig built fine both in -next and here in the
latest perf/core tree:
testing arm: -git: pass ( 0), -tip: pass ( 4)
Some new change in linux-next appears to have turned on HW_PERF_EVENTS
elsewhere which you thus tested for the first time - which triggered the
build bug.
Thanks,
Ingo
^ permalink raw reply
* [PATCH] staging: iio: ad7476: fix !CONFIG_IIO_RING_BUFFER build issue reported by Randy Dunlap
From: michael.hennerich @ 2010-10-14 8:17 UTC (permalink / raw)
To: greg
Cc: linux-iio, drivers, jic23, device-drivers-devel, randy.dunlap,
devel, sfr, linux-next, Michael Hennerich
From: Michael Hennerich <michael.hennerich@analog.com>
Fix function function decalration
Enable CONFIG_IIO_RING_BUFFER for the ad7476 driver
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
---
drivers/staging/iio/adc/Kconfig | 3 +++
drivers/staging/iio/adc/ad7476.h | 4 +---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index 81a7d45..acb6767 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -50,6 +50,9 @@ config AD799X_RING_BUFFER
config AD7476
tristate "Analog Devices AD7475/6/7/8 AD7466/7/8 and AD7495 ADC driver"
depends on SPI
+ select IIO_RING_BUFFER
+ select IIO_SW_RING
+ select IIO_TRIGGER
help
Say yes here to build support for Analog Devices
AD7475, AD7476, AD7477, AD7478, AD7466, AD7467, AD7468, AD7495
diff --git a/drivers/staging/iio/adc/ad7476.h b/drivers/staging/iio/adc/ad7476.h
index 6e4a85b..b51b49e 100644
--- a/drivers/staging/iio/adc/ad7476.h
+++ b/drivers/staging/iio/adc/ad7476.h
@@ -59,9 +59,7 @@ int ad7476_scan_from_ring(struct ad7476_state *st);
int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev);
void ad7476_ring_cleanup(struct iio_dev *indio_dev);
#else /* CONFIG_IIO_RING_BUFFER */
-static inline ssize_t ad7476_scan_from_ring(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static inline int ad7476_scan_from_ring(struct ad7476_state *st)
{
return 0;
}
--
1.6.0.2
^ permalink raw reply related
* Re: linux-next: Tree for October 13 (staging/iio)
From: Jonathan Cameron @ 2010-10-14 10:21 UTC (permalink / raw)
To: Hennerich, Michael
Cc: Randy Dunlap, Stephen Rothwell, driverdevel,
linux-next@vger.kernel.org, LKML, gregkh@suse.de,
linux-iio@vger.kernel.org, Drivers
In-Reply-To: <544AC56F16B56944AEC3BD4E3D59177130943738AE@LIMKCMBX1.ad.analog.com>
On 10/13/10 20:07, Hennerich, Michael wrote:
> Randy Dunlap wrote on 2010-10-13:
>> On Wed, 13 Oct 2010 15:45:22 +1100 Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20101012:
>>
>>
>> drivers/staging/iio/adc/ad7476.h:62: note: expected 'struct device *'
>> but argument is of type 'struct ad7476_state *'
>> drivers/staging/iio/adc/ad7476_core.c:48: error: too few arguments to
>> function 'ad7476_scan_from_ring'
>
> Thanks!
>
> That's due to an old prototype active when CONFIG_IIO_RING_BUFFER is not set.
> I'll fix that.
>
>> drivers/staging/iio/adc/ad7476_core.c: At top level:
>> drivers/staging/iio/adc/ad7476_core.c:102: error:
>> 'IIO_SCAN_EL_TYPE_UNSIGNED' undeclared here (not in a function)
>
> Jonathan,
>
> Do we really need to guard the entire ring_generic.h header with
>
> #ifdef CONFIG_IIO_RING_BUFFER
> ...
>
> Some of these might be used, even when CONFIG_IIO_RING_BUFFER is not set.
> Or do we really need CONFIG_IIO_RING_BUFFER at all.
> Why not always provide it?
It's a fairly big chunk of code and I suspect a fair few of our users
(all the light sensors for starters) won't want it at all. If anything
I'm keen to do a bit of reorganization of other bits of the core to
further cut down on the minimum present.
Move relevant functions out as needed or put stubs in place. Perhaps we
can revisiting this question down the line, but I don't think we want to
make buffer support obligatory at the moment.
Jonathan
>
>>
>> config is attached.
>>
>> ---
>> ~Randy
>> *** Remember to use Documentation/SubmitChecklist when testing your
>> code ***
>
> Greetings,
> Michael
>
> Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
> Sitz der Gesellschaft Muenchen, Registergericht Muenchen HRB 4036 Geschaeftsfuehrer Thomas Wessel, William A. Martin, Margaret Seif
>
>
>
^ permalink raw reply
* Re: [PATCH] staging: iio: ad7476: fix !CONFIG_IIO_RING_BUFFER build issue reported by Randy Dunlap
From: Jonathan Cameron @ 2010-10-14 10:22 UTC (permalink / raw)
To: michael.hennerich
Cc: greg, linux-iio, drivers, device-drivers-devel, randy.dunlap,
devel, sfr, linux-next
In-Reply-To: <1287044238-20220-1-git-send-email-michael.hennerich@analog.com>
On 10/14/10 09:17, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
>
> Fix function function decalration
> Enable CONFIG_IIO_RING_BUFFER for the ad7476 driver
>
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
> ---
> drivers/staging/iio/adc/Kconfig | 3 +++
> drivers/staging/iio/adc/ad7476.h | 4 +---
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
> index 81a7d45..acb6767 100644
> --- a/drivers/staging/iio/adc/Kconfig
> +++ b/drivers/staging/iio/adc/Kconfig
> @@ -50,6 +50,9 @@ config AD799X_RING_BUFFER
> config AD7476
> tristate "Analog Devices AD7475/6/7/8 AD7466/7/8 and AD7495 ADC driver"
> depends on SPI
> + select IIO_RING_BUFFER
> + select IIO_SW_RING
> + select IIO_TRIGGER
> help
> Say yes here to build support for Analog Devices
> AD7475, AD7476, AD7477, AD7478, AD7466, AD7467, AD7468, AD7495
> diff --git a/drivers/staging/iio/adc/ad7476.h b/drivers/staging/iio/adc/ad7476.h
> index 6e4a85b..b51b49e 100644
> --- a/drivers/staging/iio/adc/ad7476.h
> +++ b/drivers/staging/iio/adc/ad7476.h
> @@ -59,9 +59,7 @@ int ad7476_scan_from_ring(struct ad7476_state *st);
> int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev);
> void ad7476_ring_cleanup(struct iio_dev *indio_dev);
> #else /* CONFIG_IIO_RING_BUFFER */
If you are selecting the ring buffer (which is fine), then why do you need
anything to be in this else? The buffer will always be there.
Maybe I'm missing something?
> -static inline ssize_t ad7476_scan_from_ring(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> +static inline int ad7476_scan_from_ring(struct ad7476_state *st)
> {
> return 0;
> }
^ permalink raw reply
* RE: [PATCH] staging: iio: ad7476: fix !CONFIG_IIO_RING_BUFFER build issue reported by Randy Dunlap
From: Hennerich, Michael @ 2010-10-14 11:06 UTC (permalink / raw)
To: Jonathan Cameron
Cc: greg@kroah.com, linux-iio@vger.kernel.org, Drivers,
device-drivers-devel@blackfin.uclinux.org,
randy.dunlap@oracle.com, devel@driverdev.osuosl.org,
sfr@canb.auug.org.au, linux-next@vger.kernel.org
In-Reply-To: <4CB6D9F8.9090107@cam.ac.uk>
Jonathan Cameron wrote on 2010-10-14:
> On 10/14/10 09:17, michael.hennerich@analog.com wrote:
>> From: Michael Hennerich <michael.hennerich@analog.com>
>>
>> Fix function function decalration
>> Enable CONFIG_IIO_RING_BUFFER for the ad7476 driver
>>
>> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
>> ---
>> drivers/staging/iio/adc/Kconfig | 3 +++
>> drivers/staging/iio/adc/ad7476.h | 4 +---
>> 2 files changed, 4 insertions(+), 3 deletions(-)
>> diff --git a/drivers/staging/iio/adc/Kconfig
>> b/drivers/staging/iio/adc/Kconfig index 81a7d45..acb6767 100644
>> --- a/drivers/staging/iio/adc/Kconfig
>> +++ b/drivers/staging/iio/adc/Kconfig
>> @@ -50,6 +50,9 @@ config AD799X_RING_BUFFER config AD7476
>> tristate "Analog Devices AD7475/6/7/8 AD7466/7/8 and AD7495 ADC
>> driver" depends on SPI
>> + select IIO_RING_BUFFER
>> + select IIO_SW_RING
>> + select IIO_TRIGGER
>> help
>> Say yes here to build support for Analog Devices
>> AD7475, AD7476, AD7477, AD7478, AD7466, AD7467, AD7468, AD7495
>> diff --git a/drivers/staging/iio/adc/ad7476.h
>> b/drivers/staging/iio/adc/ad7476.h
>> index 6e4a85b..b51b49e 100644
>> --- a/drivers/staging/iio/adc/ad7476.h
>> +++ b/drivers/staging/iio/adc/ad7476.h
>> @@ -59,9 +59,7 @@ int ad7476_scan_from_ring(struct ad7476_state
>> *st); int ad7476_register_ring_funcs_and_init(struct iio_dev
>> *indio_dev); void ad7476_ring_cleanup(struct iio_dev *indio_dev);
>> #else /* CONFIG_IIO_RING_BUFFER */
>
> If you are selecting the ring buffer (which is fine), then why do you
> need anything to be in this else? The buffer will always be there.
>
> Maybe I'm missing something?
Selecting the ringbuffer was a straight way to avoid the configuration
dependency build issue.
You're right, this is currently dead code. But I thought I leave it there, until
reorganization of the ringbuffer include file.
Once this is done, I'll revert and make the ringbuffer optional again.
>> -static inline ssize_t ad7476_scan_from_ring(struct device *dev,
>> - struct device_attribute *attr,
>> - char *buf)
>> +static inline int ad7476_scan_from_ring(struct ad7476_state *st)
>> {
>> return 0;
>> }
Greetings,
Michael
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft Muenchen, Registergericht Muenchen HRB 4036 Geschaeftsfuehrer Thomas Wessel, William A. Martin, Margaret Seif
^ permalink raw reply
* Re: [PATCH] staging: iio: ad7476: fix !CONFIG_IIO_RING_BUFFER build issue reported by Randy Dunlap
From: Jonathan Cameron @ 2010-10-14 11:20 UTC (permalink / raw)
To: Hennerich, Michael
Cc: greg@kroah.com, linux-iio@vger.kernel.org, Drivers,
device-drivers-devel@blackfin.uclinux.org,
randy.dunlap@oracle.com, devel@driverdev.osuosl.org,
sfr@canb.auug.org.au, linux-next@vger.kernel.org
In-Reply-To: <544AC56F16B56944AEC3BD4E3D5917713094373A4C@LIMKCMBX1.ad.analog.com>
On 10/14/10 12:06, Hennerich, Michael wrote:
> Jonathan Cameron wrote on 2010-10-14:
>> On 10/14/10 09:17, michael.hennerich@analog.com wrote:
>>> From: Michael Hennerich <michael.hennerich@analog.com>
>>>
>>> Fix function function decalration
>>> Enable CONFIG_IIO_RING_BUFFER for the ad7476 driver
>>>
>>> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
>>> ---
>>> drivers/staging/iio/adc/Kconfig | 3 +++
>>> drivers/staging/iio/adc/ad7476.h | 4 +---
>>> 2 files changed, 4 insertions(+), 3 deletions(-)
>>> diff --git a/drivers/staging/iio/adc/Kconfig
>>> b/drivers/staging/iio/adc/Kconfig index 81a7d45..acb6767 100644
>>> --- a/drivers/staging/iio/adc/Kconfig
>>> +++ b/drivers/staging/iio/adc/Kconfig
>>> @@ -50,6 +50,9 @@ config AD799X_RING_BUFFER config AD7476
>>> tristate "Analog Devices AD7475/6/7/8 AD7466/7/8 and AD7495 ADC
>>> driver" depends on SPI
>>> + select IIO_RING_BUFFER
>>> + select IIO_SW_RING
>>> + select IIO_TRIGGER
>>> help
>>> Say yes here to build support for Analog Devices
>>> AD7475, AD7476, AD7477, AD7478, AD7466, AD7467, AD7468, AD7495
>>> diff --git a/drivers/staging/iio/adc/ad7476.h
>>> b/drivers/staging/iio/adc/ad7476.h
>>> index 6e4a85b..b51b49e 100644
>>> --- a/drivers/staging/iio/adc/ad7476.h
>>> +++ b/drivers/staging/iio/adc/ad7476.h
>>> @@ -59,9 +59,7 @@ int ad7476_scan_from_ring(struct ad7476_state
>>> *st); int ad7476_register_ring_funcs_and_init(struct iio_dev
>>> *indio_dev); void ad7476_ring_cleanup(struct iio_dev *indio_dev);
>>> #else /* CONFIG_IIO_RING_BUFFER */
>>
>> If you are selecting the ring buffer (which is fine), then why do you
>> need anything to be in this else? The buffer will always be there.
>>
>> Maybe I'm missing something?
> Selecting the ringbuffer was a straight way to avoid the configuration
> dependency build issue.
> You're right, this is currently dead code. But I thought I leave it there, until
> reorganization of the ringbuffer include file.
> Once this is done, I'll revert and make the ringbuffer optional again.
Sensible argument, so I'm happy.
>>> -static inline ssize_t ad7476_scan_from_ring(struct device *dev,
>>> - struct device_attribute *attr,
>>> - char *buf)
>>> +static inline int ad7476_scan_from_ring(struct ad7476_state *st)
>>> {
>>> return 0;
>>> }
>
> Greetings,
> Michael
>
> Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
> Sitz der Gesellschaft Muenchen, Registergericht Muenchen HRB 4036 Geschaeftsfuehrer Thomas Wessel, William A. Martin, Margaret Seif
>
>
>
^ permalink raw reply
* Re: [PATCH/RFC] input: hil_mlc - Fix hil_mlc_serio_id file2alias failure
From: Kyle McMartin @ 2010-10-14 15:43 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Geert Uytterhoeven, Dzianis Kahanovich, Helge Deller, linux-next,
linux-input, Linux/m68k, linux-parisc
In-Reply-To: <20101013065602.GA7014@core.coreip.homeip.net>
On Tue, Oct 12, 2010 at 11:56:02PM -0700, Dmitry Torokhov wrote:
> Gah, that original patch was incorrect, I should not have applied it at
> all... The serio_device_id in question is for serio port that is being
> created by the driver and thus of course should not be used in
> MODULE_DEVICE_TABLE().
>
> I'll drop it from my 'next' queue.
>
Cool, thansk Dmitry!
--Kyle
^ permalink raw reply
* [PATCH -next] x86: olpc-xo1 uses/depends on PCI
From: Randy Dunlap @ 2010-10-14 17:13 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Drake, akpm; +Cc: linux-next, LKML, x86
In-Reply-To: <20101014152642.ef280a33.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
olpc-xo1 uses pci_*() interfaces so it should depend on PCI.
arch/x86/kernel/olpc-xo1.c:65: error: implicit declaration of function 'pci_enable_device_io'
arch/x86/kernel/olpc-xo1.c:71: error: implicit declaration of function 'pci_request_region'
arch/x86/kernel/olpc-xo1.c:80: error: implicit declaration of function 'pci_release_region'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Daniel Drake <dsd@laptop.org>
---
arch/x86/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20101014.orig/arch/x86/Kconfig
+++ linux-next-20101014/arch/x86/Kconfig
@@ -2018,7 +2018,7 @@ config OLPC
config OLPC_XO1
tristate "OLPC XO-1 support"
- depends on OLPC
+ depends on OLPC && PCI
---help---
Add support for non-essential features of the OLPC XO-1 laptop.
^ permalink raw reply
* linux-next: build failure after merge of the net tree
From: Stephen Rothwell @ 2010-10-15 0:38 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Emil Tantilov, Jeff Kirsher
[-- Attachment #1: Type: text/plain, Size: 569 bytes --]
Hi all,
After merging the net tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/net/ixgbe/ixgbe_main.c: In function 'ixgbe_configure_dcb':
drivers/net/ixgbe/ixgbe_main.c:3377: error: implicit declaration of function 'ixgbe_dcb_check_config'
Caused by commit f32f837b75233588cd4f8542214a30915ab7847b ("ixgbe: remove
unused functions").
Grep is your friend :-)
I have used the net tree from next-20101014 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: manual merge of the sound-asoc tree with Linus' tree
From: Stephen Rothwell @ 2010-10-15 0:52 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Timur Tabi, Kumar Gala
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
arch/powerpc/platforms/85xx/p1022_ds.c between commit
dc1c41f450a5f201f1d8c19aef32319f3b84c273 ("powerpc/85xx: Fix compile
issue with p1022_ds due to lmb rename to memblock") from Linus' tree and
commit 2c184cd393d1410bb43ac656a6480849fe886b1d ("powerpc/85xx: add DIU
support to the Freecale P1022DS reference board") from the sound-asoc
tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/powerpc/platforms/85xx/p1022_ds.c
index 2b390d1,e984d4e..0000000
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@@ -19,8 -18,9 +18,9 @@@
#include <linux/pci.h>
#include <linux/of_platform.h>
-#include <linux/lmb.h>
#include <linux/memblock.h>
+
+ #include <asm/div64.h>
#include <asm/mpic.h>
#include <asm/swiotlb.h>
^ permalink raw reply
* linux-next: manual merge of the drm tree with Linus' tree
From: Stephen Rothwell @ 2010-10-15 1:54 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Jerome Glisse, Alex Deucher
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/r600_blit_kms.c between commit
c919b371cb734f42b1130e706ecee262f8d9261d ("drm/radeon/kms: avoid corner
case issue with unmappable vram V2") from Linus' tree and commit
b70d6bb3f67b2e2964abafb0117f1733f062cba5 ("drm/radeon/kms: clean up
r6xx/r7xx blit init (v2)") from the drm tree.
Just context. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/drm/radeon/r600_blit_kms.c
index 3473c007,2a4747d..0000000
--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
@@@ -532,7 -533,18 +533,19 @@@ int r600_blit_init(struct radeon_devic
memcpy(ptr + rdev->r600_blit.ps_offset, r6xx_ps, r6xx_ps_size * 4);
radeon_bo_kunmap(rdev->r600_blit.shader_obj);
radeon_bo_unreserve(rdev->r600_blit.shader_obj);
+ rdev->mc.active_vram_size = rdev->mc.real_vram_size;
+
+ done:
+ r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
+ if (unlikely(r != 0))
+ return r;
+ r = radeon_bo_pin(rdev->r600_blit.shader_obj, RADEON_GEM_DOMAIN_VRAM,
+ &rdev->r600_blit.shader_gpu_addr);
+ radeon_bo_unreserve(rdev->r600_blit.shader_obj);
+ if (r) {
+ dev_err(rdev->dev, "(%d) pin blit object failed\n", r);
+ return r;
+ }
return 0;
}
^ permalink raw reply
* linux-next: manual merge of the spi tree with the tegra tree
From: Stephen Rothwell @ 2010-10-15 2:25 UTC (permalink / raw)
To: Grant Likely
Cc: linux-next, linux-kernel, Erik Gilling, Colin Cross,
Olof Johansson, Masayuki Ohtake
Hi Grant,
Today's linux-next merge of the spi tree got a conflict in
drivers/spi/Kconfig drivers/spi/Makefile between commit
f4fe02ee997ac4dca9d0888d1d1b8ceb29aae7d6 ("spi: add spi_tegra driver")
from the tegra tree and commit e8b17b5b3f30252b5470dbbf54bc251ddc7fac17
("spi/topcliff: Add topcliff platform controller hub (PCH) spi bus
driver") from the spi 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
diff --cc drivers/spi/Kconfig
index b806078,9949c25..0000000
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -314,13 -313,13 +329,20 @@@ config SPI_STMP3XX
help
SPI driver for Freescale STMP37xx/378x SoC SSP interface
+config SPI_TEGRA
+ tristate "Nvidia Tegra SPI controller"
+ depends on ARCH_TEGRA
+ select TEGRA_SYSTEM_DMA
+ help
+ SPI driver for NVidia Tegra SoCs
+
+ config SPI_TOPCLIFF_PCH
+ tristate "Topcliff PCH SPI Controller"
+ depends on PCI
+ help
+ SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus
+ used in some x86 embedded processors.
+
config SPI_TXX9
tristate "Toshiba TXx9 SPI controller"
depends on GENERIC_GPIO && CPU_TX49XX
diff --cc drivers/spi/Makefile
index b6573d8,557aaad..0000000
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@ -39,7 -39,7 +39,8 @@@ obj-$(CONFIG_SPI_PPC4xx) += spi_ppc4xx
obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o
obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx_hw.o
obj-$(CONFIG_SPI_S3C64XX) += spi_s3c64xx.o
+obj-$(CONFIG_SPI_TEGRA) += spi_tegra.o
+ obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi_topcliff_pch.o
obj-$(CONFIG_SPI_TXX9) += spi_txx9.o
obj-$(CONFIG_SPI_XILINX) += xilinx_spi.o
obj-$(CONFIG_SPI_XILINX_OF) += xilinx_spi_of.o
^ permalink raw reply
* Re: linux-next: manual merge of the spi tree with the tegra tree
From: Grant Likely @ 2010-10-15 3:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Erik Gilling, Colin Cross,
Olof Johansson, Masayuki Ohtake
In-Reply-To: <20101015132534.f95d5a42.sfr@canb.auug.org.au>
On Thu, Oct 14, 2010 at 8:25 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Grant,
>
> Today's linux-next merge of the spi tree got a conflict in
> drivers/spi/Kconfig drivers/spi/Makefile between commit
> f4fe02ee997ac4dca9d0888d1d1b8ceb29aae7d6 ("spi: add spi_tegra driver")
> from the tegra tree and commit e8b17b5b3f30252b5470dbbf54bc251ddc7fac17
> ("spi/topcliff: Add topcliff platform controller hub (PCH) spi bus
> driver") from the spi tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks Stephen. Yes, please carry the fix for the time being.
g.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/spi/Kconfig
> index b806078,9949c25..0000000
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@@ -314,13 -313,13 +329,20 @@@ config SPI_STMP3XX
> help
> SPI driver for Freescale STMP37xx/378x SoC SSP interface
>
> +config SPI_TEGRA
> + tristate "Nvidia Tegra SPI controller"
> + depends on ARCH_TEGRA
> + select TEGRA_SYSTEM_DMA
> + help
> + SPI driver for NVidia Tegra SoCs
> +
> + config SPI_TOPCLIFF_PCH
> + tristate "Topcliff PCH SPI Controller"
> + depends on PCI
> + help
> + SPI driver for the Topcliff PCH (Platform Controller Hub) SPI bus
> + used in some x86 embedded processors.
> +
> config SPI_TXX9
> tristate "Toshiba TXx9 SPI controller"
> depends on GENERIC_GPIO && CPU_TX49XX
> diff --cc drivers/spi/Makefile
> index b6573d8,557aaad..0000000
> --- a/drivers/spi/Makefile
> +++ b/drivers/spi/Makefile
> @@@ -39,7 -39,7 +39,8 @@@ obj-$(CONFIG_SPI_PPC4xx) += spi_ppc4xx
> obj-$(CONFIG_SPI_S3C24XX_GPIO) += spi_s3c24xx_gpio.o
> obj-$(CONFIG_SPI_S3C24XX) += spi_s3c24xx_hw.o
> obj-$(CONFIG_SPI_S3C64XX) += spi_s3c64xx.o
> +obj-$(CONFIG_SPI_TEGRA) += spi_tegra.o
> + obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi_topcliff_pch.o
> obj-$(CONFIG_SPI_TXX9) += spi_txx9.o
> obj-$(CONFIG_SPI_XILINX) += xilinx_spi.o
> obj-$(CONFIG_SPI_XILINX_OF) += xilinx_spi_of.o
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* Re: linux-next: build failure after merge of the net tree
From: Jeff Kirsher @ 2010-10-14 22:07 UTC (permalink / raw)
To: Stephen Rothwell, Harvey Harrison
Cc: David Miller, netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Tantilov, Emil S
In-Reply-To: <20101015113854.ae080284.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 631 bytes --]
On Thu, 2010-10-14 at 17:38 -0700, Stephen Rothwell wrote:
> Hi all,
>
> After merging the net tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/net/ixgbe/ixgbe_main.c: In function 'ixgbe_configure_dcb':
> drivers/net/ixgbe/ixgbe_main.c:3377: error: implicit declaration of function 'ixgbe_dcb_check_config'
>
> Caused by commit f32f837b75233588cd4f8542214a30915ab7847b ("ixgbe: remove
> unused functions").
>
> Grep is your friend :-)
>
> I have used the net tree from next-20101014 for today.
I apologize, this is my fault. I have a patch coming to resolved the
issue.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* linux-next: Tree for October 15
From: Stephen Rothwell @ 2010-10-15 5:50 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 12205 bytes --]
Hi all,
Changes since 20101014:
The net tree gained a build failure so I used the version from
next-20101014.
The sound-asoc tree gained a conflict against Linus' tree.
The drm tree gained a conflict against Linus' tree.
The spi tree lost its build failure but gained a conflict against the
tegra tree.
----------------------------------------------------------------------------
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
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-cpuimx27.c
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
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
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
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
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
Applying: xfs: fix up mismerge of __xfs_inode_clear_reclaim_tag
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 swiotlb-xen/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging wireless/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3pandora.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom-peripherals.c
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/if_sdio.c
Merging net/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (delete/modify): drivers/ieee1394/eth1394.c deleted in HEAD and modified in net/master. Version net/master of drivers/ieee1394/eth1394.c left in tree.
$ git rm -f drivers/ieee1394/eth1394.c
$ git reset --hard HEAD^
Merging refs/next/20101014/net
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (delete/modify): drivers/ieee1394/eth1394.c deleted in HEAD and modified in refs/next/20101014/net. Version refs/next/20101014/net of drivers/ieee1394/eth1394.c left in tree.
$ git rm -f drivers/ieee1394/eth1394.c
[master c0bdbae] Merge commit 'refs/next/20101014/net'
Merging mtd/master
Merging crypto/master
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
Merging sound-asoc/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dev-audio.c
CONFLICT (content): Merge conflict in arch/powerpc/platforms/85xx/p1022_ds.c
CONFLICT (content): Merge conflict in drivers/video/sh_mobile_hdmi.c
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
CONFLICT (content): Merge conflict in drivers/input/keyboard/Kconfig
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ext4/mballoc.c
Applying: ext4: merge fix for blkdev_issue_zeroout API change
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/smc91c92_cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
CONFLICT (content): Merge conflict in drivers/char/sysrq.c
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/sh_mobile_sdhi.c
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r600_blit_kms.c
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in net/irda/irnet/irnet_ppp.c
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
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
CONFLICT (content): Merge conflict in MAINTAINERS
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
CONFLICT (content): Merge conflict in drivers/spi/Kconfig
CONFLICT (content): Merge conflict in drivers/spi/Makefile
Merging omap_dss2/for-next
Merging xen/upstream/xen
Merging rcu/rcu/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/sh/kernel/perf_event.c
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in net/core/dev.c
Merging edac-amd/for-next
Merging oprofile/for-next
CONFLICT (content): Merge conflict in arch/arm/oprofile/common.c
CONFLICT (content): Merge conflict in kernel/perf_event.c
Applying: perf events: fix up merge conflict
Merging percpu/for-next
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in mm/percpu.c
Merging workqueues/for-next
CONFLICT (content): Merge conflict in fs/gfs2/main.c
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 drivers/usb/gadget/rndis.c
Applying: scsi/sd: update for hw_sector_size rename
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 (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.
$ 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
CONFLICT (content): Merge conflict in drivers/block/ataflop.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4000_cs.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4040_cs.c
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
Merging bkl-llseek/llseek
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb4/device.c
Merging bkl-vfs/vfs
CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c
CONFLICT (content): Merge conflict in fs/nilfs2/super.c
Merging bkl-config/config
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
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
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