linux-next: Tree for June 22

linux-next: Tree for June 22

[Stephen Rothwell]

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

Hi all,

[The kernel.org mirroring is being slow today]

Changes since 20110621:

The powerpc allyesconfig (and probably others) is still broken because we
now build the staging drivers and because of a commit in Linus' tree.

The m68knommu tree gained a conflict against the m68k tree.

The net tree lost its conflicts.

The mfd tree lost its build failure.

The gpio tree gained a conflict against the mfd tree.

The tmem tree gained a conflict against the xen-two tree.

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

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/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 - this fails its final link) 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 194 trees (counting Linus' and 28 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 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 kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/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 driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/mm/context.c
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/mm/proc-v7.S
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
CONFLICT (delete/modify): arch/m68k/include/asm/bitops_mm.h deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68k/include/asm/bitops_mm.h left in tree.
$ git rm -f arch/m68k/include/asm/bitops_mm.h
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020ds.dts
CONFLICT (content): Merge conflict in arch/powerpc/boot/dts/p2020rdb.dts
CONFLICT (content): Merge conflict in arch/powerpc/sysdev/mpic.c
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
CONFLICT (content): Merge conflict in fs/ceph/export.c
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging of-pci/of-pci
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
CONFLICT (content): Merge conflict in arch/x86/kernel/process.c
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging slave-dma/next
Merging async_tx/next
Merging net/master
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/pci.c
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
Merging mtd/master
Merging l2-mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/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
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
CONFLICT (delete/modify): drivers/mmc/host/sdhci-of-core.c deleted in mmc/mmc-next and modified in HEAD. Version HEAD of drivers/mmc/host/sdhci-of-core.c left in tree.
$ git rm -f drivers/mmc/host/sdhci-of-core.c
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 fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
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 (delete/modify): arch/arm/mach-ep93xx/dma-m2p.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-ep93xx/dma-m2p.c left in tree.
CONFLICT (delete/modify): arch/s390/kvm/sie64a.S deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/s390/kvm/sie64a.S left in tree.
CONFLICT (content): Merge conflict in drivers/mtd/maps/pxa2xx-flash.c
$ git rm -f arch/arm/mach-ep93xx/dma-m2p.c
$ git rm -f arch/s390/kvm/sie64a.S
Merging audit/for-next
Merging suspend/linux-next
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/devicetree/next
Merging spi/spi/next
Merging gpio/gpio/next
CONFLICT (content): Merge conflict in arch/arm/mach-ep93xx/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in drivers/gpio/gpio-ep93xx.c
Merging tip/auto-latest
Merging rcu/rcu/next
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_linux.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmfmac/wl_iw.c
CONFLICT (content): Merge conflict in drivers/staging/usbip/userspace/src/utils.h
Merging bkl-config/config
Merging tmem/linux-next
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
CONFLICT (content): Merge conflict in drivers/xen/tmem.c
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging scsi-post-merge/merge-base:master

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

[PATCH -next] mfd: tps65912 needs MFD_CORE

[Randy Dunlap]

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

MFD_TPS65912 should select MFD_CORE so that mfd interfaces are
available to it.  This fixes a build error when MFD_CORE=m and
MFD_TPS65912=y (and no other TPS65912 kconfig symbols are enabled,
so no other select MFD_CORE was done).

drivers/built-in.o: In function `tps65912_device_exit':
(.text+0x61124): undefined reference to `mfd_remove_devices'
drivers/built-in.o: In function `tps65912_device_init':
(.text+0x61216): undefined reference to `mfd_add_devices'
drivers/built-in.o: In function `tps65912_device_init':
(.text+0x61240): undefined reference to `mfd_remove_devices'

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

--- linux-next-20110622.orig/drivers/mfd/Kconfig
+++ linux-next-20110622/drivers/mfd/Kconfig
@@ -173,6 +173,7 @@ config MFD_TPS6586X
 
 config MFD_TPS65912
 	bool "TPS65912 PMIC"
+	select MFD_CORE
 	depends on GPIOLIB
 
 config MFD_TPS65912_I2C

[PATCH -next] bluetooth: uses crypto interfaces, select CRYPTO

[Randy Dunlap]

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

Recent changes to hci_core.c use crypto interfaces, so select CRYPTO
to make sure that those interfaces are present.

Fixes these build errors when CRYPTO is not enabled:

net/built-in.o: In function `hci_register_dev':
(.text+0x4cf86): undefined reference to `crypto_alloc_base'
net/built-in.o: In function `hci_unregister_dev':
(.text+0x4f912): undefined reference to `crypto_destroy_tfm'

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

--- linux-next-20110622.orig/net/bluetooth/Kconfig
+++ linux-next-20110622/net/bluetooth/Kconfig
@@ -6,6 +6,7 @@ menuconfig BT
 	tristate "Bluetooth subsystem support"
 	depends on NET && !S390
 	depends on RFKILL || !RFKILL
+	select CRYPTO
 	help
 	  Bluetooth is low-cost, low-power, short-range wireless technology.
 	  It was designed as a replacement for cables and other short-range

Re: [PATCH -next] mfd: tps65912 needs MFD_CORE

[Mark Brown]

On Wed, Jun 22, 2011 at 10:06:15AM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> MFD_TPS65912 should select MFD_CORE so that mfd interfaces are
> available to it.  This fixes a build error when MFD_CORE=m and
> MFD_TPS65912=y (and no other TPS65912 kconfig symbols are enabled,
> so no other select MFD_CORE was done).

I posted a better patch for this earlier today - the bigger problem here
is that as with other MFD cores MFD_TPS65912 shouldn't be directly
selectable at all as it can't do anything useful without a bus
interface.

Re: [PATCH -next] mfd: tps65912 needs MFD_CORE

[Randy Dunlap]

On Wed, 22 Jun 2011 19:29:15 +0100 Mark Brown wrote:

> On Wed, Jun 22, 2011 at 10:06:15AM -0700, Randy Dunlap wrote:
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> > 
> > MFD_TPS65912 should select MFD_CORE so that mfd interfaces are
> > available to it.  This fixes a build error when MFD_CORE=m and
> > MFD_TPS65912=y (and no other TPS65912 kconfig symbols are enabled,
> > so no other select MFD_CORE was done).
> 
> I posted a better patch for this earlier today - the bigger problem here
> is that as with other MFD cores MFD_TPS65912 shouldn't be directly
> selectable at all as it can't do anything useful without a bus
> interface.

Good.  Hopefully such a kconfig won't be possible in the
future then.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [PATCH -next] bluetooth: uses crypto interfaces, select CRYPTO

[Randy Dunlap]

On Wed, 22 Jun 2011 10:08:11 -0700 Randy Dunlap wrote:

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

ping.  still need this patch in linux-next....


> Recent changes to hci_core.c use crypto interfaces, so select CRYPTO
> to make sure that those interfaces are present.
> 
> Fixes these build errors when CRYPTO is not enabled:
> 
> net/built-in.o: In function `hci_register_dev':
> (.text+0x4cf86): undefined reference to `crypto_alloc_base'
> net/built-in.o: In function `hci_unregister_dev':
> (.text+0x4f912): undefined reference to `crypto_destroy_tfm'
> 
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
>  net/bluetooth/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- linux-next-20110622.orig/net/bluetooth/Kconfig
> +++ linux-next-20110622/net/bluetooth/Kconfig
> @@ -6,6 +6,7 @@ menuconfig BT
>  	tristate "Bluetooth subsystem support"
>  	depends on NET && !S390
>  	depends on RFKILL || !RFKILL
> +	select CRYPTO
>  	help
>  	  Bluetooth is low-cost, low-power, short-range wireless technology.
>  	  It was designed as a replacement for cables and other short-range
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: [PATCH -next] bluetooth: uses crypto interfaces, select CRYPTO

[Randy Dunlap]

On Wed, 22 Jun 2011 10:08:11 -0700 Randy Dunlap wrote:

> From: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>

ping.  still need this patch in linux-next....


> Recent changes to hci_core.c use crypto interfaces, so select CRYPTO
> to make sure that those interfaces are present.
> 
> Fixes these build errors when CRYPTO is not enabled:
> 
> net/built-in.o: In function `hci_register_dev':
> (.text+0x4cf86): undefined reference to `crypto_alloc_base'
> net/built-in.o: In function `hci_unregister_dev':
> (.text+0x4f912): undefined reference to `crypto_destroy_tfm'
> 
> Signed-off-by: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> ---
>  net/bluetooth/Kconfig |    1 +
>  1 file changed, 1 insertion(+)
> 
> --- linux-next-20110622.orig/net/bluetooth/Kconfig
> +++ linux-next-20110622/net/bluetooth/Kconfig
> @@ -6,6 +6,7 @@ menuconfig BT
>  	tristate "Bluetooth subsystem support"
>  	depends on NET && !S390
>  	depends on RFKILL || !RFKILL
> +	select CRYPTO
>  	help
>  	  Bluetooth is low-cost, low-power, short-range wireless technology.
>  	  It was designed as a replacement for cables and other short-range
> --


---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH -next] bluetooth: uses crypto interfaces, select CRYPTO

[Gustavo F. Padovan]

* Randy Dunlap <randy.dunlap@oracle.com> [2011-06-27 11:03:08 -0700]:

> On Wed, 22 Jun 2011 10:08:11 -0700 Randy Dunlap wrote:
> 
> > From: Randy Dunlap <randy.dunlap@oracle.com>
> 
> ping.  still need this patch in linux-next....
> 
> 
> > Recent changes to hci_core.c use crypto interfaces, so select CRYPTO
> > to make sure that those interfaces are present.
> > 
> > Fixes these build errors when CRYPTO is not enabled:
> > 
> > net/built-in.o: In function `hci_register_dev':
> > (.text+0x4cf86): undefined reference to `crypto_alloc_base'
> > net/built-in.o: In function `hci_unregister_dev':
> > (.text+0x4f912): undefined reference to `crypto_destroy_tfm'
> > 
> > Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> > ---
> >  net/bluetooth/Kconfig |    1 +
> >  1 file changed, 1 insertion(+)

Applied. Thanks.

	Gustavo

Re: [PATCH -next] bluetooth: uses crypto interfaces, select CRYPTO

[Gustavo F. Padovan]

* Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> [2011-06-27 11:03:08 -0700]:

> On Wed, 22 Jun 2011 10:08:11 -0700 Randy Dunlap wrote:
> 
> > From: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> 
> ping.  still need this patch in linux-next....
> 
> 
> > Recent changes to hci_core.c use crypto interfaces, so select CRYPTO
> > to make sure that those interfaces are present.
> > 
> > Fixes these build errors when CRYPTO is not enabled:
> > 
> > net/built-in.o: In function `hci_register_dev':
> > (.text+0x4cf86): undefined reference to `crypto_alloc_base'
> > net/built-in.o: In function `hci_unregister_dev':
> > (.text+0x4f912): undefined reference to `crypto_destroy_tfm'
> > 
> > Signed-off-by: Randy Dunlap <randy.dunlap-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> > ---
> >  net/bluetooth/Kconfig |    1 +
> >  1 file changed, 1 insertion(+)

Applied. Thanks.

	Gustavo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: linux-next: Tree for June 22

[Stephen Rothwell]

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

On Tue, 22 Jun 2010 09:53:51 +0200 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> On Tue, Jun 22, 2010 at 08:05, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Status of my local build tests will be at
> > http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
> 
> Which hasn't changed since June 18?

Yeah, the build server ran out of inodes.  It should update later
tonight/today.

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

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

Re: linux-next: Tree for June 22

[Geert Uytterhoeven]

On Tue, Jun 22, 2010 at 08:05, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Status of my local build tests will be at
> http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give

Which hasn't changed since June 18?

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

linux-next: Tree for June 22

[Stephen Rothwell]

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

Hi all,

Changes since 20100621:

My fixes tree contains:
      v4l-dvb: update gfp/slab.h includes
      arm: update gfp/slab.h includes
      davinci: update gfp/slab.h includes
      ocfs2: update gfp/slab.h includes
      acpi: update gfp/slab.h includes

The vfs tree gained a build failure due to an interaction with the v9fs
tree for which I applied a merge fix patch.

The i2c tree lost its build failure.

The tip tree gained a conflict against the block tree.

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

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/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 - this fails its final link) 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 164 trees (counting Linus' and 22 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/for-linus
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.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 ide-curent/master
Merging dwmw2/master
Merging gcl-current/merge
Merging arm/devel
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging tegra/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
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
Merging sparc/master
Merging tile/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
CONFLICT (content): Merge conflict in fs/ecryptfs/main.c
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Applying: v9fs: fixup for inode_setattr being removed
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging ibft/master
Merging swiotlb/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
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
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/evergreen.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r600.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_combios.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/rv770.c
Merging viafb/viafb-next
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
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree.
$ git rm -f fs/notify/inotify/inotify.c
Applying: fsnotify: update gfp/slab.h includes
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging catalin/for-next
Merging alacrity/linux-next
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in fs/fs-writeback.c
CONFLICT (content): Merge conflict in net/bridge/br_fdb.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebt_redirect.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebt_ulog.c
CONFLICT (content): Merge conflict in net/bridge/netfilter/ebtables.c
CONFLICT (content): Merge conflict in net/netfilter/nfnetlink_log.c
CONFLICT (content): Merge conflict in net/netfilter/nfnetlink_queue.c
Applying: net: merge fixups for bridge rcu code
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
CONFLICT (content): Merge conflict in mm/memory-failure.c
Merging sysctl/master
Merging bkl-core/bkl/core
Merging bkl-procfs/bkl/procfs
Merging bkl-ioctl/bkl/ioctl
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging staging-next/staging-next
Merging slabh/slabh
Merging scsi-post-merge/master

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

Re: linux-next: Tree for June 22

[Stephen Rothwell]

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

Hi Thorsten,

On Mon, 22 Jun 2009 19:23:31 +0200 Thorsten Leemhuis <fedora@leemhuis.info> wrote:
>
> On 22.06.2009 10:26, Stephen Rothwell wrote:
> > On Mon, 22 Jun 2009 18:19:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> Changes since 20090619:
> > 
> > The current "git diff --stat -M stable..HEAD^" ends like this:
> 
> Side note: above command doesn't work here (Fedora 11, git version 1.6.2.2):
> 
> $ git diff --stat -M 'stable..HEAD^'
> fatal: ambiguous argument 'stable..HEAD^': unknown revision or path not
> in the working tree.
> Use '--' to separate paths from revisions
> 
> This command OTOH...
> $ git diff --stat -M 'origin/stable..origin/HEAD^'
> ...seems to work just fine and gives the result your posted:

That is because the "stable" and "HEAD" refs (branches) are local for me
since linux-next is my tree.  They are remote for you since you fetched
them, so their names are different.

> Is it possible somehow to export the individual patches that are
> currently in linux-next? I tried
> 
>  git format-patch -M -o ../tmp 'origin/stable..origin/HEAD^'
> 
> but that resulted in 3269 files with commits/patches that sum up to
> 38 MByte. Some of those patches (seems 1919 alone from the KVM tree...)
> are quite old. The first one for example is
> 0001-KVM-mmu-add-missing-dirty-page-tracking-cases.patch :

The kvm tree is actually a bit of a pain and I am considering what to do
about it.  The tree I am currently fetching into linux-next contains all
the history of their development (at least back a considerable time).
When they decide to send things to Linus, they seem to rebase a subset of
their current patches onto another branch that is based on Linus' tree
and then ask him to pull that.  So the commits in Linus' tree never have
the same SAH1s as the ones in the linux-next tree and in many cases, they
don't even have the same patch-ids as they have been rebased.

You can extract the commits in each tree by using the SHA1s in the
Next/SHA1s file.  So, for example, in yesterday's tree the SHA1 for the
net tree was 6be832529a8129c9d90a1d3a78c5d503a710b6fc, so the commits are
origin/stable..6be832529a8129c9d90a1d3a78c5d503a710b6fc.  This doesn't
work for the kvm tree (see above).

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

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

Re: linux-next: Tree for June 22

[Thorsten Leemhuis]

/me drops LKML from CC, as this is linux-next specific

Hi!

Just a quick question from a git rookie:

On 22.06.2009 10:26, Stephen Rothwell wrote:
> On Mon, 22 Jun 2009 18:19:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Changes since 20090619:
> 
> The current "git diff --stat -M stable..HEAD^" ends like this:

Side note: above command doesn't work here (Fedora 11, git version 1.6.2.2):

$ git diff --stat -M 'stable..HEAD^'
fatal: ambiguous argument 'stable..HEAD^': unknown revision or path not
in the working tree.
Use '--' to separate paths from revisions

This command OTOH...
$ git diff --stat -M 'origin/stable..origin/HEAD^'
...seems to work just fine and gives the result your posted:


> 	835 files changed, 46602 insertions(+), 14044 deletions(-)

I just mention it because it might be relevant. The real reason why I
write this mail is this:

Is it possible somehow to export the individual patches that are
currently in linux-next? I tried

 git format-patch -M -o ../tmp 'origin/stable..origin/HEAD^'

but that resulted in 3269 files with commits/patches that sum up to
38 MByte. Some of those patches (seems 1919 alone from the KVM tree...)
are quite old. The first one for example is
0001-KVM-mmu-add-missing-dirty-page-tracking-cases.patch :
"""
> From 2959cd13ecc1fbe1b2339937481844ff963f1e7f Mon Sep 17 00:00:00 2001
> From: Avi Kivity <avi@qumranet.com>
> Date: Mon, 19 Feb 2007 14:37:46 +0200
> Subject: [PATCH 0001/3269] KVM: mmu: add missing dirty page tracking cases
> 
> We fail to mark a page dirty in three cases:
> 
> - setting the accessed bit in a pte
> - setting the dirty bit in a pte
> - emulating a write into a pagetable
> 
> This fix adds the missing cases.
> [...]
"""

It afaics was merged in linus tree ages ago:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bf3f8e86c2e22b9bd1375be1bbbd67384dba4342

I suspect I do something wrong, but I could not find what exactly what
I'm doing wrong... Could anybody give me some insight/help? tia!

CU
knurd

Re: linux-next: Tree for June 22

[Stephen Rothwell]

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

On Mon, 22 Jun 2009 18:19:20 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Changes since 20090619:

The current "git diff --stat -M stable..HEAD^" ends like this:

	835 files changed, 46602 insertions(+), 14044 deletions(-)

So, we must be nearly there. :-)

$ git diff --dirstat -M stable..HEAD^
   3.8% Documentation/
   4.9% arch/arm/configs/
   6.6% arch/arm/
   4.3% arch/m68k/include/asm/
   3.0% arch/x86/kvm/
   3.3% arch/x86/
   3.6% arch/
   4.6% drivers/firewire/
   5.2% drivers/md/
   3.5% drivers/misc/
   4.7% drivers/mtd/
   4.0% drivers/pci/hotplug/
   3.2% drivers/pci/pcie/
   4.2% drivers/watchdog/
  14.9% drivers/
   7.1% fs/
   4.1% include/linux/
   9.5% mm/

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

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

linux-next: Tree for June 22

[Stephen Rothwell]

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

Hi all,

Changes since 20090619:

New trees:
	davinci
	hwlat

Changed tree:
	ide (new maintainer)

My fixes tree contains this one commit:

	fbdev: work around old compiler bug (this works around a bug in
old compilers).

This tree fails to build for powerpc allyesconfig.

The kvm tree lost its conflict and build failure.

The net/wireless trees gained a conflict against the acpi tree.

The rr tree lost its conflicts.

The watchdog tree lost its conflict.

The driver-core tree lost its conflicts.

The staging tree lost its conflicts.

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

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 130 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.

-- 
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 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 (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
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
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
CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging bkl-removal/bkl-removal
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
CONFLICT (content): Merge conflict in mm/Makefile
Applying: slqb: fix for macro name change
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
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.c
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
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/mm/fault.c
Merging asm-generic/next
Merging quilt/driver-core
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
Applying: fbdev: work around old compiler bug

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