Hi all,
[The mirroring on kernel.org is running slowly]
Changes since 20101217:
The arm tree lost its conflict.
The rmobile tree gained a conflict against the rmobile-current tree.
The pci tree gained a conflict against Linus' tree.
The net tree lost 4 conflicts.
The mfd tree gained a conflict against the ux500-core tree and a build
failure for which I reverted a commit.
The percpu tree lost its conflict.
The tty tree still has its build failure so I reverted a commit.
The usb tree gained a conflict against the usb.current 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 183 trees (counting Linus' and 26 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 [email protected]
$ 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/rc-fixes
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 gcl-current/merge
Merging arm/devel
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
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/timer.c
Merging ux500-core/ux500-core
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
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/include/mach/entry-macro.S
Applying: rmobile: merge fixup for clkdev changes
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
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
CONFLICT (content): Merge conflict in fs/cifs/dir.c
CONFLICT (content): Merge conflict in fs/fuse/inode.c
CONFLICT (content): Merge conflict in fs/hfsplus/hfsplus_fs.h
CONFLICT (content): Merge conflict in fs/hfsplus/unicode.c
Merging pci/linux-next
CONFLICT (add/add): Merge conflict in arch/x86/kernel/resource.c
CONFLICT (content): Merge conflict in arch/x86/pci/i386.c
CONFLICT (content): Merge conflict in kernel/resource.c
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 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
CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-1000.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-6000.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/Makefile
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
CONFLICT (content): Merge conflict in include/linux/input.h
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in drivers/scsi/sd.c
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
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (delete/modify): drivers/mfd/tc35892.c deleted in HEAD and modified in mfd/for-next. Version mfd/for-next of drivers/mfd/tc35892.c left in tree.
CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c
$ git rm -f drivers/mfd/tc35892.c
Applying: mfd: Convert tc35892 to new irq_ APIs
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/core.c
CONFLICT (content): Merge conflict in drivers/regulator/mc13783-regulator.c
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 (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/pm24xx.c
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
Merging swiotlb-xen/master
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
CONFLICT (content): Merge conflict in drivers/xen/Makefile
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
[master f28cfe5] Revert "drivers: serial: apbuart: Handle OF failures gracefully"
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/sh/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/gadget/composite.c
Merging staging/staging-next
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c
CONFLICT (content): Merge conflict in include/linux/hardirq.h
CONFLICT (content): Merge conflict in include/linux/smp_lock.h
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/super.c
CONFLICT (content): Merge conflict in fs/super.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
[master c7dc3ea] Revert "mfd: Remove ARCH_U8500 dependency from AB8500"
> Hi all,
>
> [The mirroring on kernel.org is running slowly]
Indeed, you know what's wrong with the mirrors?
Can you upload the diff-patch (patch-v2.6.37-rc6-next-20101220) to [1]
from your local-tree or place it somewhere else?
- Sedat -
[1] http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/
Hi,
On Mon, 20 Dec 2010 12:46:08 +0100 Sedat Dilek <[email protected]> wrote:
>
> >
> > [The mirroring on kernel.org is running slowly]
>
> Indeed, you know what's wrong with the mirrors?
I don't know what is wrong. The mirroring just seems to be much slower
in the last week or so. Today, it was just over three hours from when I
uploaded linux-next until it was mirrored out.
I have cc'd the admins.
> Can you upload the diff-patch (patch-v2.6.37-rc6-next-20101220) to [1]
> from your local-tree or place it somewhere else?
I cannot upload directly to http://www.kernel.org, I up load to the same place
on master.kernel.org and the mirroring system puts it on http://www.kernel.org.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Mon, Dec 20, 2010 at 1:00 PM, Stephen Rothwell <[email protected]> wrote:
> Hi,
>
> On Mon, 20 Dec 2010 12:46:08 +0100 Sedat Dilek <[email protected]> wrote:
>>
>> >
>> > [The mirroring on kernel.org is running slowly]
>>
>> Indeed, you know what's wrong with the mirrors?
>
> I don't know what is wrong. The mirroring just seems to be much slower
> in the last week or so. Today, it was just over three hours from when I
> uploaded linux-next until it was mirrored out.
>
> I have cc'd the admins.
>
Thanks.
>> Can you upload the diff-patch (patch-v2.6.37-rc6-next-20101220) to [1]
>> from your local-tree or place it somewhere else?
>
> I cannot upload directly to http://www.kernel.org, I up load to the same place
> on master.kernel.org and the mirroring system puts it on http://www.kernel.org.
>
I could download the diff-patch.
$ wget http://www.kernel.org/pub/linux/kernel/v2.6/next/patch-v2.6.37-rc6-next-20101220.bz2
- Sedat -
Ave,
2010/12/20 Stephen Rothwell <[email protected]>:
> Hi all,
>
> [The mirroring on kernel.org is running slowly]
>
Looks like something is borked
Fetching linux-next
fatal: The remote end hung up unexpectedly
fatal: protocol error: bad pack header
error: Could not fetch linux-next
--
Slawa!
Zimny "Spie dziadu!" Lech z Wawelu
Hej, tam!
Wydar?em klejnot szans
http://www.youtube.com/watch?v=VXWTlYzVFUA
On Mon, 20 Dec 2010 20:00:13 +1100 Stephen Rothwell wrote:
> Hi all,
>
> [The mirroring on kernel.org is running slowly]
>
> Changes since 20101217:
ERROR: "thermal_cooling_device_register" [drivers/acpi/video.ko] undefined!
ERROR: "thermal_cooling_device_unregister" [drivers/acpi/video.ko] undefined!
STUB_POULSBO=m selects ACPI_VIDEO=m
ACPI_VIDEO=m selects THERMAL (did not happen, kconfig does not follow
select chains)
and THERMAL needs to have "depends on NET" to prevent other reported build
errors.
kernel config file is attached.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
desserts: http://www.xenotime.net/linux/recipes/
On 12/20/2010 04:12 AM, Sedat Dilek wrote:
> On Mon, Dec 20, 2010 at 1:00 PM, Stephen Rothwell <[email protected]> wrote:
>> Hi,
>>
>> On Mon, 20 Dec 2010 12:46:08 +0100 Sedat Dilek <[email protected]> wrote:
>>>
>>>>
>>>> [The mirroring on kernel.org is running slowly]
>>>
>>> Indeed, you know what's wrong with the mirrors?
>>
>> I don't know what is wrong. The mirroring just seems to be much slower
>> in the last week or so. Today, it was just over three hours from when I
>> uploaded linux-next until it was mirrored out.
>>
>> I have cc'd the admins.
>>
>
> Thanks.
Gingerbread released last week, loads have been spiking to well above
300 on the frontend machines, RAM usage has been in the ~20G range (on
machines with 16G of RAM), and we've been running an *AVERAGE* of 2000+
simultaneous GIT processes worldwide (normal is in the 100-200 range).
Bonus points that we blew a drive on one of the machines yesterday.
I don't think anyone was quite expecting the onslaught we have gotten
this time around, and I'm going to have to make some changes before the
next big release (mainly shifting Android over to the bigger machines)
>>> Can you upload the diff-patch (patch-v2.6.37-rc6-next-20101220) to [1]
>>> from your local-tree or place it somewhere else?
>>
>> I cannot upload directly to http://www.kernel.org, I up load to the same place
>> on master.kernel.org and the mirroring system puts it on http://www.kernel.org.
>>
>
> I could download the diff-patch.
>
> $ wget http://www.kernel.org/pub/linux/kernel/v2.6/next/patch-v2.6.37-rc6-next-20101220.bz2
Running a quick set of stats against the logs we keep from the syncing
I'm seeing:
All of December:
------------------
Number of cycles: 5848
Total amount of time spent syncing: 1544407sec
Average Sync times: 264sec
Longest time: 24011sec
Shortest time: 42sec
Last 10 days:
------------------
Number of cycles: 2144
Total amount of time spent syncing: 845762sec
Average Sync times: 394sec
Longest time: 24011sec
Shortest time: 45sec
With cyclical patterns of fast and slow syncs. We seem to be (right
now) in the middle of one of the slow cycles with the last few syncs
taking a couple of hours each. The culprit, for at least the current
sync, seems to be the box with the highest load and the blown drive,
which I'm also reluctant to disable since it's still handling it's fair
share of the load and dumping all of that onto the opposite US mirror
would not be good either.
- John 'Warthog9' Hawley
Hi,
>>> [The mirroring on kernel.org is running slowly]
>> Indeed, you know what's wrong with the mirrors?
> I don't know what is wrong. The mirroring just seems to be much
> slower in the last week or so. Today, it was just over three
> hours from when I uploaded linux-next until it was mirrored out.
I asked on IRC yesterday; we're still under high load from the Android
Gingerbread release, which is causing many concurrent Git accesses
(around 1500 simultaneous yesterday).
Thanks,
--
Chris Ball <[email protected]>
One Laptop Per Child
Hi John,
On Mon, 20 Dec 2010 10:29:44 -0800 "J.H." <[email protected]> wrote:
>
> Gingerbread released last week, loads have been spiking to well above
> 300 on the frontend machines, RAM usage has been in the ~20G range (on
> machines with 16G of RAM), and we've been running an *AVERAGE* of 2000+
> simultaneous GIT processes worldwide (normal is in the 100-200 range).
>
> Bonus points that we blew a drive on one of the machines yesterday.
>
> I don't think anyone was quite expecting the onslaught we have gotten
> this time around, and I'm going to have to make some changes before the
> next big release (mainly shifting Android over to the bigger machines)
Thanks for the info. I figured something like that was up. I guess we
all just need to be patient for a while.
> With cyclical patterns of fast and slow syncs. We seem to be (right
> now) in the middle of one of the slow cycles with the last few syncs
> taking a couple of hours each. The culprit, for at least the current
> sync, seems to be the box with the highest load and the blown drive,
> which I'm also reluctant to disable since it's still handling it's fair
> share of the load and dumping all of that onto the opposite US mirror
> would not be good either.
Fair enough.
I normally wait for the sync to happen before I send out the linux-next
release message each day. I will continue to wait for a while, but will
lower my expectations :-)
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Hi,
On Mon, 20 Dec 2010 17:14:34 +0100 Zimny Lech <[email protected]> wrote:
>
> Looks like something is borked
>
> Fetching linux-next
> fatal: The remote end hung up unexpectedly
> fatal: protocol error: bad pack header
> error: Could not fetch linux-next
It works for me now, though it is slow. Apparently the kernel.org
machines are under quite a bit of load after the recent Android release.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/