LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: Tree for March 6
@ 2009-03-06  8:13 Stephen Rothwell
  2009-03-06 19:01 ` linux-next: Tree for March 6 (ath9k) Randy Dunlap
                   ` (2 more replies)
  0 siblings, 3 replies; 16+ messages in thread
From: Stephen Rothwell @ 2009-03-06  8:13 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Linus' release of -rc7 seems to have stirred people up a bit ...

Changes since 20090305:

Undropped tree:
	v4l-dvb

Dropped trees (temporary):
	rr (build problem)

The x86 tree lost a conflict.

The tip-core tree gained a conflict against the arm tree.

The tracing tree gained a conflict against each of the cpus4096 and
tip-core trees.

The sched tree gained a conflict against the x86 tree.

The vl4-dvb tree lost its build failure.

The kernel-doc tree gained a conflict against each of the tracing and
timers trees.

The ieee1394 tree gained a conflict against Linus' tree.

The ocfs2 tree lost its conflict.

The net tree gained a conflict against the wireless-current tree.

The cpufreq tree gained a conflict against the x86 tree.

The rr tree gained a conflict against each of the blackfin and x86
trees.  It was dropped due to the build failures yesterday.

The kmemcheck tree gained 3 conflicts against the x86 tree and 1 against
the tracing tree.

The iommu tree lost its conflict.

The kmemleak tree gained 3 conflicts against the tip-core tree.
----------------------------------------------------------------------------

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 133 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 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
CONFLICT (content): Merge conflict in arch/arm/mach-at91/gpio.c
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
CONFLICT (rename/modify): Merge conflict in arch/arm/plat-pxa/dma.c
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/elf.h
Merging xtensa/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c
Merging quilt/usb
Merging tip-core/auto-core-next
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging cpus4096/auto-cpus4096-next
Merging tracing/auto-tracing-next
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (delete/modify): block/blktrace.c deleted in tracing/auto-tracing-next and modified in HEAD. Version HEAD of block/blktrace.c left in tree.
CONFLICT (content): Merge conflict in kernel/irq/handle.c
$ git rm -f block/blktrace.c
Applying: tracing: blktrace merge fix
Merging genirq/auto-genirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
CONFLICT (content): Merge conflict in lib/Makefile
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in drivers/pci/pcie/portdrv_pci.c
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c
Merging quota/for_next
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Applying: acpi: update thermal for bus_id removal
Merging nfsd/nfsd-next
Merging ieee1394/for-next
CONFLICT (add/add): Merge conflict in drivers/media/dvb/firewire/firedtv-avc.c
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl3945-base.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt73usb.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c
Merging cpufreq/next
CONFLICT (content): Merge conflict in arch/x86/include/asm/timer.h
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/blackfin/kernel/ipipe.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/irq.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
CONFLICT (delete/modify): arch/x86/mach-default/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-default/setup.c left in tree.
CONFLICT (delete/modify): arch/x86/mach-voyager/setup.c deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/mach-voyager/setup.c left in tree.
CONFLICT (content): Merge conflict in drivers/firmware/dcdbas.c
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in kernel/module.c
$ git reset --hard
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
CONFLICT (content): Merge conflict in sound/isa/Kconfig
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 include/linux/rcupdate.h
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
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/drm_proc.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/x86/mm/init_32.c
CONFLICT (content): Merge conflict in arch/x86/mm/init_64.c
CONFLICT (content): Merge conflict in kernel/trace/ring_buffer.c
CONFLICT (content): Merge conflict in mm/Makefile
Applying: kmemcheck: arch/x86/mm/init.c merge fix
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 proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
CONFLICT (add/add): Merge conflict in drivers/scsi/osd/osd_initiator.c
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in kernel/module.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
CONFLICT (content): Merge conflict in mm/vmalloc.c
Merging quilt/staging
Merging scsi-post-merge/master

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: Tree for March 6 (ath9k)
  2009-03-06  8:13 linux-next: Tree for March 6 Stephen Rothwell
@ 2009-03-06 19:01 ` Randy Dunlap
  2009-03-06 19:35   ` Gabor Juhos
  2009-03-06 19:24 ` linux-next: Tree for March 6 Andrew Morton
  2009-03-06 21:24 ` [PATCH -next] dvb/frontends: fix duplicate 'debug' symbol Randy Dunlap
  2 siblings, 1 reply; 16+ messages in thread
From: Randy Dunlap @ 2009-03-06 19:01 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML, linux-wireless

Stephen Rothwell wrote:
> Hi all,
> 
> Linus' release of -rc7 seems to have stirred people up a bit ...
> 
> Changes since 20090305:


when CONFIG_RFKILL=n, ath9k/virtual.c causes:

(.text+0x224e83): undefined reference to `ath_radio_disable'
(.text+0x224e8b): undefined reference to `ath_radio_enable'



-- 
~Randy

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: Tree for March 6
  2009-03-06  8:13 linux-next: Tree for March 6 Stephen Rothwell
  2009-03-06 19:01 ` linux-next: Tree for March 6 (ath9k) Randy Dunlap
@ 2009-03-06 19:24 ` Andrew Morton
  2009-03-10  5:47   ` Stephen Rothwell
  2009-03-06 21:24 ` [PATCH -next] dvb/frontends: fix duplicate 'debug' symbol Randy Dunlap
  2 siblings, 1 reply; 16+ messages in thread
From: Andrew Morton @ 2009-03-06 19:24 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Rusty Russell

On Fri, 6 Mar 2009 19:13:11 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Dropped trees (temporary):
> 	rr (build problem)

It's quite irritating and somewhat risky when this happens.  It means
that I have to teporarily drop or rework patches to fix things up. 
Then the patch needs to be undropped or unreworked when the offending
tree gets restored.

Is it possible to just drop back to the previous day's version when
something gets screwed up?


^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: Tree for March 6 (ath9k)
  2009-03-06 19:01 ` linux-next: Tree for March 6 (ath9k) Randy Dunlap
@ 2009-03-06 19:35   ` Gabor Juhos
  2009-03-06 19:41     ` Randy Dunlap
  0 siblings, 1 reply; 16+ messages in thread
From: Gabor Juhos @ 2009-03-06 19:35 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, linux-wireless

Randy Dunlap írta:
> Stephen Rothwell wrote:
>> Hi all,
>>
>> Linus' release of -rc7 seems to have stirred people up a bit ...
>>
>> Changes since 20090305:
> 
> 
> when CONFIG_RFKILL=n, ath9k/virtual.c causes:
> 
> (.text+0x224e83): undefined reference to `ath_radio_disable'
> (.text+0x224e8b): undefined reference to `ath_radio_enable'
> 
> 

Hi,

I have submitted a patch for this already:
http://marc.info/?l=linux-wireless&m=123633468314970&w=2

Should I send it to somewhere else as well?

Gabor



^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: Tree for March 6 (ath9k)
  2009-03-06 19:41     ` Randy Dunlap
@ 2009-03-06 19:40       ` John W. Linville
  2009-03-11 17:19         ` Randy Dunlap
  0 siblings, 1 reply; 16+ messages in thread
From: John W. Linville @ 2009-03-06 19:40 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Gabor Juhos, Stephen Rothwell, linux-next, LKML, linux-wireless

On Fri, Mar 06, 2009 at 11:41:02AM -0800, Randy Dunlap wrote:
> Gabor Juhos wrote:
> > Randy Dunlap írta:
> >> Stephen Rothwell wrote:
> >>> Hi all,
> >>>
> >>> Linus' release of -rc7 seems to have stirred people up a bit ...
> >>>
> >>> Changes since 20090305:
> >>
> >> when CONFIG_RFKILL=n, ath9k/virtual.c causes:
> >>
> >> (.text+0x224e83): undefined reference to `ath_radio_disable'
> >> (.text+0x224e8b): undefined reference to `ath_radio_enable'
> >>
> >>
> > 
> > Hi,
> > 
> > I have submitted a patch for this already:
> > http://marc.info/?l=linux-wireless&m=123633468314970&w=2
> > 
> > Should I send it to somewhere else as well?
> 
> It hasn't propagated into the linux-next merging yet...

He just sent it today (or overnight).  I'll get it into wireless-next.

John

P.S.  I'm starting to think that RFKILL should just be mandatory...
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: Tree for March 6 (ath9k)
  2009-03-06 19:35   ` Gabor Juhos
@ 2009-03-06 19:41     ` Randy Dunlap
  2009-03-06 19:40       ` John W. Linville
  0 siblings, 1 reply; 16+ messages in thread
From: Randy Dunlap @ 2009-03-06 19:41 UTC (permalink / raw)
  To: Gabor Juhos
  Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, linux-wireless,
	linville

Gabor Juhos wrote:
> Randy Dunlap írta:
>> Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Linus' release of -rc7 seems to have stirred people up a bit ...
>>>
>>> Changes since 20090305:
>>
>> when CONFIG_RFKILL=n, ath9k/virtual.c causes:
>>
>> (.text+0x224e83): undefined reference to `ath_radio_disable'
>> (.text+0x224e8b): undefined reference to `ath_radio_enable'
>>
>>
> 
> Hi,
> 
> I have submitted a patch for this already:
> http://marc.info/?l=linux-wireless&m=123633468314970&w=2
> 
> Should I send it to somewhere else as well?

It hasn't propagated into the linux-next merging yet...


-- 
~Randy

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [PATCH -next] dvb/frontends: fix duplicate 'debug' symbol
  2009-03-06  8:13 linux-next: Tree for March 6 Stephen Rothwell
  2009-03-06 19:01 ` linux-next: Tree for March 6 (ath9k) Randy Dunlap
  2009-03-06 19:24 ` linux-next: Tree for March 6 Andrew Morton
@ 2009-03-06 21:24 ` Randy Dunlap
  2009-03-06 23:59   ` Andrew Morton
  2 siblings, 1 reply; 16+ messages in thread
From: Randy Dunlap @ 2009-03-06 21:24 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, LKML, linux-media, Mauro Carvalho Chehab, Andrew Morton

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

Fix dvb frontend debug variable to be static, to avoid linker
errors:

drivers/built-in.o:(.data+0xf4b0): multiple definition of `debug'
arch/x86/kernel/built-in.o:(.kprobes.text+0x90): first defined here
ld: Warning: size of symbol `debug' changed from 85 in arch/x86/kernel/built-in.o to 4 in drivers/built-in.o

It would also be Good if arch/x86/kernel/entry_32.S didn't have a
non-static 'debug' symbol.  OTOH, it helps catch things like this one.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 drivers/media/dvb/frontends/stv0900_core.c |    4 ++--
 drivers/media/dvb/frontends/stv0900_priv.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- linux-next-20090306.orig/drivers/media/dvb/frontends/stv0900_core.c
+++ linux-next-20090306/drivers/media/dvb/frontends/stv0900_core.c
@@ -34,8 +34,8 @@
 #include "stv0900_priv.h"
 #include "stv0900_init.h"
 
-int debug = 1;
-module_param(debug, int, 0644);
+static int stvdebug = 1;
+module_param_named(debug, stvdebug, int, 0644);
 
 /* internal params node */
 struct stv0900_inode {
--- linux-next-20090306.orig/drivers/media/dvb/frontends/stv0900_priv.h
+++ linux-next-20090306/drivers/media/dvb/frontends/stv0900_priv.h
@@ -62,11 +62,11 @@
 
 #define dmd_choose(a, b)	(demod = STV0900_DEMOD_2 ? b : a))
 
-extern int debug;
+static int stvdebug;
 
 #define dprintk(args...) \
 	do { \
-		if (debug) \
+		if (stvdebug) \
 			printk(KERN_DEBUG args); \
 	} while (0)
 

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH -next] dvb/frontends: fix duplicate 'debug' symbol
  2009-03-06 21:24 ` [PATCH -next] dvb/frontends: fix duplicate 'debug' symbol Randy Dunlap
@ 2009-03-06 23:59   ` Andrew Morton
  2009-03-07  0:05     ` Randy Dunlap
  0 siblings, 1 reply; 16+ messages in thread
From: Andrew Morton @ 2009-03-06 23:59 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: sfr, linux-next, linux-kernel, linux-media, mchehab, Ingo Molnar

On Fri, 06 Mar 2009 13:24:46 -0800
Randy Dunlap <randy.dunlap@oracle.com> wrote:

> It would also be Good if arch/x86/kernel/entry_32.S didn't have a
> non-static 'debug' symbol.  OTOH, it helps catch things like this one.

heh, yes, it's a feature.  We should put it in init/main.c, along with
100-odd other dont-do-that-dopey symbols.




^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PATCH -next] dvb/frontends: fix duplicate 'debug' symbol
  2009-03-06 23:59   ` Andrew Morton
@ 2009-03-07  0:05     ` Randy Dunlap
  0 siblings, 0 replies; 16+ messages in thread
From: Randy Dunlap @ 2009-03-07  0:05 UTC (permalink / raw)
  To: Andrew Morton
  Cc: sfr, linux-next, linux-kernel, linux-media, mchehab, Ingo Molnar

Andrew Morton wrote:
> On Fri, 06 Mar 2009 13:24:46 -0800
> Randy Dunlap <randy.dunlap@oracle.com> wrote:
> 
>> It would also be Good if arch/x86/kernel/entry_32.S didn't have a
>> non-static 'debug' symbol.  OTOH, it helps catch things like this one.
> 
> heh, yes, it's a feature.  We should put it in init/main.c, along with
> 100-odd other dont-do-that-dopey symbols.

hm, I think I'll leave that patch for you or Ingo. ;)

-- 
~Randy

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: Tree for March 6
  2009-03-06 19:24 ` linux-next: Tree for March 6 Andrew Morton
@ 2009-03-10  5:47   ` Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2009-03-10  5:47 UTC (permalink / raw)
  To: Andrew Morton; +Cc: linux-next, linux-kernel, Rusty Russell

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

Hi Andrew,

On Fri, 6 Mar 2009 11:24:50 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Fri, 6 Mar 2009 19:13:11 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Dropped trees (temporary):
> > 	rr (build problem)
> 
> It's quite irritating and somewhat risky when this happens.  It means
> that I have to teporarily drop or rework patches to fix things up. 
> Then the patch needs to be undropped or unreworked when the offending
> tree gets restored.
> 
> Is it possible to just drop back to the previous day's version when
> something gets screwed up?

I will try this and see how hard it is.  I have done a few today with no
ill effects (that I have seen yet).

The other side of the coin is that there are some dependencies between
some of the trees that are included in linux-next.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: Tree for March 6 (ath9k)
  2009-03-06 19:40       ` John W. Linville
@ 2009-03-11 17:19         ` Randy Dunlap
  2009-03-11 18:19           ` John W. Linville
  0 siblings, 1 reply; 16+ messages in thread
From: Randy Dunlap @ 2009-03-11 17:19 UTC (permalink / raw)
  To: John W. Linville
  Cc: Gabor Juhos, Stephen Rothwell, linux-next, LKML, linux-wireless

John W. Linville wrote:
> On Fri, Mar 06, 2009 at 11:41:02AM -0800, Randy Dunlap wrote:
>> Gabor Juhos wrote:
>>> Randy Dunlap írta:
>>>> Stephen Rothwell wrote:
>>>>> Hi all,
>>>>>
>>>>> Linus' release of -rc7 seems to have stirred people up a bit ...
>>>>>
>>>>> Changes since 20090305:
>>>> when CONFIG_RFKILL=n, ath9k/virtual.c causes:
>>>>
>>>> (.text+0x224e83): undefined reference to `ath_radio_disable'
>>>> (.text+0x224e8b): undefined reference to `ath_radio_enable'
>>>>
>>>>
>>> Hi,
>>>
>>> I have submitted a patch for this already:
>>> http://marc.info/?l=linux-wireless&m=123633468314970&w=2
>>>
>>> Should I send it to somewhere else as well?
>> It hasn't propagated into the linux-next merging yet...
> 
> He just sent it today (or overnight).  I'll get it into wireless-next.
> 
> John
> 
> P.S.  I'm starting to think that RFKILL should just be mandatory...


This build error still happens in linux-next-20090311.

-- 
~Randy

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: Tree for March 6 (ath9k)
  2009-03-11 17:19         ` Randy Dunlap
@ 2009-03-11 18:19           ` John W. Linville
  0 siblings, 0 replies; 16+ messages in thread
From: John W. Linville @ 2009-03-11 18:19 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Gabor Juhos, Stephen Rothwell, linux-next, LKML, linux-wireless

On Wed, Mar 11, 2009 at 10:19:44AM -0700, Randy Dunlap wrote:
> John W. Linville wrote:
> > On Fri, Mar 06, 2009 at 11:41:02AM -0800, Randy Dunlap wrote:
> >> Gabor Juhos wrote:
> >>> Randy Dunlap írta:
> >>>> Stephen Rothwell wrote:
> >>>>> Hi all,
> >>>>>
> >>>>> Linus' release of -rc7 seems to have stirred people up a bit ...
> >>>>>
> >>>>> Changes since 20090305:
> >>>> when CONFIG_RFKILL=n, ath9k/virtual.c causes:
> >>>>
> >>>> (.text+0x224e83): undefined reference to `ath_radio_disable'
> >>>> (.text+0x224e8b): undefined reference to `ath_radio_enable'
> >>>>
> >>>>
> >>> Hi,
> >>>
> >>> I have submitted a patch for this already:
> >>> http://marc.info/?l=linux-wireless&m=123633468314970&w=2
> >>>
> >>> Should I send it to somewhere else as well?
> >> It hasn't propagated into the linux-next merging yet...
> > 
> > He just sent it today (or overnight).  I'll get it into wireless-next.
> > 
> > John
> > 
> > P.S.  I'm starting to think that RFKILL should just be mandatory...
> 
> 
> This build error still happens in linux-next-20090311.

That fix is in wireless-next-2.6 as of yesterday.  I guess it was a
little too late for yesterday's linux-next build -- sorry!

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: Tree for March 6
  2008-03-06 11:50   ` Stephen Rothwell
@ 2008-03-07  2:10     ` Stephen Rothwell
  0 siblings, 0 replies; 16+ messages in thread
From: Stephen Rothwell @ 2008-03-07  2:10 UTC (permalink / raw)
  To: Andy Whitcroft; +Cc: linux-next, LKML

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

Hi all,

On Thu, 6 Mar 2008 22:50:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 6 Mar 2008 09:07:43 +0000 Andy Whitcroft <apw@shadowen.org> wrote:
> >
> > I presume that when you report a build break here that this was something
> > you fixed and we should not see in the tree you released.  By which I mean,
> > if any of our builds fail that is not expected and worth reporting.
> 
> Correct.  All reports very welcome, thanks.

As a clarification.  The above applies when I report a build break while
I am creating the tree.  I will also report some breakage in post
creation testing.  These latter reports will be left to the responsible
person to fix up (hopefully in a timely manner).

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

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: Tree for March 6
  2008-03-06  9:07 ` Andy Whitcroft
@ 2008-03-06 11:50   ` Stephen Rothwell
  2008-03-07  2:10     ` Stephen Rothwell
  0 siblings, 1 reply; 16+ messages in thread
From: Stephen Rothwell @ 2008-03-06 11:50 UTC (permalink / raw)
  To: Andy Whitcroft; +Cc: linux-next, LKML

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

Hi Andy,

On Thu, 6 Mar 2008 09:07:43 +0000 Andy Whitcroft <apw@shadowen.org> wrote:
>
> I presume that when you report a build break here that this was something
> you fixed and we should not see in the tree you released.  By which I mean,
> if any of our builds fail that is not expected and worth reporting.

Correct.  All reports very welcome, thanks.

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

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: linux-next: Tree for March 6
  2008-03-06  5:26 linux-next: Tree for March 6 Stephen Rothwell
@ 2008-03-06  9:07 ` Andy Whitcroft
  2008-03-06 11:50   ` Stephen Rothwell
  0 siblings, 1 reply; 16+ messages in thread
From: Andy Whitcroft @ 2008-03-06  9:07 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML

On Thu, Mar 06, 2008 at 04:26:06PM +1100, Stephen Rothwell wrote:

> There were a few merge conflicts (trivial) and one build break.  I have
> notified the appropriate people.

I presume that when you report a build break here that this was something
you fixed and we should not see in the tree you released.  By which I mean,
if any of our builds fail that is not expected and worth reporting.

-apw

^ permalink raw reply	[flat|nested] 16+ messages in thread

* linux-next: Tree for March 6
@ 2008-03-06  5:26 Stephen Rothwell
  2008-03-06  9:07 ` Andy Whitcroft
  0 siblings, 1 reply; 16+ messages in thread
From: Stephen Rothwell @ 2008-03-06  5:26 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

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
allmodconfig for both powerpc and x86_64.

There were a few merge conflicts (trivial) and one build break.  I have
notified the appropriate people.

We are up to 44 trees, more are welcome (even if they are currently
empty).  The influx of new trees has been underwhelming.  Thanks to those
who have contributed, and to those who haven't, please do.

Status of my local build tests is at
http://kisskb.ellerman.id.au/kisskb/branch/9/.  If maintainers want to
give advice about cross compilers/configs that work, we are always open
to add more builds.

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

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

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2009-03-11 18:30 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-06  8:13 linux-next: Tree for March 6 Stephen Rothwell
2009-03-06 19:01 ` linux-next: Tree for March 6 (ath9k) Randy Dunlap
2009-03-06 19:35   ` Gabor Juhos
2009-03-06 19:41     ` Randy Dunlap
2009-03-06 19:40       ` John W. Linville
2009-03-11 17:19         ` Randy Dunlap
2009-03-11 18:19           ` John W. Linville
2009-03-06 19:24 ` linux-next: Tree for March 6 Andrew Morton
2009-03-10  5:47   ` Stephen Rothwell
2009-03-06 21:24 ` [PATCH -next] dvb/frontends: fix duplicate 'debug' symbol Randy Dunlap
2009-03-06 23:59   ` Andrew Morton
2009-03-07  0:05     ` Randy Dunlap
  -- strict thread matches above, loose matches on Subject: below --
2008-03-06  5:26 linux-next: Tree for March 6 Stephen Rothwell
2008-03-06  9:07 ` Andy Whitcroft
2008-03-06 11:50   ` Stephen Rothwell
2008-03-07  2:10     ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).