linux-next: Tree for January 21

linux-next: Tree for January 21

[Stephen Rothwell]

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

Hi all,

Changes since 20090120:

Undropped trees:
	crypto
	cpufreq

Dropped trees (temporarily):
	quota (build problem)
	voltage (build problem)
	cpu_alloc (build problem)
	audit (difficult conflicts)

I merged the mfd tree immediately after Linus' tree instead of applying
the build fix patch it has.

The voltage tree gained a build failure and was dropped.

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

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,
ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES) and
i386, sparc and sparc64 defconfig.

Below is a summary of the state of the merge.

We are up to 132 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 mfd/for-next
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 dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
CONFLICT (delete/modify): arch/m68knommu/include/asm/Kbuild deleted in m68knommu/for-next and modified in HEAD. Version HEAD of arch/m68knommu/include/asm/Kbuild left in tree.
$ git rm -f arch/m68knommu/include/asm/Kbuild
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
$ git reset --hard HEAD^
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
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
Merging v9fs/for-next
Merging quilt/rr
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
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/slob.c
Merging uclinux/for-next
Merging md/for-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in kernel/fork.c
Merging generic-ipi/auto-generic-ipi-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
$ git reset --hard HEAD^
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-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
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in include/linux/dma_remapping.h
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging squashfs/master
Merging omap/for-next
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
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 --]

[PATCH] sysrq: include interrupt.h instead of irq.h

[Heiko Carstens]

From: Heiko Carstens <heiko.carstens@de.ibm.com>

With "cpumask: update irq_desc to use cpumask_var_t" in linux-next
we get this compile bug on s390:

  CC      drivers/char/sysrq.o
In file included from drivers/char/sysrq.c:38:
include/linux/irq.h: In function 'init_alloc_desc_masks':
include/linux/irq.h:442: error: dereferencing pointer to incomplete type

drivers/char/sysrq.c should include interrupt.h instead of irq.h.

Cc: Mike Travis <travis@sgi.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
 drivers/char/sysrq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-next/drivers/char/sysrq.c
===================================================================
--- linux-next.orig/drivers/char/sysrq.c
+++ linux-next/drivers/char/sysrq.c
@@ -35,7 +35,7 @@
 #include <linux/vt_kern.h>
 #include <linux/workqueue.h>
 #include <linux/kexec.h>
-#include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/hrtimer.h>
 #include <linux/oom.h>
 

Re: X200 suspend issue / linux-next: Tree for January 21

[Nico -telmich- Schottelius]

[-- Attachment #1.1: Type: text/plain, Size: 342 bytes --]

Hello!

News: The system freezes for almost a second and wakes up again!

At least no crash this time!

dmesg attached after one suspend failure.

Nico

-- 
Think about Free and Open Source Software (FOSS).
http://nico.schottelius.org/documentations/foss/the-term-foss/

PGP: BFE4 C736 ABE5 406F 8F42  F7CF B8BE F92A 9885 188C

[-- Attachment #1.2: suspend-2.6.29-rc2-next-20090121-ikn --]
[-- Type: text/plain, Size: 12122 bytes --]

Autowakeup!


[15:38] ikn:~# dmesg -c
[ 7411.999645] PM: Syncing filesystems ... done.
[ 7412.658583] Freezing user space processes ... (elapsed 0.01 seconds) done.
[ 7412.677241] Freezing remaining freezable tasks ... (elapsed 0.00 seconds) done.
[ 7412.677666] Suspending console(s) (use no_console_suspend to debug)
[ 7412.692209] pci 0000:00:02.0: power state changed by ACPI to D3
[ 7413.368500] sd 0:0:0:0: [sda] Synchronizing SCSI cache
[ 7413.368738] sd 0:0:0:0: [sda] Stopping disk
[ 7413.739464] iwlagn 0000:03:00.0: PCI INT A disabled
[ 7413.800393] ehci_hcd 0000:00:1d.7: PME# enabled
[ 7413.802570] ehci_hcd 0000:00:1d.7: wake-up capability enabled by ACPI
[ 7413.802586] ehci_hcd 0000:00:1d.7: PCI INT D disabled
[ 7413.802828] uhci_hcd 0000:00:1d.2: wake-up capability enabled by ACPI
[ 7413.802838] uhci_hcd 0000:00:1d.2: PCI INT C disabled
[ 7413.803050] uhci_hcd 0000:00:1d.1: wake-up capability enabled by ACPI
[ 7413.803059] uhci_hcd 0000:00:1d.1: PCI INT B disabled
[ 7413.805476] uhci_hcd 0000:00:1d.0: wake-up capability enabled by ACPI
[ 7413.805489] uhci_hcd 0000:00:1d.0: PCI INT A disabled
[ 7413.805751] HDA Intel 0000:00:1b.0: PCI INT B disabled
[ 7413.820125] ehci_hcd 0000:00:1a.7: PME# enabled
[ 7413.823016] ehci_hcd 0000:00:1a.7: wake-up capability enabled by ACPI
[ 7413.823034] ehci_hcd 0000:00:1a.7: PCI INT D disabled
[ 7413.825414] uhci_hcd 0000:00:1a.2: wake-up capability enabled by ACPI
[ 7413.825424] uhci_hcd 0000:00:1a.2: PCI INT C disabled
[ 7413.825638] uhci_hcd 0000:00:1a.1: wake-up capability enabled by ACPI
[ 7413.825646] uhci_hcd 0000:00:1a.1: PCI INT B disabled
[ 7413.828564] uhci_hcd 0000:00:1a.0: wake-up capability enabled by ACPI
[ 7413.828575] uhci_hcd 0000:00:1a.0: PCI INT A disabled
[ 7413.887091] e1000e 0000:00:19.0: PME# enabled
[ 7413.887124] e1000e 0000:00:19.0: wake-up capability enabled by ACPI
[ 7413.887131] e1000e 0000:00:19.0: PME# enabled
[ 7413.887136] e1000e 0000:00:19.0: wake-up capability enabled by ACPI
[ 7413.887147] e1000e 0000:00:19.0: PCI INT A disabled
[ 7413.900175] ACPI handle has no context!
[ 7413.964505] pci 0000:00:02.0: power state changed by ACPI to D3
[ 7413.969943] ACPI: Preparing to enter system sleep state S3
[ 7413.988894] Disabling non-boot CPUs ...
[ 7414.092021] CPU 1 is now offline
[ 7414.092025] SMP alternatives: switching to UP code
[ 7414.260316] CPU1 is down
[ 7414.260420] Extended CMOS year: 2000
[ 7414.260420] Back to C!
[ 7414.260420] Extended CMOS year: 2000
[ 7414.260420] pci 0000:00:02.0: restoring config space at offset 0x1 (was 0x900007, writing 0x900403)
[ 7414.260420] pci 0000:00:02.1: restoring config space at offset 0x1 (was 0x900000, writing 0x900007)
[ 7414.260420] pci 0000:00:03.0: restoring config space at offset 0xf (was 0x100, writing 0x10b)
[ 7414.260420] pci 0000:00:03.0: restoring config space at offset 0x1 (was 0x100006, writing 0x180006)
[ 7414.260420] pci 0000:00:03.2: restoring config space at offset 0xf (was 0x300, writing 0x30b)
[ 7414.260420] pci 0000:00:03.2: restoring config space at offset 0x1 (was 0xb00005, writing 0xb00001)
[ 7414.260420] serial 0000:00:03.3: restoring config space at offset 0xf (was 0x200, writing 0x20b)
[ 7414.260420] uhci_hcd 0000:00:1a.0: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] uhci_hcd 0000:00:1a.1: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] uhci_hcd 0000:00:1a.2: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] ehci_hcd 0000:00:1a.7: restoring config space at offset 0x1 (was 0x2900106, writing 0x2900102)
[ 7414.260420] HDA Intel 0000:00:1b.0: restoring config space at offset 0x1 (was 0x100106, writing 0x100102)
[ 7414.260420] pcieport-driver 0000:00:1c.0: restoring config space at offset 0x1 (was 0x100107, writing 0x100503)
[ 7414.260420] pcieport-driver 0000:00:1c.1: restoring config space at offset 0x1 (was 0x100107, writing 0x100503)
[ 7414.260420] pcieport-driver 0000:00:1c.3: restoring config space at offset 0x1 (was 0x100107, writing 0x100503)
[ 7414.260420] uhci_hcd 0000:00:1d.0: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] uhci_hcd 0000:00:1d.1: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] uhci_hcd 0000:00:1d.2: restoring config space at offset 0x1 (was 0x2900005, writing 0x2900001)
[ 7414.260420] ehci_hcd 0000:00:1d.7: restoring config space at offset 0x1 (was 0x2900106, writing 0x2900102)
[ 7414.260420] pci 0000:00:1e.0: restoring config space at offset 0xf (was 0x40000, writing 0x400ff)
[ 7414.260420] pci 0000:00:1e.0: restoring config space at offset 0x9 (was 0x10001, writing 0x1fff1)
[ 7414.260420] pci 0000:00:1e.0: restoring config space at offset 0x8 (was 0x0, writing 0xfff0)
[ 7414.260420] pci 0000:00:1e.0: restoring config space at offset 0x7 (was 0x22800000, writing 0x228000f0)
[ 7414.260420] pci 0000:00:1e.0: restoring config space at offset 0x1 (was 0x100000, writing 0x100103)
[ 7414.260420] ahci 0000:00:1f.2: restoring config space at offset 0x1 (was 0x2b00007, writing 0x2b00407)
[ 7414.260420] Enabling non-boot CPUs ...
[ 7414.260420] SMP alternatives: switching to SMP code
[ 7414.383355] Booting processor 1 APIC 0x1 ip 0x6000
[ 7414.253790] Initializing CPU#1
[ 7414.253790] Calibrating delay using timer specific routine.. 4522.02 BogoMIPS (lpj=9044057)
[ 7414.253790] CPU: L1 I cache: 32K, L1 D cache: 32K
[ 7414.253790] CPU: L2 cache: 3072K
[ 7414.253790] [ds] using core 2 configuration
[ 7414.253790] CPU: Physical Processor ID: 0
[ 7414.253790] CPU: Processor Core ID: 1
[ 7414.253790] CPU1: Thermal monitoring enabled (TM2)
[ 7414.472519] CPU1: Intel(R) Core(TM)2 Duo CPU     P8400  @ 2.26GHz stepping 06
[ 7414.473010] Switched to high resolution mode on CPU 1
[ 7414.484309] CPU1 is up
[ 7414.484311] ACPI: Waking up from system sleep state S3
[ 7414.524853] ACPI: EC: non-query interrupt received, switching to interrupt mode
[ 7414.616959] pci 0000:00:02.0: PME# disabled
[ 7414.616969] pci 0000:00:02.1: PME# disabled
[ 7414.616976] pci 0000:00:03.0: PME# disabled
[ 7414.616983] pci 0000:00:03.2: PME# disabled
[ 7414.617134] e1000e 0000:00:19.0: PCI INT A -> GSI 20 (level, low) -> IRQ 20
[ 7414.617142] e1000e 0000:00:19.0: setting latency timer to 64
[ 7414.617150] e1000e 0000:00:19.0: wake-up capability disabled by ACPI
[ 7414.617157] e1000e 0000:00:19.0: PME# disabled
[ 7414.617161] e1000e 0000:00:19.0: wake-up capability disabled by ACPI
[ 7414.617169] e1000e 0000:00:19.0: PME# disabled
[ 7414.617220] e1000e 0000:00:19.0: irq 28 for MSI/MSI-X
[ 7414.676721] uhci_hcd 0000:00:1a.0: power state changed by ACPI to D0
[ 7414.676738] uhci_hcd 0000:00:1a.0: PCI INT A -> GSI 20 (level, low) -> IRQ 20
[ 7414.676749] uhci_hcd 0000:00:1a.0: setting latency timer to 64
[ 7414.676758] uhci_hcd 0000:00:1a.0: wake-up capability disabled by ACPI
[ 7414.676787] usb usb2: root hub lost power or was reset
[ 7414.676815] uhci_hcd 0000:00:1a.1: PCI INT B -> GSI 21 (level, low) -> IRQ 21
[ 7414.676825] uhci_hcd 0000:00:1a.1: setting latency timer to 64
[ 7414.676831] uhci_hcd 0000:00:1a.1: wake-up capability disabled by ACPI
[ 7414.676858] usb usb4: root hub lost power or was reset
[ 7414.677781] uhci_hcd 0000:00:1a.2: power state changed by ACPI to D0
[ 7414.677790] uhci_hcd 0000:00:1a.2: PCI INT C -> GSI 22 (level, low) -> IRQ 22
[ 7414.677800] uhci_hcd 0000:00:1a.2: setting latency timer to 64
[ 7414.677807] uhci_hcd 0000:00:1a.2: wake-up capability disabled by ACPI
[ 7414.677835] usb usb5: root hub lost power or was reset
[ 7414.678888] ehci_hcd 0000:00:1a.7: power state changed by ACPI to D0
[ 7414.678900] ehci_hcd 0000:00:1a.7: PCI INT D -> GSI 23 (level, low) -> IRQ 23
[ 7414.678910] ehci_hcd 0000:00:1a.7: setting latency timer to 64
[ 7414.678917] ehci_hcd 0000:00:1a.7: wake-up capability disabled by ACPI
[ 7414.678926] ehci_hcd 0000:00:1a.7: PME# disabled
[ 7414.678956] HDA Intel 0000:00:1b.0: PCI INT B -> GSI 17 (level, low) -> IRQ 17
[ 7414.678965] HDA Intel 0000:00:1b.0: setting latency timer to 64
[ 7414.679002] pcieport-driver 0000:00:1c.0: setting latency timer to 64
[ 7414.679020] pcieport-driver 0000:00:1c.1: setting latency timer to 64
[ 7414.679038] pcieport-driver 0000:00:1c.3: setting latency timer to 64
[ 7414.679939] uhci_hcd 0000:00:1d.0: power state changed by ACPI to D0
[ 7414.679948] uhci_hcd 0000:00:1d.0: PCI INT A -> GSI 16 (level, low) -> IRQ 16
[ 7414.679958] uhci_hcd 0000:00:1d.0: setting latency timer to 64
[ 7414.679965] uhci_hcd 0000:00:1d.0: wake-up capability disabled by ACPI
[ 7414.679992] usb usb6: root hub lost power or was reset
[ 7414.680038] uhci_hcd 0000:00:1d.1: PCI INT B -> GSI 17 (level, low) -> IRQ 17
[ 7414.680049] uhci_hcd 0000:00:1d.1: setting latency timer to 64
[ 7414.680056] uhci_hcd 0000:00:1d.1: wake-up capability disabled by ACPI
[ 7414.680084] usb usb7: root hub lost power or was reset
[ 7414.680108] uhci_hcd 0000:00:1d.2: PCI INT C -> GSI 18 (level, low) -> IRQ 18
[ 7414.680118] uhci_hcd 0000:00:1d.2: setting latency timer to 64
[ 7414.680124] uhci_hcd 0000:00:1d.2: wake-up capability disabled by ACPI
[ 7414.680151] usb usb8: root hub lost power or was reset
[ 7414.681049] ehci_hcd 0000:00:1d.7: power state changed by ACPI to D0
[ 7414.681060] ehci_hcd 0000:00:1d.7: PCI INT D -> GSI 19 (level, low) -> IRQ 19
[ 7414.681071] ehci_hcd 0000:00:1d.7: setting latency timer to 64
[ 7414.681078] ehci_hcd 0000:00:1d.7: wake-up capability disabled by ACPI
[ 7414.681086] ehci_hcd 0000:00:1d.7: PME# disabled
[ 7414.681103] pci 0000:00:1e.0: setting latency timer to 64
[ 7414.681204] ahci 0000:00:1f.2: setting latency timer to 64
[ 7414.681384] iwlagn 0000:03:00.0: PCI INT A -> GSI 17 (level, low) -> IRQ 17
[ 7414.681569] iwlagn 0000:03:00.0: irq 29 for MSI/MSI-X
[ 7414.681637] iwlagn: Radio disabled by HW RF Kill switch
[ 7414.682199] sd 0:0:0:0: [sda] Starting disk
[ 7415.000286] ata2: SATA link down (SStatus 0 SControl 300)
[ 7415.616270] ata1: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
[ 7415.709877] ata1.00: ACPI cmd ef/02:00:00:00:00:a0 succeeded
[ 7415.709885] ata1.00: ACPI cmd f5/00:00:00:00:00:a0 filtered out
[ 7415.710003] ata1.00: ACPI cmd ef/5f:00:00:00:00:a0 succeeded
[ 7415.710009] ata1.00: ACPI cmd ef/10:03:00:00:00:a0 filtered out
[ 7415.720963] ata1.00: ACPI cmd ef/02:00:00:00:00:a0 succeeded
[ 7415.720970] ata1.00: ACPI cmd f5/00:00:00:00:00:a0 filtered out
[ 7415.721085] ata1.00: ACPI cmd ef/5f:00:00:00:00:a0 succeeded
[ 7415.721091] ata1.00: ACPI cmd ef/10:03:00:00:00:a0 filtered out
[ 7415.722194] ata1.00: configured for UDMA/100
[ 7415.724815] ata1.00: configured for UDMA/100
[ 7415.740266] ata1: EH complete
[ 7415.740365] sd 0:0:0:0: [sda] 488397168 512-byte hardware sectors: (250 GB/232 GiB)
[ 7415.740398] sd 0:0:0:0: [sda] Write Protect is off
[ 7415.740402] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
[ 7415.740449] sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
[ 7415.740503] sd 0:0:0:0: [sda] 488397168 512-byte hardware sectors: (250 GB/232 GiB)
[ 7415.740532] sd 0:0:0:0: [sda] Write Protect is off
[ 7415.740536] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
[ 7415.740581] sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
[ 7417.020319] usb 1-6: reset high speed USB device using ehci_hcd and address 4
[ 7417.268284] usb 4-1: reset full speed USB device using uhci_hcd and address 2
[ 7417.419773] pci 0000:00:02.0: power state changed by ACPI to D0
[ 7417.419967] pci 0000:00:02.0: power state changed by ACPI to D0
[ 7417.419979] pci 0000:00:02.0: setting latency timer to 64
[ 7417.438607] Restarting tasks ... done.
[ 7418.529332] elantech.c: unexpected magic knock result 0x00, 0x02, 0x64.
[ 7418.845911] IBM TrackPoint firmware: 0x0e, buttons: 3/3
[ 7418.865749] input: TPPS/2 IBM TrackPoint as /class/input/input12
[15:38] ikn:~# 


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

Re: [PATCH] sysrq: include interrupt.h instead of irq.h

[Mike Travis]

Thanks for catching this Heiko!
Mike

Heiko Carstens wrote:
> From: Heiko Carstens <heiko.carstens@de.ibm.com>
> 
> With "cpumask: update irq_desc to use cpumask_var_t" in linux-next
> we get this compile bug on s390:
> 
>   CC      drivers/char/sysrq.o
> In file included from drivers/char/sysrq.c:38:
> include/linux/irq.h: In function 'init_alloc_desc_masks':
> include/linux/irq.h:442: error: dereferencing pointer to incomplete type
> 
> drivers/char/sysrq.c should include interrupt.h instead of irq.h.
> 
> Cc: Mike Travis <travis@sgi.com>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> ---
>  drivers/char/sysrq.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-next/drivers/char/sysrq.c
> ===================================================================
> --- linux-next.orig/drivers/char/sysrq.c
> +++ linux-next/drivers/char/sysrq.c
> @@ -35,7 +35,7 @@
>  #include <linux/vt_kern.h>
>  #include <linux/workqueue.h>
>  #include <linux/kexec.h>
> -#include <linux/irq.h>
> +#include <linux/interrupt.h>
>  #include <linux/hrtimer.h>
>  #include <linux/oom.h>
>  
> 

Re: [PATCH] sysrq: include interrupt.h instead of irq.h

[Heiko Carstens]

On Wed, 21 Jan 2009 08:50:03 -0800
Mike Travis <travis@sgi.com> wrote:

> Thanks for catching this Heiko!
> Mike

Erm... it still breaks. Are you going to add the patch to your tree?

> Heiko Carstens wrote:
> > From: Heiko Carstens <heiko.carstens@de.ibm.com>
> > 
> > With "cpumask: update irq_desc to use cpumask_var_t" in linux-next
> > we get this compile bug on s390:
> > 
> >   CC      drivers/char/sysrq.o
> > In file included from drivers/char/sysrq.c:38:
> > include/linux/irq.h: In function 'init_alloc_desc_masks':
> > include/linux/irq.h:442: error: dereferencing pointer to incomplete type
> > 
> > drivers/char/sysrq.c should include interrupt.h instead of irq.h.
> > 
> > Cc: Mike Travis <travis@sgi.com>
> > Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> > Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> > ---
> >  drivers/char/sysrq.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > Index: linux-next/drivers/char/sysrq.c
> > ===================================================================
> > --- linux-next.orig/drivers/char/sysrq.c
> > +++ linux-next/drivers/char/sysrq.c
> > @@ -35,7 +35,7 @@
> >  #include <linux/vt_kern.h>
> >  #include <linux/workqueue.h>
> >  #include <linux/kexec.h>
> > -#include <linux/irq.h>
> > +#include <linux/interrupt.h>
> >  #include <linux/hrtimer.h>
> >  #include <linux/oom.h>

Re: [PATCH] sysrq: include interrupt.h instead of irq.h

[Mike Travis]

Hi Ingo,

Here's Heiko's patch in my 'urgent-for-ingo' branch. 

Thanks,
Mike

The following changes since commit c3c467d0aabdbb53863e8722be898770d438c140:
  Ingo Molnar (1):
        fix: crash: IP: __bitmap_intersects+0x48/0x73

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo.git urgent-for-ingo

Heiko Carstens (1):
      sysrq: include interrupt.h instead of irq.h

 drivers/char/sysrq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Heiko Carstens wrote:
> On Wed, 21 Jan 2009 08:50:03 -0800
> Mike Travis <travis@sgi.com> wrote:
> 
>> Thanks for catching this Heiko!
>> Mike
> 
> Erm... it still breaks. Are you going to add the patch to your tree?
> 
>> Heiko Carstens wrote:
>>> From: Heiko Carstens <heiko.carstens@de.ibm.com>
>>>
>>> With "cpumask: update irq_desc to use cpumask_var_t" in linux-next
>>> we get this compile bug on s390:
>>>
>>>   CC      drivers/char/sysrq.o
>>> In file included from drivers/char/sysrq.c:38:
>>> include/linux/irq.h: In function 'init_alloc_desc_masks':
>>> include/linux/irq.h:442: error: dereferencing pointer to incomplete type
>>>
>>> drivers/char/sysrq.c should include interrupt.h instead of irq.h.
>>>
>>> Cc: Mike Travis <travis@sgi.com>
>>> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
>>> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
>>> ---
>>>  drivers/char/sysrq.c |    2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> Index: linux-next/drivers/char/sysrq.c
>>> ===================================================================
>>> --- linux-next.orig/drivers/char/sysrq.c
>>> +++ linux-next/drivers/char/sysrq.c
>>> @@ -35,7 +35,7 @@
>>>  #include <linux/vt_kern.h>
>>>  #include <linux/workqueue.h>
>>>  #include <linux/kexec.h>
>>> -#include <linux/irq.h>
>>> +#include <linux/interrupt.h>
>>>  #include <linux/hrtimer.h>
>>>  #include <linux/oom.h>

Re: [PATCH] sysrq: include interrupt.h instead of irq.h

[Ingo Molnar]

* Mike Travis <travis@sgi.com> wrote:

> Hi Ingo,
> 
> Here's Heiko's patch in my 'urgent-for-ingo' branch. 
> 
> Thanks,
> Mike
> 
> The following changes since commit c3c467d0aabdbb53863e8722be898770d438c140:
>   Ingo Molnar (1):
>         fix: crash: IP: __bitmap_intersects+0x48/0x73
> 
> are available in the git repository at:
> 
>   ssh://master.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo.git urgent-for-ingo
> 
> Heiko Carstens (1):
>       sysrq: include interrupt.h instead of irq.h
> 
>  drivers/char/sysrq.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Pulled into tip/cpus4096, thanks guys!

	Ingo

Re: X200 suspend issue / linux-next: Tree for January 21

[Pavel Machek]

On Wed 2009-01-21 15:44:20, Nico -telmich- Schottelius wrote:
> Hello!
> 
> News: The system freezes for almost a second and wakes up again!
> 
> At least no crash this time!

Good.

Maybe the suspends-then-autoresumes exists in 2.6.29-rc2, too...? Can
you try disabling CONFIG_USB?
								Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: X200 suspend issue / linux-next: Tree for January 21

[Rafael J. Wysocki]

On Tuesday 27 January 2009, Pavel Machek wrote:
> On Wed 2009-01-21 15:44:20, Nico -telmich- Schottelius wrote:
> > Hello!
> > 
> > News: The system freezes for almost a second and wakes up again!
> > 
> > At least no crash this time!
> 
> Good.
> 
> Maybe the suspends-then-autoresumes exists in 2.6.29-rc2, too...? Can
> you try disabling CONFIG_USB?

That would be http://bugzilla.kernel.org/show_bug.cgi?id=12399 , I think.

Thanks,
Rafael

Re: X200 suspend issue / linux-next: Tree for January 21

[Aristeu Rozanski]

> That would be http://bugzilla.kernel.org/show_bug.cgi?id=12399 , I think.
I tried the attached patch with the current Linus' git tree and it fixes the
issue to me.
Thanks!

-- 
Aristeu

linux-next: Tree for January 21

[Stephen Rothwell]

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

Hi all,

The next linux-next tree will be created on January 31.  Quite a few
people will be paddling around at LCA, so hopefully there will not be too
much to cope with when I get back.

Changes since 20110120:

Dropped tree: xen

The net tree gained a build failure so I used the version from
next-20110120.

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

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 186 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 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 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 devicetree-current/devicetree/merge
Merging spi-current/spi/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/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
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
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
CONFLICT (rename/rename): Rename "arch/arm/mach-pxa/include/mach/pxa2xx_spi.h"->"arch/arm/mach-s5pv310/include/mach/dma.h" in branch "HEAD" rename "arch/arm/mach-pxa/include/mach/pxa2xx_spi.h"->"include/linux/spi/pxa2xx_spi.h" in "bjdooks-i2c/next-i2c"
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/devices.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa27x.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa3xx.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/trizeps4.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/z2.c
$ git rm -f arch/arm/mach-pxa/include/mach/pxa2xx_spi.h
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
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
$ git reset --hard HEAD^
Merging refs/next/20110120/net
Merging wireless/master
Merging bluetooth/master
Merging 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
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
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/devicetree/next
Merging spi/spi/next
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging swiotlb-xen/master
Merging xen-pvhvm/linux-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/xen/page.h
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 driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
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 (delete/modify): drivers/staging/stradis/Kconfig deleted in HEAD and modified in bkl-config/config. Version bkl-config/config of drivers/staging/stradis/Kconfig left in tree.
CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c
CONFLICT (content): Merge conflict in include/linux/hardirq.h
CONFLICT (content): Merge conflict in include/linux/smp_lock.h
$ git rm -f drivers/staging/stradis/Kconfig
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
$ git checkout scsi-post-merge/master

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

Re: linux-next: Tree for January 21

[Jesse Barnes]

On Fri, 22 Jan 2010 00:00:41 +0100
Tilman Schmidt <tilman@imap.cc> wrote:

> Am 21.01.2010 22:13 schrieb Andrew Morton:
> > On Thu, 21 Jan 2010 16:57:13 +1100
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> >> I have created today's linux-next tree at
> >> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> > 
> > It includes this screwed up commit:
> > 
> > :commit e303d9eadc64907535a0a104afa5871d2b83275e
> > :Author:     Tilman Schmidt <tilman@imap.cc>
> > :AuthorDate: Thu Jan 14 23:18:41 2010 +0100
> > :Commit:     Jesse Barnes <jbarnes@virtuousgeek.org>
> > :CommitDate: Fri Jan 15 10:08:07 2010 -0800
> > :
> > :    PCI/ISDN: push deprecated pci_find_device() function to last
> > user (isdn) :    
> > :    The ISDN4Linux HiSax driver family contains the last remaining
> > users of :    the deprecated pci_find_device() function. This patch
> > creates a private :    copy of that function in HiSax, and removes
> > the now unused global :    function together with its controlling
> > configuration option, :    CONFIG_PCI_LEGACY.
> > :    
> > :    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
> > :    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> > 
> > It adds a bunch of files which are compile-time generated:
> > 
> > include/linux/autoconf.h
> > include/linux/bounds.h
> > include/linux/compile.h
> > include/linux/utsrelease.h
> 
> That's not the patch I submitted. Mine did not add any new files.
> 
> What's more, I've since submitted a new version, fixing the reported
> build failure with CONFIG_PCI=n:
> 
> Subject: [PATCH/v2] pci: push deprecated pci_find_device() function
> to last user Message-Id:
> <20100118162410.4562840108@xenon.ts.pxnet.com> Date: 	Mon, 18
> Jan 2010 17:24:10 +0100 (CET)
> 
> So please drop the patch above, and include the latter one instead.

Ok pushed what should be the fixed up one (your v2 with fuzz fixed up).

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: linux-next: Tree for January 21

[Jesse Barnes]

On Fri, 22 Jan 2010 00:00:41 +0100
Tilman Schmidt <tilman@imap.cc> wrote:

> Am 21.01.2010 22:13 schrieb Andrew Morton:
> > On Thu, 21 Jan 2010 16:57:13 +1100
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> >> I have created today's linux-next tree at
> >> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> > 
> > It includes this screwed up commit:
> > 
> > :commit e303d9eadc64907535a0a104afa5871d2b83275e
> > :Author:     Tilman Schmidt <tilman@imap.cc>
> > :AuthorDate: Thu Jan 14 23:18:41 2010 +0100
> > :Commit:     Jesse Barnes <jbarnes@virtuousgeek.org>
> > :CommitDate: Fri Jan 15 10:08:07 2010 -0800
> > :
> > :    PCI/ISDN: push deprecated pci_find_device() function to last
> > user (isdn) :    
> > :    The ISDN4Linux HiSax driver family contains the last remaining
> > users of :    the deprecated pci_find_device() function. This patch
> > creates a private :    copy of that function in HiSax, and removes
> > the now unused global :    function together with its controlling
> > configuration option, :    CONFIG_PCI_LEGACY.
> > :    
> > :    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
> > :    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> > 
> > It adds a bunch of files which are compile-time generated:
> > 
> > include/linux/autoconf.h
> > include/linux/bounds.h
> > include/linux/compile.h
> > include/linux/utsrelease.h
> 
> That's not the patch I submitted. Mine did not add any new files.
> 
> What's more, I've since submitted a new version, fixing the reported
> build failure with CONFIG_PCI=n:
> 
> Subject: [PATCH/v2] pci: push deprecated pci_find_device() function
> to last user Message-Id:
> <20100118162410.4562840108@xenon.ts.pxnet.com> Date: 	Mon, 18
> Jan 2010 17:24:10 +0100 (CET)
> 
> So please drop the patch above, and include the latter one instead.

Yeah, sorry about that, I must have pulled in the autogenerated files
somehow when committing your patch.  I'll rebase my linux-next branch
and replace your patch with your new one.

Thanks,
Jesse

Re: linux-next: Tree for January 21

[Stephen Rothwell]

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

Hi Andrew,

On Thu, 21 Jan 2010 13:13:39 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> It includes this screwed up commit:
> 
> :commit e303d9eadc64907535a0a104afa5871d2b83275e
> :Author:     Tilman Schmidt <tilman@imap.cc>
> :AuthorDate: Thu Jan 14 23:18:41 2010 +0100
> :Commit:     Jesse Barnes <jbarnes@virtuousgeek.org>
> :CommitDate: Fri Jan 15 10:08:07 2010 -0800
> :
> :    PCI/ISDN: push deprecated pci_find_device() function to last user (isdn)
> 
> It adds a bunch of files which are compile-time generated:

Thanks for noticing.  I will revert that commit today since it is still
in the pci tree.

-- 
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 January 21

[Tilman Schmidt]

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

Am 21.01.2010 22:13 schrieb Andrew Morton:
> On Thu, 21 Jan 2010 16:57:13 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
>> I have created today's linux-next tree at
>> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> 
> It includes this screwed up commit:
> 
> :commit e303d9eadc64907535a0a104afa5871d2b83275e
> :Author:     Tilman Schmidt <tilman@imap.cc>
> :AuthorDate: Thu Jan 14 23:18:41 2010 +0100
> :Commit:     Jesse Barnes <jbarnes@virtuousgeek.org>
> :CommitDate: Fri Jan 15 10:08:07 2010 -0800
> :
> :    PCI/ISDN: push deprecated pci_find_device() function to last user (isdn)
> :    
> :    The ISDN4Linux HiSax driver family contains the last remaining users of
> :    the deprecated pci_find_device() function. This patch creates a private
> :    copy of that function in HiSax, and removes the now unused global
> :    function together with its controlling configuration option,
> :    CONFIG_PCI_LEGACY.
> :    
> :    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
> :    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> 
> It adds a bunch of files which are compile-time generated:
> 
> include/linux/autoconf.h
> include/linux/bounds.h
> include/linux/compile.h
> include/linux/utsrelease.h

That's not the patch I submitted. Mine did not add any new files.

What's more, I've since submitted a new version, fixing the reported
build failure with CONFIG_PCI=n:

Subject: [PATCH/v2] pci: push deprecated pci_find_device() function to last user
Message-Id: <20100118162410.4562840108@xenon.ts.pxnet.com>
Date: 	Mon, 18 Jan 2010 17:24:10 +0100 (CET)

So please drop the patch above, and include the latter one instead.

Thanks,
Tilman

-- 
Tilman Schmidt                    E-Mail: tilman@imap.cc
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Ungeöffnet mindestens haltbar bis: (siehe Rückseite)


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

Re: linux-next: Tree for January 21

[Andrew Morton]

On Thu, 21 Jan 2010 16:57:13 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

It includes this screwed up commit:

:commit e303d9eadc64907535a0a104afa5871d2b83275e
:Author:     Tilman Schmidt <tilman@imap.cc>
:AuthorDate: Thu Jan 14 23:18:41 2010 +0100
:Commit:     Jesse Barnes <jbarnes@virtuousgeek.org>
:CommitDate: Fri Jan 15 10:08:07 2010 -0800
:
:    PCI/ISDN: push deprecated pci_find_device() function to last user (isdn)
:    
:    The ISDN4Linux HiSax driver family contains the last remaining users of
:    the deprecated pci_find_device() function. This patch creates a private
:    copy of that function in HiSax, and removes the now unused global
:    function together with its controlling configuration option,
:    CONFIG_PCI_LEGACY.
:    
:    Signed-off-by: Tilman Schmidt <tilman@imap.cc>
:    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

It adds a bunch of files which are compile-time generated:

include/linux/autoconf.h
include/linux/bounds.h
include/linux/compile.h
include/linux/utsrelease.h

linux-next: Tree for January 21

[Stephen Rothwell]

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

Hi all,

Changes since 20100120:

Removed tree: utrace (pending a decision on whether it is ready)

The pci tree lost its build failure.

The acpi tree lost its conflict.

The rr tree lost its conflicts.

The spi tree gained a build failure so I used the version from
next-20100120.

The tip tree lost its conflict.

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

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 157 trees (counting Linus' and 23 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 mtd-current/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/Makefile
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
CONFLICT (content): Merge conflict in Documentation/ioctl/ioctl-number.txt
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
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
CONFLICT (content): Merge conflict in fs/gfs2/ops_inode.c
Applying: logfs: fixup for write_inode API change
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
CONFLICT (add/add): Merge conflict in drivers/media/dvb/mantis/mantis_input.c
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
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
CONFLICT (content): Merge conflict in drivers/mfd/asic3.c
CONFLICT (content): Merge conflict in drivers/mfd/t7l66xb.c
CONFLICT (content): Merge conflict in drivers/mfd/tc6387xb.c
CONFLICT (content): Merge conflict in drivers/mfd/tc6393xb.c
CONFLICT (add/add): Merge conflict in drivers/mfd/tmio_core.c
CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.c
CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.h
CONFLICT (content): Merge conflict in include/linux/mfd/tmio.h
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
CONFLICT (content): Merge conflict in drivers/mfd/wm8350-irq.c
CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.c
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
CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_fsnotify.c
CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in include/linux/fsnotify.h
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 include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
$ git reset --hard HEAD^
Merging refs/next/20100120/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
CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.c left in tree.
CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.h deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.h left in tree.
$ git rm -f drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h
Merging scsi-post-merge/master

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