Home » Mailing list archives » linux-kernel » 2008 » July » 16

Re: linux-next: Tree for July 14

Previous thread: [Patch 2.6.26] Fix prinkt timesamps for good [was: [Bug 10648] CONFIG_PRINTK_TIME broken on git HEAD ?] by Martin Knoblauch on Monday, July 14, 2008 - 5:52 am. (1 message)

Next thread: [GIT PULL] avr32 updates for 2.6.27 by Haavard Skinnemoen on Monday, July 14, 2008 - 6:17 am. (1 message)
[view original message]
From: Stephen Rothwell <sfr@...>
To: <linux-next@...>
Cc: LKML <linux-kernel@...>
Subject: linux-next: Tree for July 14
Date: Monday, July 14, 2008 - 6:12 am

Hi all,


With the opening of the merge window, I am hoping my job becomes easier

again ... :-)


Changes since next-20080711:


Changed tree: powerpc (I am now fetching Ben's version)


The sched tree lost a conflict.


The x86 tree gained a conflict against the stackprotector tree.


The v4l-dvb tree lost a conflict.


The powerpc tree gained a conflict against the ftrace tree and required a

couple of build fix patches (see below) but lost a previous build fix

patch.


The rr tree gained a conflict against the ftrace tree but lost a build

fix patch.


I have also applied the following patches for known problems:


	sparc64: sysdev API change fallout

	s390: fix compile error due to smp_call_function

	powerpc: mman.h export fixups

	powerpc/stacktrace: EXPORT SYMBOL_GPL needs module.h


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


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, it is also built with powerpc allnoconfig,

44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.


Below is a summary of the state of the merge.


We are up to 106 trees (counting Linus' and 14 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 test...
[ message continues ]
[view original message]
From: Rafael J. Wysocki <rjw@...>
To: Stephen Rothwell <sfr@...>
Cc: <linux-next@...>, LKML <linux-kernel@...>, ACPI Devel Maling List <linux-acpi@...>, Andrew Morton <akpm@...>, Ingo Molnar <mingo@...>, Kernel Testers List <kernel-testers@...>
Subject: Re: linux-next: Tree for July 14
Date: Monday, July 14, 2008 - 7:35 pm

I get something like this on one of my test boxes (full dmesg at

http://www.sisk.pl/kernel/debug/20080714/dmesg-asus_L5D.log):


------------[ cut here ]------------

WARNING: at /home/rafael/src/linux-next/arch/x86/mm/pageattr.c:592 __change_page_attr_set_clr+0x8bf/0x9d0()

Modules linked in: snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device dm_crypt reiserfs dm_mod arc4 ecb crypto_blkcipher b43 rfkill pcmcia mac80211 cfg80211 input_polldev ppdev snd_intel8x0 snd_ac97_codec ac97_bus snd_pcm joydev yenta_socket rtc_cmos sr_mod ohci1394 snd_timer rsrc_nonstatic snd skge pcmcia_core ieee1394 ssb asus_laptop cdrom sg video i2c_nforce2 parport_pc soundcore output backlight parport ac battery button snd_page_alloc led_class i2c_core evdev usbhid ff_memless sd_mod ehci_hcd ohci_hcd amd74xx ext3 jbd fan pata_amd libata scsi_mod dock thermal processor

Pid: 3873, comm: acpidump Not tainted 2.6.26-next #21


Call Trace:

 [<ffffffff8023ab6f>] warn_on_slowpath+0x5f/0x80

 [<ffffffff8023bd67>] ? printk+0x67/0x70

 [<ffffffff802c52dd>] ? __d_lookup+0xcd/0x190

 [<ffffffff80225c9f>] __change_page_attr_set_clr+0x8bf/0x9d0

 [<ffffffff802b9b34>] ? do_lookup+0x84/0x210

 [<ffffffff802b9587>] ? permission+0xc7/0x130

 [<ffffffff802c5d71>] ? dput+0x81/0x110

 [<ffffffff802ab621>] ? check_poison_obj+0x31/0x1f0

 [<ffffffff80226c28>] ? reserve_memtype+0xf8/0x310

 [<ffffffff80225e4f>] change_page_attr_set_clr+0x9f/0x1d0

 [<ffffffff8049dbb6>] ? _spin_unlock+0x26/0x30

 [<ffffffff80226073>] _set_memory_uc+0x13/0x20

 [<ffffffff80224b45>] ioremap_change_attr+0x25/0x40

 [<ffffffff80226f49>] phys_mem_access_prot_allowed+0x109/0x170

 [<ffffffff802abea9>] ? cache_alloc_debugcheck_after+0x99/0x230

 [<ffffffff803915a5>] mmap_mem+0x35/0xb0

 [<ffffffff8029c09a>] mmap_region+0x17a/0x4c0

 [<ffffffff8049d6ba>] ? __down_write_nested+0x1a/0xc0

 [<ffffffff8029cb6b>] do_mmap_pgoff+0x3ab/0x3d0

 [<ffffffff80210e1c>] sys_...
[ message continues ]
[view original message]
From: Andrew Morton <akpm@...>
To: Stephen Rothwell <sfr@...>
Cc: <linux-next@...>, LKML <linux-kernel@...>
Subject: Re: linux-next: Tree for July 14
Date: Monday, July 14, 2008 - 1:12 pm

If past experience is a guide, it's about to get harder because


a) maintainers jam untested crap^W^Wrecently-received features into

   their trees so they don't miss the merge window and


b) a storm of git rejects turn up as Linus's tree starts to get changed.


Hopefully b) will improve, as "all" the new code has already gone

through linux-next merging.


As for a), well, it would be nice if people were to be careful about

that sort of thing.  In some ways it's justifiable - we _do_ have a

couple months to fix remaining glitches.  But one would think that when

fast-tracking new features, the code would at least get additional

review and testing to make up for it.

--
[view original message]
From: Takashi Iwai <tiwai@...>
To: Stephen Rothwell <sfr@...>
Cc: Glauber Costa <gcosta@...>, Ingo Molnar <mingo@...>, <linux-next@...>, LKML <linux-kernel@...>
Subject: Re: linux-next: Tree for July 14
Date: Tuesday, July 15, 2008 - 8:23 pm

Hi,


another build failure of next-20080714, this time on x86-64:


  AS      arch/x86/lib/csum-copy_64.o

arch/x86/lib/csum-copy_64.S: Assembler messages:

arch/x86/lib/csum-copy_64.S:48: Error: Macro `ignore' was already defined


Indeed, it's defined in asm/dwarf2.h, too.

The patch below fixed the build.


Takashi

---

diff --git a/include/asm-x86/dwarf2.h b/include/asm-x86/dwarf2.h

index 0bfe250..e65e65a 100644

--- a/include/asm-x86/dwarf2.h

+++ b/include/asm-x86/dwarf2.h

@@ -38,23 +38,23 @@


 /* Due to the structure of pre-exisiting code, don't use assembler line

    comment character # to ignore the arguments. Instead, use a dummy macro. */

-.macro ignore a=0, b=0, c=0, d=0

+.macro dw_ignore a=0, b=0, c=0, d=0

 .endm


-#define CFI_STARTPROC	ignore

-#define CFI_ENDPROC	ignore

-#define CFI_DEF_CFA	ignore

-#define CFI_DEF_CFA_REGISTER	ignore

-#define CFI_DEF_CFA_OFFSET	ignore

-#define CFI_ADJUST_CFA_OFFSET	ignore

-#define CFI_OFFSET	ignore

-#define CFI_REL_OFFSET	ignore

-#define CFI_REGISTER	ignore

-#define CFI_RESTORE	ignore

-#define CFI_REMEMBER_STATE ignore

-#define CFI_RESTORE_STATE ignore

-#define CFI_UNDEFINED ignore

-#define CFI_SIGNAL_FRAME ignore

+#define CFI_STARTPROC	dw_ignore

+#define CFI_ENDPROC	dw_ignore

+#define CFI_DEF_CFA	dw_ignore

+#define CFI_DEF_CFA_REGISTER	dw_ignore

+#define CFI_DEF_CFA_OFFSET	dw_ignore

+#define CFI_ADJUST_CFA_OFFSET	dw_ignore

+#define CFI_OFFSET	dw_ignore

+#define CFI_REL_OFFSET	dw_ignore

+#define CFI_REGISTER	dw_ignore

+#define CFI_RESTORE	dw_ignore

+#define CFI_REMEMBER_STATE dw_ignore

+#define CFI_RESTORE_STATE dw_ignore

+#define CFI_UNDEFINED dw_ignore

+#define CFI_SIGNAL_FRAME dw_ignore


 #endif


--
[view original message]
From: Takashi Iwai <tiwai@...>
To: Stephen Rothwell <sfr@...>
Cc: Mark Nelson <markn@...>, Arnd Bergmann <arnd@...>, Benjamin Herrenschmidt <benh@...>, <linux-next@...>, LKML <linux-kernel@...>
Subject: Re: linux-next: Tree for July 14
Date: Tuesday, July 15, 2008 - 8:20 pm

At Mon, 14 Jul 2008 20:12:49 +1000,


The build of next-20080714 failed on ppc32:


  CC [M]  drivers/infiniband/core/addr.o

In file included from include/rdma/ib_addr.h:41,

                 from drivers/infiniband/core/addr.c:44:

include/rdma/ib_verbs.h: In function 'ib_dma_map_single_attrs':

include/rdma/ib_verbs.h:1634: error: implicit declaration of function 'dma_map_single_attrs'

include/rdma/ib_verbs.h: In function 'ib_dma_unmap_single_attrs':

include/rdma/ib_verbs.h:1643: error: implicit declaration of function 'dma_unmap_single_attrs'

include/rdma/ib_verbs.h:1644: warning: 'return' with a value, in function returning void

include/rdma/ib_verbs.h: In function 'ib_dma_map_sg_attrs':

include/rdma/ib_verbs.h:1721: error: implicit declaration of function 'dma_map_sg_attrs'

include/rdma/ib_verbs.h: In function 'ib_dma_unmap_sg_attrs':

include/rdma/ib_verbs.h:1729: error: implicit declaration of function 'dma_unmap_sg_attrs'

make[3]: *** [drivers/infiniband/core/addr.o] Error 1


The following patch fixed the build, at least.  Not sure whether it's

the right fix, though.


Takashi


---

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig

index 140ae05..007681c 100644

--- a/arch/powerpc/Kconfig

+++ b/arch/powerpc/Kconfig

@@ -113,7 +113,7 @@ config PPC

 	select HAVE_LMB

 	select USE_GENERIC_SMP_HELPERS if SMP

 	select HAVE_OPROFILE

-	select HAVE_DMA_ATTRS

+	select HAVE_DMA_ATTRS if PPC64


 config EARLY_PRINTK

 	bool

--
[view original message]
From: Benjamin Herrenschmidt <benh@...>
To: Takashi Iwai <tiwai@...>
Cc: Stephen Rothwell <sfr@...>, Mark Nelson <markn@...>, Arnd Bergmann <arnd@...>, <linux-next@...>, LKML <linux-kernel@...>
Subject: Re: linux-next: Tree for July 14
Date: Tuesday, July 15, 2008 - 1:50 am

Thanks, applied.


Cheers,

Ben.


--
[view original message]
From: Gabriel C <nix.or.die@...>
To: Stephen Rothwell <sfr@...>
Cc: <linux-next@...>, LKML <linux-kernel@...>
Subject: Re: linux-next: Tree for July 14
Date: Monday, July 14, 2008 - 10:18 am

This is the first linux-next kernel which doesn't boot on my 64bit x86_64 test box.


HW: P5E-VM DO Asus Motherboard , Q9300 Quad Core Intel CPU , 2Gigs RAM 


SW:


sh scripts/ver_linux

If some fields are empty or look unusual you may have an old version.

Compare to the current minimal requirements in Documentation/Changes.


Linux thor 2.6.25-fw7 #1 SMP PREEMPT Mon Jun 30 19:48:22 CEST 2008 x86_64 GNU/Linux


Gnu C                  4.3.1

Gnu make               3.81

binutils               2.18.50.0.7.20080502

util-linux             2.14

mount                  support

module-init-tools      3.4

e2fsprogs              1.41.0

jfsutils               1.1.12

reiserfsprogs          3.6.20

xfsprogs               2.9.8

pcmciautils            014

Linux C Library        2.8

Dynamic linker (ldd)   2.8

Linux C++ Library      so.6.0

Procps                 3.2.7

Net-tools              1.60

Kbd                    1.14.1

Sh-utils               6.12

udev                   124

wireless-tools         28

Modules Loaded         ipv6 i915 drm binfmt_misc acpi_cpufreq freq_table w83627ehf hwmon_vid loop lp joydev ata_generic usb_storage snd_hda_intel ppdev thermal i2c_i801 parport_pc parport i2c_core evdev snd_hwdep iTCO_wdt e1000e processor sg button pata_acpi iTCO_vendor_support rtc_cmos ehci_hcd uhci_hcd intel_agp pcspkr


All I get is an black screen and it hangs there forever with this config :


#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.26

# Mon Jul 14 14:23:31 2008

#

CONFIG_64BIT=y

# CONFIG_X86_32 is not set

CONFIG_X86_64=y

CONFIG_X86=y

CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"

# CONFIG_GENERIC_LOCKBREAK is not set

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CMOS_UPDATE=y

CONFIG_CLOCKSOURCE_WATCHDOG=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y

CONFIG_LOCKDEP_SUPPORT=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y

CONFIG_FAST_CMPXCHG_LOCAL=y

CONFIG_MMU=y

CONFIG_ZONE_DMA=y

CONFIG_GENERIC_ISA...
[ message continues ]
[view original message]
From: Gabriel C <nix.or.die@...>
To: Stephen Rothwell <sfr@...>
Cc: <linux-next@...>, LKML <linux-kernel@...>
Subject: Re: linux-next: Tree for July 14
Date: Monday, July 14, 2008 - 7:43 am

make clean / mrproper is broken , I'm not sure when it broken , I'm

updating from

2.6.26-rc8-next-20080630.


...


crazy@thor:/work/crazy/linux/linux-next/git/linux-2.6$ LC_ALL=C make clean

scripts/Makefile.clean:17:

/work/crazy/linux/linux-next/git/linux-2.6/drivers/media/mdtv/Makefile:

No such file or directory

make[3]: *** No rule to make target

`/work/crazy/linux/linux-next/git/linux-2.6/drivers/media/mdtv/Makefile'.

 Stop.

make[2]: *** [drivers/media/mdtv] Error 2

make[1]: *** [drivers/media] Error 2

make: *** [_clean_drivers] Error 2


...


drivers/media/Makefile has 'obj-$(CONFIG_MDTV_ADAPTERS)  += mdtv/' but

I cannot see such a folder under drivers/media =). Removing mdtv from

Makefile fixes the problem.


Regards,


Gabriel

--
[view original message]
From: Stephen Rothwell <sfr@...>
To: Gabriel C <nix.or.die@...>
Cc: <linux-next@...>, LKML <linux-kernel@...>, Michael Krufky <mkrufky@...>, Mauro Carvalho Chehab <mchehab@...>
Subject: Re: linux-next: Tree for July 14
Date: Monday, July 14, 2008 - 9:47 am

On Mon, 14 Jul 2008 13:43:17 +0200 "Gabriel C" <nix.or.die@googlemail.com> =


Commit 0fdb296d34c14520f061828d69a6e537e7dd78a4 ("V4L/DVB (8272):

sms1xxx: move driver from media/mdtv/ to media/dvb/siano/") moved all of

drivers/media/mdtv, but didn;t remove the reference from

drivers/media/Makefile.


Added some cc's

--=20

Cheers,

Stephen Rothwell                    sfr@canb.auug.org.au

http://www.canb.auug.org.au/~sfr/
Previous thread: [Patch 2.6.26] Fix prinkt timesamps for good [was: [Bug 10648] CONFIG_PRINTK_TIME broken on git HEAD ?] by Martin Knoblauch on Monday, July 14, 2008 - 5:52 am. (1 message)

Next thread: [GIT PULL] avr32 updates for 2.6.27 by Haavard Skinnemoen on Monday, July 14, 2008 - 6:17 am. (1 message)