linux-next: Tree for April 24

linux-next: Tree for April 24

[Stephen Rothwell]

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

Hi all,

Changes since next-20080423:

The 'driver core: remove no longer used "struct class_device"' patch has
reappeared and needs to be reverted for the usb tree to build.

Conflicts continue to disappear due to code being merged upstream.

The mtd build bug has gone.

The stack protector patches now just warn.

The firesat driver still fails to build and so is still reverted.

I am still carrying the PNP fixup patches.
----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(tar balls at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).

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/ebony_defconfig and allyesconfig.

Below is a summary of the state of the merge.

We are up to 58 trees, 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.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Merging origin/master
Applying The HTC PASIC3 LED/DS1WM chip support is ARM only
Merging x86-fixes/for-linus
Merging sched-fixes/for-linus
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/power/main.c
Merging quilt/pci
Merging quilt/usb
Created commit 76c602c: Revert "driver core: remove no longer used "struct class_device""
Merging x86/for-akpm
Merging sched/for-akpm
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/DocBook/kernel-locking.tmpl
Merging avr32/avr32-arch
Merging v4l-dvb/stable
Merging s390/features
Merging sh/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
CONFLICT (content): Merge conflict in drivers/ide/ide-cd.c
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in arch/x86/kernel/apm_32.c
Merging blackfin/for-linus
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/master
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ia64/test
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging selinux/for-akpm
Merging quilt/m68k
Merging powerpc/powerpc-next
Merging hrt/mm
Merging lblnet/master
Merging ext4/next
CONFLICT (content): Merge conflict in fs/jbd2/journal.c
CONFLICT (content): Merge conflict in fs/jbd2/revoke.c
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging security-testing/next
Merging net/master
Merging galak/powerpc-next
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/vfs-2.6.25
Merging semaphore/semaphore
Merging x86-latest/latest
Applying x86-latest-kvm-fix-1
Merging sched-latest/latest
Merging quilt/ldp
CONFLICT (content): Merge conflict in drivers/misc/Kconfig
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Created commit 65df82e: Revert "DVB: add firesat driver"
Applying parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP
Applying nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP
Applying smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP

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

Re: linux-next: Tree for April 24

[Geert Uytterhoeven]

	Hi Stephen,

On Thu, 24 Apr 2008, Stephen Rothwell wrote:
> 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.

For m68k, I've added multi_defconfig, to build a kernel for all supported m68k
platforms, excluding Sun 3 (Sun 3 kernels are incompatible with all other m68k
platforms).

Hence if you would build multi_defconfig and sun3_defconfig, you cover all of
our platforms and drivers.

Alternatively, you can just build all defconfigs, but that's more work ;-)

Thx for linux-next!

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: linux-next: Tree for April 24

[Stephen Rothwell]

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

Hi Geert,

On Thu, 24 Apr 2008 09:45:57 +0200 (CEST) Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> For m68k, I've added multi_defconfig, to build a kernel for all supported m68k
> platforms, excluding Sun 3 (Sun 3 kernels are incompatible with all other m68k
> platforms).
> 
> Hence if you would build multi_defconfig and sun3_defconfig, you cover all of
> our platforms and drivers.

Done.  Thanks.

> Alternatively, you can just build all defconfigs, but that's more work ;-)

:-)

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

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

Re: linux-next: Tree for April 24

[Geert Uytterhoeven]

On Thu, 24 Apr 2008, Stephen Rothwell wrote:
> On Thu, 24 Apr 2008 09:45:57 +0200 (CEST) Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> >
> > For m68k, I've added multi_defconfig, to build a kernel for all supported m68k
> > platforms, excluding Sun 3 (Sun 3 kernels are incompatible with all other m68k
> > platforms).
> > 
> > Hence if you would build multi_defconfig and sun3_defconfig, you cover all of
> > our platforms and drivers.
> 
> Done.  Thanks.

BTW, the results of today all seem to are unaccessible?

E.g. http://kisskb.ellerman.id.au/kisskb/buildresult/25192/

    Forbidden

    You don't have permission to access /kisskb/buildresult/25195/ on this
    server.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: linux-next: Tree for April 24

[Geert Uytterhoeven]

On Thu, 24 Apr 2008, Stephen Rothwell wrote:
> 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.

For the second day in a row, m68k builds failed because of

    fs/xfs/xfs_fsops.c:527: error: implicit declaration of function 'xfs_icsb_sync_counters_locked'
    make[3]: *** [fs/xfs/xfs_fsops.o] Error 1

According to
http://www.linux.sgi.com/archives/xfs/2008-03/msg00202.html, there's a
forward declaration for xfs_icsb_sync_counters_locked() only if HAVE_PERCPU_SB
is defined, i.e. for CONFIG_SMP. This break UP architectures.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: linux-next: Tree for April 24

[Christoph Hellwig]

On Thu, Apr 24, 2008 at 09:40:15PM +0200, Geert Uytterhoeven wrote:
> On Thu, 24 Apr 2008, Stephen Rothwell wrote:
> > 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.
> 
> For the second day in a row, m68k builds failed because of
> 
>     fs/xfs/xfs_fsops.c:527: error: implicit declaration of function 'xfs_icsb_sync_counters_locked'
>     make[3]: *** [fs/xfs/xfs_fsops.o] Error 1

Eric already submitted a patch on the xfs list, that should make it to
the tree ASAP.

Re: linux-next: Tree for April 24

[Stephen Rothwell]

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

Hi Geert,

On Thu, 24 Apr 2008 13:12:16 +0200 (CEST) Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> BTW, the results of today all seem to are unaccessible?
> 
> E.g. http://kisskb.ellerman.id.au/kisskb/buildresult/25192/
> 
>     Forbidden
> 
>     You don't have permission to access /kisskb/buildresult/25195/ on this
>     server.

These results pages are mirrored from an inaccessible server.  Sometimes
they don't get all the pages mirrored in one go (I assume).  Please try
again later.

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

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

Re: linux-next: Tree for April 24

[Michael Ellerman]

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

On Fri, 2008-04-25 at 17:20 +1000, Stephen Rothwell wrote:
> Hi Geert,
> 
> On Thu, 24 Apr 2008 13:12:16 +0200 (CEST) Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> >
> > BTW, the results of today all seem to are unaccessible?
> > 
> > E.g. http://kisskb.ellerman.id.au/kisskb/buildresult/25192/
> > 
> >     Forbidden
> > 
> >     You don't have permission to access /kisskb/buildresult/25195/ on this
> >     server.
> 
> These results pages are mirrored from an inaccessible server.  Sometimes
> they don't get all the pages mirrored in one go (I assume).  Please try
> again later.

We take a snapshot with wget, that /should/ be consistent, ie. no
dangling links. But then that gets rsync'ed, and it's possible if you're
browsing while the rsync is going you'll get a link to nowhere.

cheers

-- 
Michael Ellerman
OzLabs, IBM Australia Development Lab

wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)

We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: linux-next: Tree for April 24

[Sebastian Siewior]

* Michael Ellerman | 2008-04-25 23:32:55 [+1000]:

>We take a snapshot with wget, that /should/ be consistent, ie. no
>dangling links. But then that gets rsync'ed, and it's possible if you're
>browsing while the rsync is going you'll get a link to nowhere.
--delete-after --delay-updates --partial-dir

>cheers
>
>-- 
>Michael Ellerman

Sebastian

linux-next: Tree for April 24

[Stephen Rothwell]

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

Hi all,

I have added a tree that contains only simple build fixes for Linus'
tree.  It currently contains:

	lib: find_next_bit.o needed by a module only, move it from lib to obj
	powerpc: fix for long standing bug noticed by gcc 4.4.0

This is just an experiment for now and I am not sure if I should push
these fixes directly to Linus ...

Changes since 20090423:

New tree:
	fixes

The acpi tree gained a build failure for which I reverted a commit.

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

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 135 trees (counting Linus' and 18 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 avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
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 configfs/linux-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
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging ubifs/linux-next
Merging xfs/master
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging tracing/auto-tracing-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/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/for-next
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
CONFLICT (content): Merge conflict in drivers/net/wireless/rndis_wlan.c
CONFLICT (content): Merge conflict in include/linux/mmc/sdio_ids.h
CONFLICT (content): Merge conflict in net/mac80211/pm.c
[master ad362c6] Revert "rfkill: remove user_claim stuff"
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
Merging cifs/master
Merging mmc/next
Merging input/next
Merging bkl-removal/bkl-removal
Merging lsm/for-next
Merging block/for-next
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/cypress_m8.c
CONFLICT (content): Merge conflict in drivers/usb/serial/option.c
CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c
CONFLICT (content): Merge conflict in drivers/usb/serial/usb-serial.c
Merging agp/agp-next
Merging generic-ipi/auto-generic-ipi-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 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 kmemleak/kmemleak
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging suspend/linux-next
Merging quilt/driver-core
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
[master 15570ec] Revert "ACPI/i915: build fix"

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

Re: linux-next: Tree for April 24

[Benny Halevy]

On Apr. 24, 2009, 8:04 +0300, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
> 
> I have added a tree that contains only simple build fixes for Linus'
> tree.  It currently contains:
> 
> 	lib: find_next_bit.o needed by a module only, move it from lib to obj

Thanks Stephan!
I've already sent this patch directly to Linus (and while at it,
correcting its subject)
It's committed as a5422a5111811401f7756345e4c237ff06cf6d1e
in Linus' tree.

Benny

> 	powerpc: fix for long standing bug noticed by gcc 4.4.0
> 
> This is just an experiment for now and I am not sure if I should push
> these fixes directly to Linus ...
> 
> Changes since 20090423:
> 
> New tree:
> 	fixes
> 
> The acpi tree gained a build failure for which I reverted a commit.
> 
> ----------------------------------------------------------------------------
> 
> 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 135 trees (counting Linus' and 18 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.
> 

Re: linux-next: Tree for April 24

[Stephen Rothwell]

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

Hi Benny,

On Sun, 26 Apr 2009 16:20:36 +0300 Benny Halevy <bhalevy@panasas.com> wrote:
>
> I've already sent this patch directly to Linus (and while at it,
> correcting its subject)
> It's committed as a5422a5111811401f7756345e4c237ff06cf6d1e
> in Linus' tree.

Thanks.  I have removed it from my fixes tree.

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

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