Hi all,
This one has also not had the build testing *between* merges, but has had
all the normal build testing at the end.There may be more unbisectable
points in the tree then usual.
Changes since 20091230:
My fixes tree is again empty with the equivalent of its patch being added
to Linus' 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 155 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 [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/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 arm/devel
Merging davinci/davinci-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
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/master
Merging sparc/master
Merging xtensa/master
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 jfs/next
Merging logfs/master
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
CONFLICT (add/add): Merge conflict in fs/9p/cache.c
Merging ubifs/linux-next
Merging xfs/master
CONFLICT (add/add): Merge conflict in fs/xfs/linux-2.6/xfs_trace.h
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
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 ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/scan.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging tmio-mmc/linux-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
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
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging hwlat/for-linus
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging drbd/for-jens
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging limits/writable_limits
CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h
CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S
Merging omap_dss2/for-next
Merging tip/auto-latest
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Applying: slab: update for percpu API change
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
On Thu, 31 Dec 2009 11:23:14 +1100 Stephen Rothwell wrote:
> Hi all,
>
> This one has also not had the build testing *between* merges, but has had
> all the normal build testing at the end.There may be more unbisectable
> points in the tree then usual.
>
> Changes since 20091230:
>
> My fixes tree is again empty with the equivalent of its patch being added
> to Linus' tree.
when CONFIG_PROC_FS is not enabled:
kernel/built-in.o: In function `kdb_summary':
kdb_main.c:(.text+0x6a413): undefined reference to `_meminfo_proc_show'
when CONFIG_KGDB_KDB is not enabled:
kernel/built-in.o: In function `kdb_dmesg':
kdb_main.c:(.text+0x6b5c4): undefined reference to `kdb_syslog_data'
when CONFIG_KDB_KEYBOARD is not enabled:
drivers/built-in.o: In function `cleanup_kgdboc':
kgdboc.c:(.text+0x1ee2df): undefined reference to `kdb_get_kbd_char'
drivers/built-in.o: In function `configure_kgdboc':
kgdboc.c:(.text+0x1ee463): undefined reference to `kdb_get_kbd_char'
---
~Randy
The kgdb bits break ia64 (and any other architecture without an
<asm/kgdb.h> too):
In file included from include/drm/drm_fb_helper.h:33,
from include/drm/drm_crtc_helper.h:42,
from drivers/gpu/drm/radeon/radeon_device.c:30:
include/linux/kgdb.h:21:22: error: asm/kgdb.h: No such file or directory
In file included from include/drm/drm_fb_helper.h:33,
from include/drm/drm_crtc_helper.h:42,
from drivers/gpu/drm/radeon/radeon_device.c:30:
include/linux/kgdb.h:86: error: 'BREAK_INSTR_SIZE' undeclared here
(not in a function)
Perhaps it is time for me to dust off the partially working kgdb
patches that I had a
year ago.
-Tony
Hi Jason,
On Thu, 31 Dec 2009 11:20:02 -0800 Tony Luck <[email protected]> wrote:
>
> The kgdb bits break ia64 (and any other architecture without an
> <asm/kgdb.h> too):
>
> In file included from include/drm/drm_fb_helper.h:33,
> from include/drm/drm_crtc_helper.h:42,
> from drivers/gpu/drm/radeon/radeon_device.c:30:
> include/linux/kgdb.h:21:22: error: asm/kgdb.h: No such file or directory
> In file included from include/drm/drm_fb_helper.h:33,
> from include/drm/drm_crtc_helper.h:42,
> from drivers/gpu/drm/radeon/radeon_device.c:30:
> include/linux/kgdb.h:86: error: 'BREAK_INSTR_SIZE' undeclared here
> (not in a function)
I have used the version of the kgdb tree from next-20091230 for today
(effectively dropping it), sorry.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Thu, Dec 31, 2009 at 5:04 PM, Stephen Rothwell <[email protected]> wrote:
> I have used the version of the kgdb tree from next-20091230 for today
> (effectively dropping it), sorry.
I checked in my year-old partially working kgdb patch for ia64 to my
test tree. So ia64 should be covered now. Don't know whether other
non-kgdb architectures use these drm bits.
-Tony
Tony Luck wrote:
> The kgdb bits break ia64 (and any other architecture without an
> <asm/kgdb.h> too):
>
>
Certainly this was not intended. It is properly fixed now in and
folded into a number of the kgdb patches so everything will properly
bisect. It is updated in kgdb-next.
Thanks,
Jason.
Randy Dunlap wrote:
> On Thu, 31 Dec 2009 11:23:14 +1100 Stephen Rothwell wrote:
>
>
>> Hi all,
>>
>> This one has also not had the build testing *between* merges, but has had
>> all the normal build testing at the end.There may be more unbisectable
>> points in the tree then usual.
>>
>> Changes since 20091230:
>>
>> My fixes tree is again empty with the equivalent of its patch being added
>> to Linus' tree.
>>
>
>
> when CONFIG_PROC_FS is not enabled:
>
> kernel/built-in.o: In function `kdb_summary':
> kdb_main.c:(.text+0x6a413): undefined reference to `_meminfo_proc_show'
>
>
>
Fixed.
> when CONFIG_KGDB_KDB is not enabled:
>
> kernel/built-in.o: In function `kdb_dmesg':
> kdb_main.c:(.text+0x6b5c4): undefined reference to `kdb_syslog_data'
>
>
When CONFIG_KGDB_KDB is not set, it is not possible to compile
kdb_main.c. This one was actually due to compiling a kernel with
CONFIG_PRINTK=n and CONFIG_KGDB_KDB=y.
It is fixed.
> when CONFIG_KDB_KEYBOARD is not enabled:
>
> drivers/built-in.o: In function `cleanup_kgdboc':
> kgdboc.c:(.text+0x1ee2df): undefined reference to `kdb_get_kbd_char'
> drivers/built-in.o: In function `configure_kgdboc':
> kgdboc.c:(.text+0x1ee463): undefined reference to `kdb_get_kbd_char'
>
>
>
If CONFIG_KDB_KEYBOARD is not enabled there is no way to get these
functions. This one was actually due to compiling CONFIG_KDB_KEYBOARD=y
and CONFIG_VT_CONSOLE=n.
It is fixed as well.
The changes are folded into the 2 offending patches in the kdb patches
in the kgdb-next branch for proper bisecting patches.
Thanks for the report.
Jason.
Hi Jason,
On Fri, 01 Jan 2010 23:33:08 -0600 Jason Wessel <[email protected]> wrote:
>
> Tony Luck wrote:
> > The kgdb bits break ia64 (and any other architecture without an
> > <asm/kgdb.h> too):
>
> Certainly this was not intended. It is properly fixed now in and
> folded into a number of the kgdb patches so everything will properly
> bisect. It is updated in kgdb-next.
Thanks, I will pick it up on Monday.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/