linux-next: Tree for July 6
Subsystems (2)
Hi all,
Changes since 20090703:
Removed tree: blk-removal (served its purpose)
Dropped tree: sfi (build problems)
This tree fails to build for powerpc allyesconfig.
The xfs tree lost its build failure.
The rr tree gained a conflict against Linus' tree.
The ttydev tree gained a build failure so I used the version from next-20090703.
The suspend tree gained a conflict against the microblaze tree.
The tip tree gained a conflict against the slab tree.
The percpu tree lost all its conflicts but gained another against the tip tree.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://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 131 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.
Signature · 158 lines
Cheers, Stephen Rothwell [email protected] $ 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 avr32/avr32-arch Merging blackfin/for-linus Merging cris/for-next Merging ia64/test Merging m68k/for-next Merging m68knommu/for-next Merging microblaze/next Merging mips/mips-for-linux-next CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c Merging parisc/master Merging powerpc/next Merging 4xx/next Merging galak/next Merging s390/features Merging sh/master Merging sparc/master Merging xtensa/master Merging cifs/master Merging configfs/linux-next CONFLICT (content): Merge conflict in fs/configfs/dir.c Merging ext4/next Merging fatfs/master Merging fuse/for-next Merging gfs2/master Merging jfs/next Merging nfs/linux-next Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next Merging squashfs/master Merging v9fs/for-next CONFLICT (content): Merge conflict in net/9p/protocol.c Merging ubifs/linux-next Merging xfs/master Merging reiserfs-bkl/reiserfs/kill-bkl-rc6 CONFLICT (content): Merge conflict in fs/reiserfs/super.c Merging vfs/for-next Merging pci/linux-next Merging hid/for-next Merging quilt/i2c Merging quilt/jdelvare-hwmon Merging quilt/kernel-doc Merging v4l-dvb/master Merging quota/for_next Merging kbuild/master Merging ide/master Merging libata/NEXT Merging infiniband/for-next Merging acpi/test Applying: acpi: fix for eeepc-laptop: Register as a pci-hotplug device mismerge Merging ieee1394/for-next Merging ubi/linux-next Merging kvm/master Merging dlm/next Merging scsi/master Merging async_tx/next Merging udf/for_next Merging net/master Merging wireless/master Merging mtd/master Merging crypto/master Merging sound/for-next Merging cpufreq/next Merging quilt/rr CONFLICT (content): Merge conflict in arch/mips/kernel/smp-cmp.c CONFLICT (content): Merge conflict in arch/powerpc/platforms/powermac/setup.c 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 $ git reset --hard HEAD^ Merging refs/next/20090703/ttydev CONFLICT (content): Merge conflict in drivers/char/tty_ldisc.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 CONFLICT (content): Merge conflict in arch/microblaze/include/asm/device.h 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 arch/x86/include/asm/termios.h CONFLICT (content): Merge conflict in include/linux/rcupdate.h Merging percpu/for-next CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c Merging sfi/sfi-test $ git reset --hard HEAD^ Merging asm-generic/next Merging quilt/driver-core Merging quilt/usb Merging quilt/staging Merging scsi-post-merge/master Applying: rr/pmac: fix for cpumask accessor changes
Re: linux-next: Tree for July 6 (percpu/x86)
Quoted 6 lines · 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.
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
Re: linux-next: Tree for July 6-July 9 (percpu/x86)
Quoted 6 lines · On Mon, 6 Jul 2009 09:53:43 -0700 Randy Dunlap wrote:
Quoted 4 lines · On Mon, 6 Jul 2009 16:26:32 +1000 Stephen Rothwell wrote:
Hi all,
Changes since 20090703:
Quoted 7 lines
Quoted 2 lines
The percpu tree lost all its conflicts but gained another against the tip tree.
arch/x86/mm/pageattr.c: In function 'cpa_process_alias':arch/x86/mm/pageattr.c:749: error: implicit declaration of function 'pcpu_lpage_remapped'config attached.
Still present in 20090709...
---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
Re: linux-next: Tree for July 6-July 9-July 15 (percpu/x86)
Quoted 11 lines · Randy Dunlap
Quoted 9 lines · On Mon, 6 Jul 2009 09:53:43 -0700 Randy Dunlap wrote:
Quoted 6 lines · 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.
Quoted 8 lines
Quoted 4 lines
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
Re: linux-next: Tree for July 6-July 9-July 15 (percpu/x86)
Hi Tejun,
Quoted 15 lines · On Wed, 15 Jul 2009 15:17:20 +0530 Kamalesh Babulal…
Quoted 12 lines · Randy Dunlap
Quoted 10 lines · On Mon, 6 Jul 2009 09:53:43 -0700 Randy Dunlap wrote:
Quoted 4 lines · 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'
Quoted 6 lines
Quoted 5 lines
Quoted 1 line
config attached.
Still present in 20090709...
still seen in 20090715 with allnoconfig.
Any ideas?
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
Tejun Heo
maintainerRe: linux-next: Tree for July 6-July 9-July 15 (percpu/x86)
Quoted 5 lines · Stephen Rothwell
Quoted 3 lines
Quoted 2 lines
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.
Signature · 1 line
tejun
PATCH 1/1 percpu: add dummy pcpu_lpage_remapped() for !CONFIG_SMP
!CONFIG_SMP was missing pcpu_lpage_remapped() definition causing build failure. Add dummy implementation. This was discovered by linux-next testing.
---
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(-)
include/linux/percpu.h +5 -0
@@ -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), \
Signature · 1 line
1.6.0.2
Re: [PATCH] percpu: add dummy pcpu_lpage_remapped() for !CONFIG_SMP
Quoted 4 lines · Tejun Heo
!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.
Quoted 29 lines
Signed-off-by Tejun Heo <[email protected]>Cc Randy Dunlap <[email protected]>Cc Kamalesh Babulal <[email protected]>Cc Stephen Rothwell <[email protected]>---
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(-)include/linux/percpu.h +5
-0@@ -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), \Signature · 1 line
1.6.0.2
Kamalesh