* Re: [PATCH] percpu: add dummy pcpu_lpage_remapped() for !CONFIG_SMP
From: Kamalesh Babulal @ 2009-07-15 16:25 UTC (permalink / raw)
To: Tejun Heo; +Cc: Stephen Rothwell, linux-next, lkml, Randy Dunlap
In-Reply-To: <4A5DEA0D.8050706@gmail.com>
* Tejun Heo <htejun@gmail.com> [2009-07-15 23:39:09]:
> !CONFIG_SMP was missing pcpu_lpage_remapped() definition causing build
> failure. Add dummy implementation. This was discovered by linux-next
> testing.
>
Thanks, the patch fixes the build failure.
Tested-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> Cc: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> Yeap, it was missing dummy definition on !CONFIG_SMP. This patch
> fixes it. Committed to percpu#for-next. Thanks.
>
> include/linux/percpu.h | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/percpu.h b/include/linux/percpu.h
> index 8ce91af..e134c82 100644
> --- a/include/linux/percpu.h
> +++ b/include/linux/percpu.h
> @@ -184,6 +184,11 @@ static inline void free_percpu(void *p)
>
> static inline void __init setup_per_cpu_areas(void) { }
>
> +static inline void *pcpu_lpage_remapped(void *kaddr)
> +{
> + return NULL;
> +}
> +
> #endif /* CONFIG_SMP */
>
> #define alloc_percpu(type) (type *)__alloc_percpu(sizeof(type), \
> --
> 1.6.0.2
Kamalesh
^ permalink raw reply
* Re: linux-next: pci tree build failure
From: Jesse Barnes @ 2009-07-15 16:09 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Yinghai Lu, Jesse Brandeburg
In-Reply-To: <20090715114510.ebba4bd0.sfr@canb.auug.org.au>
On Wed, 15 Jul 2009 11:45:10 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Jesse,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> arch/x86/pci/common.c:619: error: expected '}' before ';' token
>
> Caused by commit 1c6804b093f5753c2a23aa36f31f66966035bd32 ("x86/PCI:
> initialize PCI bus node numbers early"). This could not have been
> built with CONFIG_NUMA set ...
>
> I have used the version of the pci tree from next-20090714 for today.
Arg, did I apply the patch w/o that fix? Fixing now...
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply
* [PATCH] percpu: add dummy pcpu_lpage_remapped() for !CONFIG_SMP
From: Tejun Heo @ 2009-07-15 14:39 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Kamalesh Babulal, linux-next, lkml, Randy Dunlap
In-Reply-To: <4A5DA937.6040605@kernel.org>
!CONFIG_SMP was missing pcpu_lpage_remapped() definition causing build
failure. Add dummy implementation. This was discovered by linux-next
testing.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
---
Yeap, it was missing dummy definition on !CONFIG_SMP. This patch
fixes it. Committed to percpu#for-next. Thanks.
include/linux/percpu.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index 8ce91af..e134c82 100644
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -184,6 +184,11 @@ static inline void free_percpu(void *p)
static inline void __init setup_per_cpu_areas(void) { }
+static inline void *pcpu_lpage_remapped(void *kaddr)
+{
+ return NULL;
+}
+
#endif /* CONFIG_SMP */
#define alloc_percpu(type) (type *)__alloc_percpu(sizeof(type), \
--
1.6.0.2
^ permalink raw reply related
* Re: linux-next: Tree for July 6-July 9-July 15 (percpu/x86)
From: Tejun Heo @ 2009-07-15 10:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Tejun Heo, Kamalesh Babulal, linux-next, lkml, Randy Dunlap
In-Reply-To: <20090715195807.f0d1a7ea.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
>>> Still present in 20090709...
>>>
>> still seen in 20090715 with allnoconfig.
>
> Any ideas?
Getting the tree now. Probably broken build with !SMP. Will report
back as soon as I know more.
Thanks.
--
tejun
^ permalink raw reply
* Re: linux-next: Tree for July 6-July 9-July 15 (percpu/x86)
From: Stephen Rothwell @ 2009-07-15 9:58 UTC (permalink / raw)
To: Tejun Heo; +Cc: Kamalesh Babulal, linux-next, lkml, Randy Dunlap
In-Reply-To: <20090715094720.GA6674@linux.vnet.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 874 bytes --]
Hi Tejun,
On Wed, 15 Jul 2009 15:17:20 +0530 Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> wrote:
>
> * Randy Dunlap <randy.dunlap@oracle.com> [2009-07-09 10:22:48]:
>
> > On Mon, 6 Jul 2009 09:53:43 -0700 Randy Dunlap wrote:
> >
> > > On Mon, 6 Jul 2009 16:26:32 +1000 Stephen Rothwell wrote:
> > >
> > > > Changes since 20090703:
> > > >
> > > > The percpu tree lost all its conflicts but gained another against the tip
> > > > tree.
> > >
> > > arch/x86/mm/pageattr.c: In function 'cpa_process_alias':
> > > arch/x86/mm/pageattr.c:749: error: implicit declaration of function 'pcpu_lpage_remapped'
> > >
> > > config attached.
> >
> >
> > Still present in 20090709...
> >
> still seen in 20090715 with allnoconfig.
Any ideas?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for July 6-July 9-July 15 (percpu/x86)
From: Kamalesh Babulal @ 2009-07-15 9:47 UTC (permalink / raw)
To: linux-next; +Cc: lkml, Stephen Rothwell, Randy Dunlap, Tejun Heo
In-Reply-To: <20090709102248.01e2312c.randy.dunlap@oracle.com>
* Randy Dunlap <randy.dunlap@oracle.com> [2009-07-09 10:22:48]:
> On Mon, 6 Jul 2009 09:53:43 -0700 Randy Dunlap wrote:
>
> > On Mon, 6 Jul 2009 16:26:32 +1000 Stephen Rothwell wrote:
> >
> > > Hi all,
> > >
> > > Changes since 20090703:
> > >
> > > The percpu tree lost all its conflicts but gained another against the tip
> > > tree.
> >
> > arch/x86/mm/pageattr.c: In function 'cpa_process_alias':
> > arch/x86/mm/pageattr.c:749: error: implicit declaration of function 'pcpu_lpage_remapped'
> >
> > config attached.
>
>
> Still present in 20090709...
>
still seen in 20090715 with allnoconfig.
Kamalesh
^ permalink raw reply
* Re: linux-next: sound tree build warning
From: Mark Brown @ 2009-07-15 9:12 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <s5hhbxexqgx.wl%tiwai@suse.de>
On Wed, Jul 15, 2009 at 11:09:18AM +0200, Takashi Iwai wrote:
> At Wed, 15 Jul 2009 09:35:21 +0100,
> Mark Brown wrote:
> > Fixed, though Takashi seems to be away at the minute so it'll not appear
> > in -next until he reappears.
> I'm back now and pulled your trees. The tomorrow's next tree should
> be fine.
Ah, excellent - I'll send a pull request for the fix later this morning.
^ permalink raw reply
* Re: linux-next: sound tree build warning
From: Takashi Iwai @ 2009-07-15 9:09 UTC (permalink / raw)
To: Mark Brown; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20090715083521.GB8689@rakim.wolfsonmicro.main>
At Wed, 15 Jul 2009 09:35:21 +0100,
Mark Brown wrote:
>
> On Wed, Jul 15, 2009 at 01:13:54PM +1000, Stephen Rothwell wrote:
>
> > Today's linux-next build (x86_64 allmodconfig) produced this warning:
>
> That's one of the configurations I regularly test build but I've not
> seen this - which compiler are you using? Might be worth reporting that
> along with warnings.
>
> > sound/soc/codecs/wm8993.c: In function 'wm8993_hw_params':
> > sound/soc/codecs/wm8993.c:1799: warning: array subscript is above array bounds
>
> Fixed, though Takashi seems to be away at the minute so it'll not appear
> in -next until he reappears.
I'm back now and pulled your trees. The tomorrow's next tree should
be fine.
thanks,
Takashi
^ permalink raw reply
* Re: linux-next: sound tree build warning
From: Mark Brown @ 2009-07-15 8:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Takashi Iwai, linux-next, linux-kernel
In-Reply-To: <20090715131354.da512c72.sfr@canb.auug.org.au>
On Wed, Jul 15, 2009 at 01:13:54PM +1000, Stephen Rothwell wrote:
> Today's linux-next build (x86_64 allmodconfig) produced this warning:
That's one of the configurations I regularly test build but I've not
seen this - which compiler are you using? Might be worth reporting that
along with warnings.
> sound/soc/codecs/wm8993.c: In function 'wm8993_hw_params':
> sound/soc/codecs/wm8993.c:1799: warning: array subscript is above array bounds
Fixed, though Takashi seems to be away at the minute so it'll not appear
in -next until he reappears.
^ permalink raw reply
* Re: linux-next: dwmw2-iommu tree build failure
From: Stephen Rothwell @ 2009-07-15 7:32 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, linux-kernel
In-Reply-To: <1247642959.10050.220.camel@macbook.infradead.org>
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
Hi David,
On Wed, 15 Jul 2009 08:29:19 +0100 David Woodhouse <dwmw2@infradead.org> wrote:
>
> Oops, I need to kill the lockdep references to that lock too. Fixed now;
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: dwmw2-iommu tree build failure
From: David Woodhouse @ 2009-07-15 7:29 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20090715140116.c2ce8fde.sfr@canb.auug.org.au>
On Wed, 2009-07-15 at 14:01 +1000, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/pci/intel-iommu.c: In function 'dmar_init_reserved_ranges':
> drivers/pci/intel-iommu.c:1323: error: 'struct iova_domain' has no member named 'iova_alloc_lock'
>
> Caused by commit b25c32b0af7045d3837c44d9685358aeeb9b7ac8 ("intel-iommu:
> Remove superfluous iova_alloc_lock from IOVA code").
Oops, I need to kill the lockdep references to that lock too. Fixed now;
thanks.
--
David Woodhouse Open Source Technology Centre
David.Woodhouse@intel.com Intel Corporation
^ permalink raw reply
* linux-next: Tree for July 15
From: Stephen Rothwell @ 2009-07-15 6:18 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7389 bytes --]
Hi all,
Changes since 20090714:
Undropped trees: usb, staging
This tree fails to build for powerpc allyesconfig (final link problem).
The pci tree gained a build failure so I used the version from
next-20090714.
The dwmw2-iommu tree gained a build failure so I used the version from
next-20090714.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig.
These builds also have CONFIG_ENABLE_WARN_DEPRECATED,
CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 132 trees (counting Linus' and 19 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl-rc6
CONFLICT (content): Merge conflict in fs/reiserfs/journal.c
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
Merging vfs/for-next
Merging pci/linux-next
$ git reset --hard HEAD^
Merging refs/next/20090714/pci
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/main.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c
CONFLICT (content): Merge conflict in drivers/usb/serial/pl2303.c
CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c
$ git reset --hard HEAD^
Merging refs/next/20090713/ttydev
CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c
CONFLICT (content): Merge conflict in drivers/usb/serial/pl2303.c
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
$ git reset --hard HEAD^
Merging refs/next/20090714/dwmw2-iommu
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging edac-amd/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/oprofile/oprofile_stats.c
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in init/main.c
Applying: driver-core: fix for mtd typo
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: dwmw2-iommu tree build failure
From: Stephen Rothwell @ 2009-07-15 4:01 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 567 bytes --]
Hi David,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/pci/intel-iommu.c: In function 'dmar_init_reserved_ranges':
drivers/pci/intel-iommu.c:1323: error: 'struct iova_domain' has no member named 'iova_alloc_lock'
Caused by commit b25c32b0af7045d3837c44d9685358aeeb9b7ac8 ("intel-iommu:
Remove superfluous iova_alloc_lock from IOVA code").
I have used the verion of the dwmw2-iommu tree from next-20090714 for
today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: sound tree build warning
From: Stephen Rothwell @ 2009-07-15 3:13 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, linux-kernel, Mark Brown
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
Hi Takashi,
Today's linux-next build (x86_64 allmodconfig) produced this warning:
sound/soc/codecs/wm8993.c: In function 'wm8993_hw_params':
sound/soc/codecs/wm8993.c:1799: warning: array subscript is above array bounds
Introduced by commit 942c435ba79fd263a922bb114d56eccab6250662 ("ASoC: Add
WM8993 CODEC driver").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH] linux-next arch/ia64/kernel/setup.c: Fix setup_per_cpu_areas() compilation error
From: Tejun Heo @ 2009-07-15 2:48 UTC (permalink / raw)
To: Fenghua Yu; +Cc: Stephen Rothwell, linux-next, linux-ia64
In-Reply-To: <20090713200942.GA19606@linux-os.sc.intel.com>
Fenghua Yu wrote:
> Fix ia64 build setup_per_cpu_areas() redifinition issue in UP configuration
>
> When compiling ia64 kernel in UP configuration, the following compilation errors
> are reported:
>
> arch/ia64/kernel/setup.c:860: error: redefinition of 'setup_per_cpu_areas'
> include/linux/percpu.h:185: error: previous definition of 'setup_per_cpu_areas' was here
>
> The patch fixes the issue in arch/ia64/kernel/setup.c
>
> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Committed to percpu#for-next. Thanks.
--
tejun
^ permalink raw reply
* linux-next: pci tree build failure
From: Stephen Rothwell @ 2009-07-15 1:45 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Yinghai Lu, Jesse Brandeburg
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
Hi Jesse,
Today's linux-next build (x86_64 allmodconfig) failed like this:
arch/x86/pci/common.c:619: error: expected '}' before ';' token
Caused by commit 1c6804b093f5753c2a23aa36f31f66966035bd32 ("x86/PCI:
initialize PCI bus node numbers early"). This could not have been built
with CONFIG_NUMA set ...
I have used the version of the pci tree from next-20090714 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: driver-core tree build failure
From: David Brownell @ 2009-07-14 7:31 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Greg KH, linux-next, linux-kernel
In-Reply-To: <20090714163309.f2ee320d.sfr@canb.auug.org.au>
On Monday 13 July 2009, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/mtd/mtdcore.c:220: error: expected '{' before 'const'
> drivers/mtd/mtdcore.c:227: error: 'mtd_groups' undeclared here (not in a function)
>
> Caused by the update to commit ba87b739a1f5dd545679d886b8d193cdede991cf
> ("driver model: constify attribute groups").
>
> I have applied the patch below for today.
That's a good patch, go with it. Sorry; I guess this wasn't
the version I had test-built. My eyes were reporting "static"
as the (expected) initial keyword there; they lied!
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 14 Jul 2009 16:29:39 +1000
> Subject: [PATCH] driver-core: fix for mtd typo
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/mtd/mtdcore.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
> index 93e6731..05a16be 100644
> --- a/drivers/mtd/mtdcore.c
> +++ b/drivers/mtd/mtdcore.c
> @@ -217,7 +217,7 @@ struct attribute_group mtd_group = {
> .attrs = mtd_attrs,
> };
>
> -struct const attribute_group *mtd_groups[] = {
> +const struct attribute_group *mtd_groups[] = {
> &mtd_group,
> NULL,
> };
> --
> 1.6.3.3
>
>
^ permalink raw reply
* linux-next: Tree for July 14
From: Stephen Rothwell @ 2009-07-14 7:06 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 7345 bytes --]
Hi all,
Changes since 20090713:
Dropped trees:
usb (quilt series import failure)
staging (depends on usb)
This tree fails to build for powerpc allyesconfig (final link problem).
The security-testing tree lost its conflict.
The ttydev tree gained a conflicts against Linus' tree and a build
failure, so I used the version from next-20090713.
The driver-core tree gained a build failure for which I applied a patch.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES) and i386, sparc and sparc64 defconfig.
These builds also have CONFIG_ENABLE_WARN_DEPRECATED,
CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 132 trees (counting Linus' and 19 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl-rc6
CONFLICT (content): Merge conflict in fs/reiserfs/journal.c
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/main.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c
CONFLICT (content): Merge conflict in drivers/usb/serial/pl2303.c
CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c
$ git reset --hard HEAD^
Merging refs/next/20090713/ttydev
CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c
CONFLICT (content): Merge conflict in drivers/usb/serial/pl2303.c
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging edac-amd/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/oprofile/oprofile_stats.c
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in init/main.c
Applying: driver-core: fix for mtd typo
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* linux-next: driver-core tree build failure
From: Stephen Rothwell @ 2009-07-14 6:33 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, David Brownell
Hi Greg,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/mtd/mtdcore.c:220: error: expected '{' before 'const'
drivers/mtd/mtdcore.c:227: error: 'mtd_groups' undeclared here (not in a function)
Caused by the update to commit ba87b739a1f5dd545679d886b8d193cdede991cf
("driver model: constify attribute groups").
I have applied the patch below for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 14 Jul 2009 16:29:39 +1000
Subject: [PATCH] driver-core: fix for mtd typo
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/mtd/mtdcore.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 93e6731..05a16be 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -217,7 +217,7 @@ struct attribute_group mtd_group = {
.attrs = mtd_attrs,
};
-struct const attribute_group *mtd_groups[] = {
+const struct attribute_group *mtd_groups[] = {
&mtd_group,
NULL,
};
--
1.6.3.3
^ permalink raw reply related
* linux-next: ttydev tree build failure
From: Stephen Rothwell @ 2009-07-14 4:10 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 675 bytes --]
Hi Alan,
Today's linux-next build (powerpc ppc64_defconfig) failed like this:
drivers/serial/serial_core.c: In function 'uart_close':
drivers/serial/serial_core.c:1341: error: 'struct tty_port' has no member named 'cons'
drivers/serial/serial_core.c:1341: error: 'struct tty_port' has no member named 'cons'
drivers/serial/serial_core.c:1341: error: 'struct tty_port' has no member named 'line'
Caused by commit 85325e93e9473dd779e8378c1365f9d8a11f9b9e
("serial-port-portptr").
I have used the version of the ttydev tree from next-20090713 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: usb series import failure
From: Greg KH @ 2009-07-14 4:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20090714112648.d2157b44.sfr@canb.auug.org.au>
On Tue, Jul 14, 2009 at 11:26:48AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next import of the usb quilt series failed like this:
>
> usb-make-the-usbfs_snoop-log-more-pertinent.patch
> error: patch failed: drivers/usb/core/devio.c:347
> error: drivers/usb/core/devio.c: patch does not apply
>
> I commented out the above patch which lead to:
>
> usb-gadget-pxa25x-basic-transceiver-support.patch
> error: patch failed: drivers/usb/gadget/pxa25x_udc.c:2162
> error: drivers/usb/gadget/pxa25x_udc.c: patch does not apply
>
> And on ...
>
> It looks like the some of the usb patches haven't been updated for the
> rebase onto -git9. I have dropped the usb and staging trees for today.
Sorry, it's now rebased properly and pushed out.
thanks,
greg k-h
^ permalink raw reply
* linux-next: manual merge of the ttydev tree with Linus' tree
From: Stephen Rothwell @ 2009-07-14 3:46 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-next, linux-kernel, Alan Stern
Hi Alan,
Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/sierra.c between commit
7bae0a070db4bc2761dd9515f450cdfa3f3f248c ("USB: Sierra: fix oops upon
device close") from Linus' tree and commit
2db76e5f8b74d5eb0d26a55d4b4e0b2b1c76ff4d ("tty-usb-sierra-updates-pm")
from the ttydev tree.
Just context changes. I fixed ti up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/sierra.c
index f48d05e,9b22dff..0000000
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@@ -841,7 -884,11 +884,10 @@@ static void sierra_release(struct usb_s
portdata = usb_get_serial_port_data(port);
if (!portdata)
continue;
+ portdata->suspend_status = 0;
+ device_remove_file(&port->dev, &dev_attr_suspend_status);
+
kfree(portdata);
- usb_set_serial_port_data(port, NULL);
}
}
@@@ -864,8 -979,11 +978,11 @@@ static struct usb_serial_driver sierra_
.tiocmget = sierra_tiocmget,
.tiocmset = sierra_tiocmset,
.attach = sierra_startup,
- .disconnect = sierra_disconnect,
+ .release = sierra_release,
+ .port_probe = sierra_create_sysfs_attrs,
.read_int_callback = sierra_instat_callback,
+ .suspend = sierra_suspend,
+ .resume = sierra_resume,
};
/* Functions used by new usb-serial code. */
^ permalink raw reply
* linux-next: usb series import failure
From: Stephen Rothwell @ 2009-07-14 1:26 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 734 bytes --]
Hi Greg,
Today's linux-next import of the usb quilt series failed like this:
usb-make-the-usbfs_snoop-log-more-pertinent.patch
error: patch failed: drivers/usb/core/devio.c:347
error: drivers/usb/core/devio.c: patch does not apply
I commented out the above patch which lead to:
usb-gadget-pxa25x-basic-transceiver-support.patch
error: patch failed: drivers/usb/gadget/pxa25x_udc.c:2162
error: drivers/usb/gadget/pxa25x_udc.c: patch does not apply
And on ...
It looks like the some of the usb patches haven't been updated for the
rebase onto -git9. I have dropped the usb and staging trees for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: driver-core tree build warning
From: Stephen Rothwell @ 2009-07-14 0:44 UTC (permalink / raw)
To: Greg KH; +Cc: David Brownell, linux-next, linux-kernel
In-Reply-To: <20090713213614.GA16674@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
On Mon, 13 Jul 2009 14:36:14 -0700 Greg KH <greg@kroah.com> wrote:
>
> On Mon, Jul 13, 2009 at 02:23:59PM -0700, David Brownell wrote:
> > On Monday 13 July 2009, Greg KH wrote:
> > > David, care to send patches fixing these warnings?
> >
> > Here's a single patch:
>
> Now merged and pushed out. Stephen, this should be now resolved in your
> builds for the next -next tree.
Thanks all.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: linux-next: driver-core tree build warning
From: Greg KH @ 2009-07-13 21:36 UTC (permalink / raw)
To: David Brownell; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <200907131423.59963.david-b@pacbell.net>
On Mon, Jul 13, 2009 at 02:23:59PM -0700, David Brownell wrote:
> On Monday 13 July 2009, Greg KH wrote:
> > David, care to send patches fixing these warnings?
>
> Here's a single patch:
Now merged and pushed out. Stephen, this should be now resolved in your
builds for the next -next tree.
thanks,
greg k-h
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox