linux-next: Tree for August 5

linux-next: Tree for August 5

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 8358 bytes --]

Hi all,

Changes since 20090804:

This tree fails to build for powerpc allyesconfig (final link problem).

The mfd tree gained a conflict against the input tree.

The drm tree gained a conflict against Linus' tree.

The edac-amd tree gained a conflict against Linus' tree.

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (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 138 trees (counting Linus' and 20 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/tty.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in MAINTAINERS
Merging davinci/for-next
Merging pxa/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
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/next
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 ecryptfs/next
Merging ext3/for_next
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
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
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
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-dm646x-evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm644x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm646x.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm355.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/dm644x.h
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
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/x86/lguest/boot.c
CONFLICT (content): Merge conflict in drivers/lguest/page_tables.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_pci.c
[master 0479a8a] Revert "cpumask:remove-set_cpus_allowed"
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
CONFLICT (content): Merge conflict in drivers/input/misc/Kconfig
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
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 MAINTAINERS
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in arch/x86/lib/msr.c
CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Applying: drbd: fix for removal of blk_queue_stack_limits
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
CONFLICT (content): Merge conflict in kernel/fork.c
Merging oprofile/for-next
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
Merging quilt/tty
CONFLICT (content): Merge conflict in arch/x86/include/asm/termios.h
CONFLICT (content): Merge conflict in drivers/char/tty_ldisc.c
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/m66592-udc.c
CONFLICT (content): Merge conflict in drivers/usb/host/r8a66597-hcd.c
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/epl/VirtualEthernetLinux.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/epl/VirtualEthernetLinux.c left in tree.
$ git rm -f drivers/staging/epl/VirtualEthernetLinux.c
Merging scsi-post-merge/master

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: Tree for August 5

[Boaz Harrosh]

On 08/05/2009 10:23 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20090804:
> 
> This tree fails to build for powerpc allyesconfig (final link problem).
> 

Above is reported for a long time. Is it related to this:
http://www.spinics.net/lists/kernel/msg921978.html

> The mfd tree gained a conflict against the input tree.
> 
> The drm tree gained a conflict against Linus' tree.
> 
> The edac-amd tree gained a conflict against Linus' tree.
> 
> ----------------------------------------------------------------------------
> 
<snip>

Re: linux-next: Tree for August 5

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 832 bytes --]

Hi Boaz,

On Wed, 05 Aug 2009 11:11:20 +0300 Boaz Harrosh <bharrosh@panasas.com> wrote:
>
> On 08/05/2009 10:23 AM, Stephen Rothwell wrote:
> > 
> > This tree fails to build for powerpc allyesconfig (final link problem).
> 
> Above is reported for a long time. Is it related to this:
> http://www.spinics.net/lists/kernel/msg921978.html

No, it is this:

powerpc-linux-ld: TOC section size exceeds 64k

It is powerpc specific and the only way we can think of fixing it
involves stopping building the built-in.o files and linking the entire
kernel in one go at the end.  We just haven't had time (or the energy) to
try to fix it properly while it only affects the final link of the
allyesconfig kernel. 

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: linux-next: Tree for August 5

[Boaz Harrosh]

On 08/05/2009 01:13 PM, Stephen Rothwell wrote:
> Hi Boaz,
> 
> On Wed, 05 Aug 2009 11:11:20 +0300 Boaz Harrosh <bharrosh@panasas.com> wrote:
>>
>> On 08/05/2009 10:23 AM, Stephen Rothwell wrote:
>>>
>>> This tree fails to build for powerpc allyesconfig (final link problem).
>>
>> Above is reported for a long time. Is it related to this:
>> http://www.spinics.net/lists/kernel/msg921978.html
> 
> No, it is this:
> 
> powerpc-linux-ld: TOC section size exceeds 64k
> 
> It is powerpc specific and the only way we can think of fixing it
> involves stopping building the built-in.o files and linking the entire
> kernel in one go at the end.  We just haven't had time (or the energy) to
> try to fix it properly while it only affects the final link of the
> allyesconfig kernel. 
> 

Ha, OK allyesconfig. Last time I attempted an allyesconfig for i386 I got
me the OOM killer attack on my KDE, half way into the final link.

That's why I use allmodconfig for when I need "try to compile everything ++"
I get just as much compilation coverage if not more. And is faster.
It'll not show symbol conflicts if any exist, though.

Thanks
Boaz

[PATCH -next] isdn: fix netjet build errors

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

Fix netjet driver link errors when ISDN_I4L is not enabled:

drivers/built-in.o: In function `mode_tiger':
netjet.c:(.text+0x325dc8): undefined reference to `isdnhdlc_rcv_init'
netjet.c:(.text+0x325dd5): undefined reference to `isdnhdlc_out_init'
drivers/built-in.o: In function `fill_dma':
netjet.c:(.text+0x325fb6): undefined reference to `isdnhdlc_encode'
drivers/built-in.o: In function `read_dma':
netjet.c:(.text+0x32631a): undefined reference to `isdnhdlc_decode'
drivers/built-in.o: In function `nj_irq':
netjet.c:(.text+0x326e01): undefined reference to `isdnhdlc_encode'

or move isdnhdlc.c to some other sub-dir..

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/isdn/hardware/mISDN/Kconfig |    1 +
 1 file changed, 1 insertion(+)

--- linux-next-20090805.orig/drivers/isdn/hardware/mISDN/Kconfig
+++ linux-next-20090805/drivers/isdn/hardware/mISDN/Kconfig
@@ -78,6 +78,7 @@ config MISDN_NETJET
 	depends on PCI
 	select MISDN_IPAC
 	select ISDN_HDLC
+	select ISDN_I4L # so that make will recurse into sub-dir.
 	help
 	  Enable support for Traverse Technologies NETJet PCI cards.
 



---
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/

Re: [PATCH -next] isdn: fix netjet build errors

[David Miller]

From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 5 Aug 2009 09:26:35 -0700

> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> Fix netjet driver link errors when ISDN_I4L is not enabled:
> 
> drivers/built-in.o: In function `mode_tiger':
> netjet.c:(.text+0x325dc8): undefined reference to `isdnhdlc_rcv_init'
> netjet.c:(.text+0x325dd5): undefined reference to `isdnhdlc_out_init'
> drivers/built-in.o: In function `fill_dma':
> netjet.c:(.text+0x325fb6): undefined reference to `isdnhdlc_encode'
> drivers/built-in.o: In function `read_dma':
> netjet.c:(.text+0x32631a): undefined reference to `isdnhdlc_decode'
> drivers/built-in.o: In function `nj_irq':
> netjet.c:(.text+0x326e01): undefined reference to `isdnhdlc_encode'
> 
> or move isdnhdlc.c to some other sub-dir..
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks Randy.

Karsten, let me know if you want me to apply this directly to
net-next-2.6 or if you want to fix it differently or send it
with other changes you have pending.

Thanks!

Re: [PATCH -next] isdn: fix netjet build errors

[Karsten Keil]

On Mittwoch, 5. August 2009 21:03:02 David Miller wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> Date: Wed, 5 Aug 2009 09:26:35 -0700
>
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> >
> > Fix netjet driver link errors when ISDN_I4L is not enabled:
> >
> > drivers/built-in.o: In function `mode_tiger':
> > netjet.c:(.text+0x325dc8): undefined reference to `isdnhdlc_rcv_init'
> > netjet.c:(.text+0x325dd5): undefined reference to `isdnhdlc_out_init'
> > drivers/built-in.o: In function `fill_dma':
> > netjet.c:(.text+0x325fb6): undefined reference to `isdnhdlc_encode'
> > drivers/built-in.o: In function `read_dma':
> > netjet.c:(.text+0x32631a): undefined reference to `isdnhdlc_decode'
> > drivers/built-in.o: In function `nj_irq':
> > netjet.c:(.text+0x326e01): undefined reference to `isdnhdlc_encode'
> >
> > or move isdnhdlc.c to some other sub-dir..
> >
> > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
>
> Thanks Randy.
Thanks too. 
>
> Karsten, let me know if you want me to apply this directly to
> net-next-2.6 or if you want to fix it differently or send it
> with other changes you have pending.
>

My original approach was to change the Makefile to enter this directory
unconditional, but it seems that this part of the patch was lost during 
development.  I will send a new patch after testing with different configs.

Karsten

Re: [PATCH -next] isdn: fix netjet build errors

[David Miller]

From: Karsten Keil <isdn@linux-pingi.de>
Date: Thu, 6 Aug 2009 07:05:32 +0200

> My original approach was to change the Makefile to enter this directory
> unconditional, but it seems that this part of the patch was lost during 
> development.  I will send a new patch after testing with different configs.

Ok, thanks!