LinuxLists.cc - linux-next: Tree for November 14

2008-11-14 07:40:43

Subject: linux-next: Tree for November 14

Hi all,

Changes since 20081113:

New tree:
staging

Removed tree:
creds (it will now be merged via the security-testing tree)

Undropped tree:
sh

Dropped trees (temporarily):
sound (build problem)
userns (it depends on creds)
semaphore-removal (due to unfixed conflicts against Linus' tree)
firmware (unfixed build failure)
osd (build failure)

The arm tree lost its two conflicts.

The kvm tree lost its conflict.

The sound tree gained a build failure and was dropped.

The rr tree gained a conflict against the net tree.

The osd tree gained a build failure and was dropped.

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

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,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.

Below is a summary of the state of the merge.

We are up to 125 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 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 [email protected]

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sparc-current/master
Merging sound-current/for-linus
Merging arm-current/master
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-2.6.26
Merging dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging quilt/m68k
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
$ git reset --hard HEAD^
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/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 kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
CONFLICT (delete/modify): Documentation/DocBook/wanbook.tmpl deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of Documentation/DocBook/wanbook.tmpl left in tree.
CONFLICT (delete/modify): drivers/net/wan/syncppp.c deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of drivers/net/wan/syncppp.c left in tree.
$ git rm -f drivers/net/wan/syncppp.c Documentation/DocBook/wanbook.tmpl
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
Merging bdev/master
Merging dwmw2-iommu/master
Merging cpu_alloc/cpu_alloc
CONFLICT (content): Merge conflict in kernel/lockdep.c
CONFLICT (content): Merge conflict in kernel/module.c
Applying cpu_alloc: merge_fix_1
Merging cputime/cputime
Merging perfmon3/master
Merging osd/linux-next
$ git reset --hard HEAD^
Merging fatfs/master
Merging quilt/staging
Merging scsi-post-merge/master

Attachments:

(No filename) (6.40 kB)
(No filename) (197.00 B)
Download all attachments

2008-11-14 17:53:18

by Randy Dunlap

[permalink] [raw]

Subject: Re: linux-next: Tree for November 14 (staging)

On Fri, 14 Nov 2008 18:40:21 +1100 Stephen Rothwell wrote:

> Hi all,
>
> Changes since 20081113:
>
> New tree:
> staging

drivers/staging/benet/mpu.c:146: error: implicit declaration of function 'udelay'

drivers/staging/comedi/proc.c:89: error: redefinition of 'comedi_proc_init'
drivers/staging/comedi/comedidev.h:359: error: previous definition of 'comedi_proc_init' was here
drivers/staging/comedi/proc.c:98: error: redefinition of 'comedi_proc_cleanup'
drivers/staging/comedi/comedidev.h:362: error: previous definition of 'comedi_proc_cleanup' was here

---
~Randy

2008-11-14 18:11:31

by Randy Dunlap

[permalink] [raw]

Subject: Re: linux-next: Tree for November 14 (staging#2)

On Fri, 14 Nov 2008 18:40:21 +1100 Stephen Rothwell wrote:

> Hi all,
>
> Changes since 20081113:
>
> New tree:
> staging

ERROR: "usb_deregister" [drivers/staging/asus_oled/asus_oled.ko] undefined!
ERROR: "usb_get_dev" [drivers/staging/asus_oled/asus_oled.ko] undefined!
ERROR: "usb_bulk_msg" [drivers/staging/asus_oled/asus_oled.ko] undefined!
ERROR: "usb_put_dev" [drivers/staging/asus_oled/asus_oled.ko] undefined!
ERROR: "usb_register_driver" [drivers/staging/asus_oled/asus_oled.ko] undefined!

(CONFIG_USB=n)

---
~Randy

2008-11-14 18:18:42

by Greg KH

On Fri, Nov 14, 2008 at 2:15 PM, Randy Dunlap <[email protected]> wrote:
> On Fri, 14 Nov 2008 18:40:21 +1100 Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20081113:
>>
>> New tree:
>> staging
>
>
> drivers/staging/agnx/pci.c:327: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:328: error: 'struct ieee80211_if_conf' has no member named 'ssid'
> drivers/staging/agnx/pci.c:328: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:329: error: 'struct ieee80211_if_conf' has no member named 'ssid'
> drivers/staging/agnx/pci.c:329: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:330: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid_len'
> drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid'
> drivers/staging/agnx/pci.c:331: error: 'struct ieee80211_if_conf' has no member named 'ssid

It looks like commit 41bb73eeac5ff5fb217257ba33b654747b3abf11 removed
these members from ieee80211_if_conf under the assumption that no
drivers used them.

>
> config attached.
>
> ---
> ~Randy
>

2008-11-14 22:13:19

by J.R. Mauro

[permalink] [raw]

Subject: Re: linux-next: Tree for November 14 (staging#2)

On Fri, Nov 14, 2008 at 1:11 PM, Randy Dunlap <[email protected]> wrote:
> On Fri, 14 Nov 2008 18:40:21 +1100 Stephen Rothwell wrote:
>
>> Hi all,
>>
>> Changes since 20081113:
>>
>> New tree:
>> staging
>
> ERROR: "usb_deregister" [drivers/staging/asus_oled/asus_oled.ko] undefined!
> ERROR: "usb_get_dev" [drivers/staging/asus_oled/asus_oled.ko] undefined!
> ERROR: "usb_bulk_msg" [drivers/staging/asus_oled/asus_oled.ko] undefined!
> ERROR: "usb_put_dev" [drivers/staging/asus_oled/asus_oled.ko] undefined!
> ERROR: "usb_register_driver" [drivers/staging/asus_oled/asus_oled.ko] undefined!
>
> (CONFIG_USB=n)

Randy,

Can you send the whole .config? I turned off USB and asus_oled still
built, but it's hard to narrow down due to all the other staging build
failures.

Thanks
~J.R.

>
> ---
> ~Randy
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>

2008-11-14 22:57:52

On Fri, Nov 14, 2008 at 10:22:04AM -0800, Randy Dunlap wrote:
> Greg KH wrote:
> > On Fri, Nov 14, 2008 at 09:52:47AM -0800, Randy Dunlap wrote:
> >> On Fri, 14 Nov 2008 18:40:21 +1100 Stephen Rothwell wrote:
> >>
> >>> Hi all,
> >>>
> >>> Changes since 20081113:
> >>>
> >>> New tree:
> >>> staging
> >>
> >> drivers/staging/benet/mpu.c:146: error: implicit declaration of function 'udelay'
> >>
> >> drivers/staging/comedi/proc.c:89: error: redefinition of 'comedi_proc_init'
> >> drivers/staging/comedi/comedidev.h:359: error: previous definition of 'comedi_proc_init' was here
> >> drivers/staging/comedi/proc.c:98: error: redefinition of 'comedi_proc_cleanup'
> >> drivers/staging/comedi/comedidev.h:362: error: previous definition of 'comedi_proc_cleanup' was here
> >
> > Odd, I'm not getting these warnings here, can you give me a copy of your
> > .config?
>
> 2 failing configs attached.
>

The comedi driver does some wonky stuff if CONFIG_PROC_FS isn't set. It
conditionally defined these functions if it's set to a forward declaration, but
then if it's not set it makes them empty. However, the *real* definitions aren't
protected by the same kind of ifdefs. In case Greg can't reproduce this, here's
a quick-n-dirty patch to do just that.

I think in reality there should be some way to exclude that proc.c file entirely
if CONFIG_PROC_FS is not set, but I'll leave that to the pros. (Whom I am adding
to the CC-list, BTW).

=

Don't include procfs functions if CONFIG_PROC_FS is not set

Signed-off by: J.R. Mauro <[email protected]>

---
drivers/staging/comedi/proc.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/comedi/proc.c b/drivers/staging/comedi/proc.c
index 7db12ac..5a2b72d 100644
--- a/drivers/staging/comedi/proc.c
+++ b/drivers/staging/comedi/proc.c
@@ -85,6 +85,7 @@ int comedi_read_procmem(char *buf, char **start, off_t offset, int len,
return l;
}

+#ifdef CONFIG_PROC_FS
void comedi_proc_init(void)
{
struct proc_dir_entry *comedi_proc;
@@ -98,3 +99,4 @@ void comedi_proc_cleanup(void)
{
remove_proc_entry("comedi", 0);
}
+#endif
--
1.6.0.3

2008-11-25 05:54:08

by Greg KH

[permalink] [raw]