* Re: linux-next: manual merge of the tty tree with the tty.current tree
From: Greg KH @ 2011-11-27 4:08 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Jiri Slaby, Dave Young
In-Reply-To: <20111118143010.4a6c9eb17b86d24b9ebe706b@canb.auug.org.au>
On Fri, Nov 18, 2011 at 02:30:10PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/tty_ldisc.c between commits df92d0561de3 ("TTY: ldisc, allow
> waiting for ldisc arbitrarily long") and 0c73c08ec73d ("TTY: ldisc, wait
> for ldisc infinitely in hangup") from the tty.current tree and commits
> 66ef27c3fd0e ("tty_ldisc: remove unnecessary negative return check for
> wait_event_timeout") and 8b3ffa173ffa ("TTY: ldisc, remove some unneeded
> includes") from the tty tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Now merged together, you shouldn't have to worry about this in the next
tty pull.
thanks,
greg k-h
^ permalink raw reply
* (repost) vhost tree for linux-next
From: Michael S. Tsirkin @ 2011-11-27 12:48 UTC (permalink / raw)
To: linux-next; +Cc: sfr, linux-pci, netdev, linux-scsi
In-Reply-To: <20111124203843.GC4873@redhat.com>
I normally merge things through Dave, Rusty, Jesse or Jens,
not directly to Linus. However, sometimes there's a large change
(for example, my recent RFC for pci_iomap changes)
where estimating how it interacts with other platforms and planned
changes in the next kernel would be beneficial.
For this purpose, it would be helpful if my tree were added to linux-next.
The tree is:
git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git linux-next
Could you do this please?
(The current contents of that tree was posted for review/feedback
for the first time today. It might make sense to give it a few days
for any responses ...)
Thanks!
--
MST
^ permalink raw reply
* Re: (repost) vhost tree for linux-next
From: James Bottomley @ 2011-11-27 13:38 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: linux-next, sfr, linux-pci, netdev, linux-scsi
In-Reply-To: <20111127124816.GA23270@redhat.com>
On Sun, 2011-11-27 at 14:48 +0200, Michael S. Tsirkin wrote:
> I normally merge things through Dave, Rusty, Jesse or Jens,
> not directly to Linus. However, sometimes there's a large change
> (for example, my recent RFC for pci_iomap changes)
> where estimating how it interacts with other platforms and planned
> changes in the next kernel would be beneficial.
>
> For this purpose, it would be helpful if my tree were added to linux-next.
> The tree is:
> git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git linux-next
>
> Could you do this please?
> (The current contents of that tree was posted for review/feedback
> for the first time today. It might make sense to give it a few days
> for any responses ...)
I'm a little confused by your to: field. This is a linux-arch issue,
isn't it, since it's altering architecture implementations of a PCI
function rather than altering anything in SCSI or net?
James
^ permalink raw reply
* Re: ERROR: end_request: I/O error, dev fd0, sector 0
From: Sedat Dilek @ 2011-11-27 13:52 UTC (permalink / raw)
To: Robert Hancock; +Cc: Jens Axboe, Tejun Heo, LKML, linux-next, Stephen Rothwell
In-Reply-To: <4ED11933.2000108@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 3188 bytes --]
On Sat, Nov 26, 2011 at 5:52 PM, Robert Hancock <hancockrwd@gmail.com> wrote:
> On 11/25/2011 06:53 AM, Sedat Dilek wrote:
>>
>> Hi,
>>
>> I am watching this issue for a long while, due to my
>> floppy-blacklist.conf file since next-20110603.
>>
>> The bad: The boot-process stalls for approx 10-13 secs when booting
>> into my Debian/sid i386 system.
>>
>> # dmesg | grep -A1 -B1 "end_request: I/O error, dev fd0, sector 0"
>> [ 2.422854] sd 2:0:0:0: [sdb] Attached SCSI disk
>> [ 15.289939] end_request: I/O error, dev fd0, sector 0
>> [ 15.342914] EXT4-fs (sda5): mounted filesystem with ordered data
>> mode. Opts: (null)
>>
>> The funny part is my IBM laptop has no physical floppy drive!
>>
>> # dmesg | egrep -i 'floppy|fd0'
>> [ 0.726358] Floppy drive(s): fd0 is 1.44M
>> [ 15.289939] end_request: I/O error, dev fd0, sector 0
>>
>> If I blacklist "floppy" kernel-module, the boot-process is as expected
>> without the above mentionned delay.
>>
>> [ /etc/modprobe.d/floppy-blacklist.conf ]
>> # This file blacklists the floppy driver.
>> #
>> # XXX: Workaround: My IBM ThinkPad T40p (model 2374SG6) notebook has
>> no physical FDD
>> # dmesg from linux-next (next-20110603) says:
>> # [ 0.755294] Floppy drive(s): fd0 is 1.44M
>> # [ 15.238507] end_request: I/O error, dev fd0, sector 0
>> blacklist floppy
>> - EOF -
>>
>> I searched for the line and found bool blk_update_request() in
>> block/blk-core.c file (see [1]).
>>
>> I have attached kern.log and dmesg.
>>
>> Hope this helps to narrow down the issue.
>
> It looks like your laptop's BIOS indicates it has a floppy controller that's
> active:
>
> Nov 25 11:00:32 tbox kernel: [ 0.060821] pnp 00:09: [io 0x03f0-0x03f5]
> Nov 25 11:00:32 tbox kernel: [ 0.060825] pnp 00:09: [io 0x03f7]
> Nov 25 11:00:32 tbox kernel: [ 0.060828] pnp 00:09: [irq 6]
> Nov 25 11:00:32 tbox kernel: [ 0.060831] pnp 00:09: [dma 2]
> Nov 25 11:00:32 tbox kernel: [ 0.060892] pnp 00:09: Plug and Play ACPI
> device, IDs PNP0700 (active)
>
> That's presumably why the floppy driver ends up being loaded. And apparently
> it does have a floppy controller, since the floppy driver seems able to talk
> to it. Maybe that model of laptop had an optional bay-mounted floppy drive
> or something?
>
Could be... next to CD_ROM bay maybe.
> I'm not sure there's a workaround for this at the kernel level, since the
> kernel probably can't determine if there's actually a floppy drive installed
> without trying to read from it (which is likely being triggered by partition
> probing or something). The read error will be what is triggering the message
> you saw.
>
> Is there a BIOS option to disable the floppy controller?
>
I have disabled "Floppy-Drive" in BIOS setup now (was set to
"enabled"), but I have still the modprobe backlist for floppy
activated.
Can you explain the stalling of ***10-12 seconds*** with a wrong FDD
BIOS setting?
That's really a long duration, with systemd my boot-process takes
approx 15-18 seconds.
Attached is the new dmesg output (kernel-config was not changed).
- Sedat -
[-- Attachment #2: dmesg_3.2.0-rc3-next20111125.3-686-small.txt --]
[-- Type: text/plain, Size: 53047 bytes --]
[ 0.000000] Initializing cgroup subsys cpuset
[ 0.000000] Initializing cgroup subsys cpu
[ 0.000000] Linux version 3.2.0-rc3-next20111125.3-686-small (Debian 3.2.0~rc3-3~next20111125.dilek1) (sedat.dilek@gmail.com) (gcc version 4.6.2 (Debian 4.6.2-5) ) #1 SMP Sun Nov 27 14:35:02 CET 2011
[ 0.000000] BIOS-provided physical RAM map:
[ 0.000000] BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
[ 0.000000] BIOS-e820: 000000000009f000 - 00000000000a0000 (reserved)
[ 0.000000] BIOS-e820: 00000000000d2000 - 00000000000d4000 (reserved)
[ 0.000000] BIOS-e820: 00000000000dc000 - 0000000000100000 (reserved)
[ 0.000000] BIOS-e820: 0000000000100000 - 000000003ff60000 (usable)
[ 0.000000] BIOS-e820: 000000003ff60000 - 000000003ff77000 (ACPI data)
[ 0.000000] BIOS-e820: 000000003ff77000 - 000000003ff79000 (ACPI NVS)
[ 0.000000] BIOS-e820: 000000003ff80000 - 0000000040000000 (reserved)
[ 0.000000] BIOS-e820: 00000000ff800000 - 0000000100000000 (reserved)
[ 0.000000] Notice: NX (Execute Disable) protection missing in CPU!
[ 0.000000] DMI present.
[ 0.000000] DMI: IBM 2374SG6/2374SG6, BIOS 1RETDRWW (3.23 ) 06/18/2007
[ 0.000000] e820 update range: 0000000000000000 - 0000000000010000 (usable) ==> (reserved)
[ 0.000000] e820 remove range: 00000000000a0000 - 0000000000100000 (usable)
[ 0.000000] last_pfn = 0x3ff60 max_arch_pfn = 0x100000
[ 0.000000] MTRR default type: uncachable
[ 0.000000] MTRR fixed ranges enabled:
[ 0.000000] 00000-9FFFF write-back
[ 0.000000] A0000-BFFFF uncachable
[ 0.000000] C0000-CFFFF write-protect
[ 0.000000] D0000-DBFFF uncachable
[ 0.000000] DC000-DFFFF write-back
[ 0.000000] E0000-FFFFF write-protect
[ 0.000000] MTRR variable ranges enabled:
[ 0.000000] 0 base 000000000 mask FC0000000 write-back
[ 0.000000] 1 base 03FF80000 mask FFFF80000 uncachable
[ 0.000000] 2 disabled
[ 0.000000] 3 disabled
[ 0.000000] 4 disabled
[ 0.000000] 5 disabled
[ 0.000000] 6 disabled
[ 0.000000] 7 disabled
[ 0.000000] PAT not supported by CPU.
[ 0.000000] initial memory mapped : 0 - 01800000
[ 0.000000] Base memory trampoline at [c009b000] 9b000 size 16384
[ 0.000000] init_memory_mapping: 0000000000000000-00000000377fe000
[ 0.000000] 0000000000 - 0000400000 page 4k
[ 0.000000] 0000400000 - 0037400000 page 2M
[ 0.000000] 0037400000 - 00377fe000 page 4k
[ 0.000000] kernel direct mapping tables up to 377fe000 @ 17fb000-1800000
[ 0.000000] RAMDISK: 377f2000 - 37bf1000
[ 0.000000] Allocated new RAMDISK: 373f3000 - 377f1d2f
[ 0.000000] Move RAMDISK from 00000000377f2000 - 0000000037bf0d2e to 373f3000 - 377f1d2e
[ 0.000000] ACPI: RSDP 000f6d70 00024 (v02 IBM )
[ 0.000000] ACPI: XSDT 3ff6a672 0004C (v01 IBM TP-1R 00003230 LTP 00000000)
[ 0.000000] ACPI: FACP 3ff6a700 000F4 (v03 IBM TP-1R 00003230 IBM 00000001)
[ 0.000000] ACPI Warning: 32/64X length mismatch in Gpe1Block: 0/32 (20110623/tbfadt-529)
[ 0.000000] ACPI Warning: Optional field Gpe1Block has zero address or length: 0x000000000000102C/0x0 (20110623/tbfadt-560)
[ 0.000000] ACPI: DSDT 3ff6a8e7 0C530 (v01 IBM TP-1R 00003230 MSFT 0100000E)
[ 0.000000] ACPI: FACS 3ff78000 00040
[ 0.000000] ACPI: SSDT 3ff6a8b4 00033 (v01 IBM TP-1R 00003230 MSFT 0100000E)
[ 0.000000] ACPI: ECDT 3ff76e17 00052 (v01 IBM TP-1R 00003230 IBM 00000001)
[ 0.000000] ACPI: TCPA 3ff76e69 00032 (v01 IBM TP-1R 00003230 PTL 00000001)
[ 0.000000] ACPI: BOOT 3ff76fd8 00028 (v01 IBM TP-1R 00003230 LTP 00000001)
[ 0.000000] 135MB HIGHMEM available.
[ 0.000000] 887MB LOWMEM available.
[ 0.000000] mapped low ram: 0 - 377fe000
[ 0.000000] low ram: 0 - 377fe000
[ 0.000000] Zone PFN ranges:
[ 0.000000] DMA 0x00000010 -> 0x00001000
[ 0.000000] Normal 0x00001000 -> 0x000377fe
[ 0.000000] HighMem 0x000377fe -> 0x0003ff60
[ 0.000000] Movable zone start PFN for each node
[ 0.000000] early_node_map[2] active PFN ranges
[ 0.000000] 0: 0x00000010 -> 0x0000009f
[ 0.000000] 0: 0x00000100 -> 0x0003ff60
[ 0.000000] On node 0 totalpages: 261871
[ 0.000000] free_area_init_node: node 0, pgdat c13ede40, node_mem_map f6bf3200
[ 0.000000] DMA zone: 32 pages used for memmap
[ 0.000000] DMA zone: 0 pages reserved
[ 0.000000] DMA zone: 3951 pages, LIFO batch:0
[ 0.000000] Normal zone: 1744 pages used for memmap
[ 0.000000] Normal zone: 221486 pages, LIFO batch:31
[ 0.000000] HighMem zone: 271 pages used for memmap
[ 0.000000] HighMem zone: 34387 pages, LIFO batch:7
[ 0.000000] Using APIC driver default
[ 0.000000] ACPI: PM-Timer IO Port: 0x1008
[ 0.000000] SMP: Allowing 1 CPUs, 0 hotplug CPUs
[ 0.000000] Local APIC disabled by BIOS -- reenabling.
[ 0.000000] Found and enabled local APIC!
[ 0.000000] nr_irqs_gsi: 16
[ 0.000000] Allocating PCI resources starting at 40000000 (gap: 40000000:bf800000)
[ 0.000000] Booting paravirtualized kernel on bare hardware
[ 0.000000] setup_percpu: NR_CPUS:32 nr_cpumask_bits:32 nr_cpu_ids:1 nr_node_ids:1
[ 0.000000] PERCPU: Embedded 13 pages/cpu @f6400000 s30400 r0 d22848 u4194304
[ 0.000000] pcpu-alloc: s30400 r0 d22848 u4194304 alloc=1*4194304
[ 0.000000] pcpu-alloc: [0] 0
[ 0.000000] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 259824
[ 0.000000] Kernel command line: BOOT_IMAGE=/boot/vmlinuz-3.2.0-rc3-next20111125.3-686-small root=UUID=1ceb69a7-ecf4-47e9-a231-b74e0f0a9b62 ro init=/bin/systemd radeon.modeset=1 lapic 3
[ 0.000000] PID hash table entries: 4096 (order: 2, 16384 bytes)
[ 0.000000] Dentry cache hash table entries: 131072 (order: 7, 524288 bytes)
[ 0.000000] Inode-cache hash table entries: 65536 (order: 6, 262144 bytes)
[ 0.000000] Initializing CPU#0
[ 0.000000] Initializing HighMem for node 0 (000377fe:0003ff60)
[ 0.000000] Memory: 1029028k/1047936k available (2751k kernel code, 18456k reserved, 1300k data, 376k init, 138632k highmem)
[ 0.000000] virtual kernel memory layout:
[ 0.000000] fixmap : 0xffd36000 - 0xfffff000 (2852 kB)
[ 0.000000] pkmap : 0xff800000 - 0xffc00000 (4096 kB)
[ 0.000000] vmalloc : 0xf7ffe000 - 0xff7fe000 ( 120 MB)
[ 0.000000] lowmem : 0xc0000000 - 0xf77fe000 ( 887 MB)
[ 0.000000] .init : 0xc13f6000 - 0xc1454000 ( 376 kB)
[ 0.000000] .data : 0xc12afedb - 0xc13f51c0 (1300 kB)
[ 0.000000] .text : 0xc1000000 - 0xc12afedb (2751 kB)
[ 0.000000] Checking if this processor honours the WP bit even in supervisor mode...Ok.
[ 0.000000] SLUB: Genslabs=15, HWalign=64, Order=0-3, MinObjects=0, CPUs=1, Nodes=1
[ 0.000000] Hierarchical RCU implementation.
[ 0.000000] RCU debugfs-based tracing is enabled.
[ 0.000000] RCU dyntick-idle grace-period acceleration is enabled.
[ 0.000000] NR_IRQS:2304 nr_irqs:256 16
[ 0.000000] CPU 0 irqstacks, hard=f6008000 soft=f600a000
[ 0.000000] Extended CMOS year: 2000
[ 0.000000] Console: colour VGA+ 80x25
[ 0.000000] console [tty0] enabled
[ 0.000000] Fast TSC calibration using PIT
[ 0.000000] Detected 1694.266 MHz processor.
[ 0.008003] Calibrating delay loop (skipped), value calculated using timer frequency.. 3388.53 BogoMIPS (lpj=6777064)
[ 0.008076] pid_max: default: 32768 minimum: 301
[ 0.008150] Security Framework initialized
[ 0.008192] SELinux: Disabled at boot.
[ 0.008314] Mount-cache hash table entries: 512
[ 0.008562] Initializing cgroup subsys debug
[ 0.008600] Initializing cgroup subsys cpuacct
[ 0.008640] Initializing cgroup subsys devices
[ 0.008675] Initializing cgroup subsys freezer
[ 0.008710] Initializing cgroup subsys net_cls
[ 0.008746] Initializing cgroup subsys blkio
[ 0.008831] mce: CPU supports 5 MCE banks
[ 0.008878] CPU0: Thermal monitoring enabled (TM2)
[ 0.008990] SMP alternatives: switching to UP code
[ 0.010975] Freeing SMP alternatives: 8k freed
[ 0.011014] ACPI: Core revision 20110623
[ 0.018413] ACPI: setting ELCR to 0200 (from 0800)
[ 0.020094] weird, boot CPU (#0) not listed by the BIOS.
[ 0.020132] SMP motherboard not detected.
[ 0.020170] Enabling APIC mode: Flat. Using 0 I/O APICs
[ 0.024001] SMP disabled
[ 0.024001] Performance Events: p6 PMU driver.
[ 0.024001] ... version: 0
[ 0.024001] ... bit width: 32
[ 0.024001] ... generic registers: 2
[ 0.024001] ... value mask: 00000000ffffffff
[ 0.024001] ... max period: 000000007fffffff
[ 0.024001] ... fixed-purpose events: 0
[ 0.024001] ... event mask: 0000000000000003
[ 0.024001] NMI watchdog enabled, takes one hw-pmu counter.
[ 0.024001] Brought up 1 CPUs
[ 0.024001] Total of 1 processors activated (3388.53 BogoMIPS).
[ 0.024001] devtmpfs: initialized
[ 0.024001] print_constraints: dummy:
[ 0.024001] NET: Registered protocol family 16
[ 0.024001] ACPI: bus type pci registered
[ 0.024001] PCI: PCI BIOS revision 2.10 entry at 0xfd8d6, last bus=8
[ 0.024001] PCI: Using configuration type 1 for base access
[ 0.024001] bio: create slab <bio-0> at 0
[ 0.024001] ACPI: Added _OSI(Module Device)
[ 0.024001] ACPI: Added _OSI(Processor Device)
[ 0.024001] ACPI: Added _OSI(3.0 _SCP Extensions)
[ 0.024001] ACPI: Added _OSI(Processor Aggregator Device)
[ 0.025121] ACPI: EC: EC description table is found, configuring boot EC
[ 0.036245] ACPI: Interpreter enabled
[ 0.036286] ACPI: (supports S0 S3 S5)
[ 0.036399] ACPI: Using PIC for interrupt routing
[ 0.040193] ACPI: Power Resource [PUBS] (on)
[ 0.044235] ACPI: EC: GPE = 0x1c, I/O: command/status = 0x66, data = 0x62
[ 0.044806] ACPI: ACPI Dock Station Driver: 3 docks/bays found
[ 0.044806] HEST: Table not found.
[ 0.044806] PCI: Ignoring host bridge windows from ACPI; if necessary, use "pci=use_crs" and report a bug
[ 0.044874] ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-ff])
[ 0.045015] pci_root PNP0A03:00: host bridge window [io 0x0000-0x0cf7] (ignored)
[ 0.045020] pci_root PNP0A03:00: host bridge window [io 0x0d00-0xffff] (ignored)
[ 0.045024] pci_root PNP0A03:00: host bridge window [mem 0x000a0000-0x000bffff] (ignored)
[ 0.045029] pci_root PNP0A03:00: host bridge window [mem 0x000d4000-0x000d7fff] (ignored)
[ 0.045033] pci_root PNP0A03:00: host bridge window [mem 0x000d8000-0x000dbfff] (ignored)
[ 0.045038] pci_root PNP0A03:00: host bridge window [mem 0x40000000-0xfebfffff] (ignored)
[ 0.045056] pci 0000:00:00.0: [8086:3340] type 0 class 0x000600
[ 0.045065] pci 0000:00:00.0: reg 10: [mem 0xd0000000-0xdfffffff pref]
[ 0.045115] pci 0000:00:01.0: [8086:3341] type 1 class 0x000604
[ 0.045177] pci 0000:00:1d.0: [8086:24c2] type 0 class 0x000c03
[ 0.045223] pci 0000:00:1d.0: reg 20: [io 0x1800-0x181f]
[ 0.045261] pci 0000:00:1d.1: [8086:24c4] type 0 class 0x000c03
[ 0.045307] pci 0000:00:1d.1: reg 20: [io 0x1820-0x183f]
[ 0.045345] pci 0000:00:1d.2: [8086:24c7] type 0 class 0x000c03
[ 0.045391] pci 0000:00:1d.2: reg 20: [io 0x1840-0x185f]
[ 0.045447] pci 0000:00:1d.7: [8086:24cd] type 0 class 0x000c03
[ 0.045470] pci 0000:00:1d.7: reg 10: [mem 0xc0000000-0xc00003ff]
[ 0.045568] pci 0000:00:1d.7: PME# supported from D0 D3hot D3cold
[ 0.045574] pci 0000:00:1d.7: PME# disabled
[ 0.045594] pci 0000:00:1e.0: [8086:2448] type 1 class 0x000604
[ 0.045643] pci 0000:00:1f.0: [8086:24cc] type 0 class 0x000601
[ 0.045713] pci 0000:00:1f.0: quirk: [io 0x1000-0x107f] claimed by ICH4 ACPI/GPIO/TCO
[ 0.045764] pci 0000:00:1f.0: quirk: [io 0x1180-0x11bf] claimed by ICH4 GPIO
[ 0.045818] pci 0000:00:1f.1: [8086:24ca] type 0 class 0x000101
[ 0.045834] pci 0000:00:1f.1: reg 10: [io 0x0000-0x0007]
[ 0.045845] pci 0000:00:1f.1: reg 14: [io 0x0000-0x0003]
[ 0.045856] pci 0000:00:1f.1: reg 18: [io 0x0000-0x0007]
[ 0.045868] pci 0000:00:1f.1: reg 1c: [io 0x0000-0x0003]
[ 0.045879] pci 0000:00:1f.1: reg 20: [io 0x1860-0x186f]
[ 0.045890] pci 0000:00:1f.1: reg 24: [mem 0x00000000-0x000003ff]
[ 0.045923] pci 0000:00:1f.3: [8086:24c3] type 0 class 0x000c05
[ 0.045969] pci 0000:00:1f.3: reg 20: [io 0x1880-0x189f]
[ 0.046011] pci 0000:00:1f.5: [8086:24c5] type 0 class 0x000401
[ 0.046028] pci 0000:00:1f.5: reg 10: [io 0x1c00-0x1cff]
[ 0.046038] pci 0000:00:1f.5: reg 14: [io 0x18c0-0x18ff]
[ 0.046049] pci 0000:00:1f.5: reg 18: [mem 0xc0000c00-0xc0000dff]
[ 0.046059] pci 0000:00:1f.5: reg 1c: [mem 0xc0000800-0xc00008ff]
[ 0.046107] pci 0000:00:1f.5: PME# supported from D0 D3hot D3cold
[ 0.046113] pci 0000:00:1f.5: PME# disabled
[ 0.046130] pci 0000:00:1f.6: [8086:24c6] type 0 class 0x000703
[ 0.046147] pci 0000:00:1f.6: reg 10: [io 0x2400-0x24ff]
[ 0.046158] pci 0000:00:1f.6: reg 14: [io 0x2000-0x207f]
[ 0.046219] pci 0000:00:1f.6: PME# supported from D0 D3hot D3cold
[ 0.046225] pci 0000:00:1f.6: PME# disabled
[ 0.046252] pci 0000:01:00.0: [1002:4c66] type 0 class 0x000300
[ 0.046268] pci 0000:01:00.0: reg 10: [mem 0xe0000000-0xe7ffffff pref]
[ 0.046277] pci 0000:01:00.0: reg 14: [io 0x3000-0x30ff]
[ 0.046286] pci 0000:01:00.0: reg 18: [mem 0xc0100000-0xc010ffff]
[ 0.046311] pci 0000:01:00.0: reg 30: [mem 0x00000000-0x0001ffff pref]
[ 0.046342] pci 0000:01:00.0: supports D1 D2
[ 0.046378] pci 0000:00:01.0: PCI bridge to [bus 01-01]
[ 0.046416] pci 0000:00:01.0: bridge window [io 0x3000-0x3fff]
[ 0.046421] pci 0000:00:01.0: bridge window [mem 0xc0100000-0xc01fffff]
[ 0.046426] pci 0000:00:01.0: bridge window [mem 0xe0000000-0xe7ffffff pref]
[ 0.046452] pci 0000:02:00.0: [104c:ac55] type 2 class 0x000607
[ 0.046471] pci 0000:02:00.0: reg 10: [mem 0xb0000000-0xb0000fff]
[ 0.046501] pci 0000:02:00.0: supports D1 D2
[ 0.046504] pci 0000:02:00.0: PME# supported from D0 D1 D2 D3hot D3cold
[ 0.046509] pci 0000:02:00.0: PME# disabled
[ 0.046529] pci 0000:02:00.1: [104c:ac55] type 2 class 0x000607
[ 0.046547] pci 0000:02:00.1: reg 10: [mem 0xb1000000-0xb1000fff]
[ 0.046577] pci 0000:02:00.1: supports D1 D2
[ 0.046580] pci 0000:02:00.1: PME# supported from D0 D1 D2 D3hot D3cold
[ 0.046586] pci 0000:02:00.1: PME# disabled
[ 0.046615] pci 0000:02:01.0: [8086:101e] type 0 class 0x000200
[ 0.046636] pci 0000:02:01.0: reg 10: [mem 0xc0220000-0xc023ffff]
[ 0.046647] pci 0000:02:01.0: reg 14: [mem 0xc0200000-0xc020ffff]
[ 0.046658] pci 0000:02:01.0: reg 18: [io 0x8000-0x803f]
[ 0.046691] pci 0000:02:01.0: reg 30: [mem 0x00000000-0x0000ffff pref]
[ 0.046731] pci 0000:02:01.0: PME# supported from D0 D3hot D3cold
[ 0.046736] pci 0000:02:01.0: PME# disabled
[ 0.046757] pci 0000:02:02.0: [168c:1014] type 0 class 0x000200
[ 0.046776] pci 0000:02:02.0: reg 10: [mem 0xc0210000-0xc021ffff]
[ 0.046886] pci 0000:00:1e.0: PCI bridge to [bus 02-08] (subtractive decode)
[ 0.046927] pci 0000:00:1e.0: bridge window [io 0x4000-0x8fff]
[ 0.046933] pci 0000:00:1e.0: bridge window [mem 0xc0200000-0xcfffffff]
[ 0.046939] pci 0000:00:1e.0: bridge window [mem 0xe8000000-0xefffffff pref]
[ 0.046943] pci 0000:00:1e.0: bridge window [io 0x0000-0xffff] (subtractive decode)
[ 0.046947] pci 0000:00:1e.0: bridge window [mem 0x00000000-0xffffffff] (subtractive decode)
[ 0.048079] pci_bus 0000:00: on NUMA node 0
[ 0.048084] ACPI: PCI Interrupt Routing Table [\_SB_.PCI0._PRT]
[ 0.048136] ACPI: PCI Interrupt Routing Table [\_SB_.PCI0.AGP_._PRT]
[ 0.048163] ACPI: PCI Interrupt Routing Table [\_SB_.PCI0.PCI1._PRT]
[ 0.048270] pci0000:00: Unable to request _OSC control (_OSC support mask: 0x1e)
[ 0.051620] ACPI: PCI Interrupt Link [LNKA] (IRQs 3 4 5 6 7 9 10 *11)
[ 0.051960] ACPI: PCI Interrupt Link [LNKB] (IRQs 3 4 5 6 7 9 10 *11)
[ 0.052296] ACPI: PCI Interrupt Link [LNKC] (IRQs 3 4 5 6 7 9 10 *11)
[ 0.052633] ACPI: PCI Interrupt Link [LNKD] (IRQs 3 4 5 6 7 9 10 *11)
[ 0.052951] ACPI: PCI Interrupt Link [LNKE] (IRQs 3 4 5 6 7 9 10 11) *0, disabled.
[ 0.053319] ACPI: PCI Interrupt Link [LNKF] (IRQs 3 4 5 6 7 9 10 11) *0, disabled.
[ 0.053686] ACPI: PCI Interrupt Link [LNKG] (IRQs 3 4 5 6 7 9 10 11) *0, disabled.
[ 0.054074] ACPI: PCI Interrupt Link [LNKH] (IRQs 3 4 5 6 7 9 10 *11)
[ 0.054453] vgaarb: device added: PCI:0000:01:00.0,decodes=io+mem,owns=io+mem,locks=none
[ 0.054502] vgaarb: loaded
[ 0.054534] vgaarb: bridge control possible 0000:01:00.0
[ 0.054624] PCI: Using ACPI for IRQ routing
[ 0.054795] PCI: pci_cache_line_size set to 64 bytes
[ 0.054864] reserve RAM buffer: 000000000009f000 - 000000000009ffff
[ 0.054868] reserve RAM buffer: 000000003ff60000 - 000000003fffffff
[ 0.057426] pnp: PnP ACPI init
[ 0.057491] ACPI: bus type pnp registered
[ 0.058164] pnp 00:00: [mem 0x00000000-0x0009ffff]
[ 0.058169] pnp 00:00: [mem 0x000c0000-0x000c3fff]
[ 0.058172] pnp 00:00: [mem 0x000c4000-0x000c7fff]
[ 0.058176] pnp 00:00: [mem 0x000c8000-0x000cbfff]
[ 0.058179] pnp 00:00: [mem 0x000cc000-0x000cffff]
[ 0.058183] pnp 00:00: [mem 0x000d0000-0x000d3fff]
[ 0.058186] pnp 00:00: [mem 0x000d4000-0x000d3fff disabled]
[ 0.058190] pnp 00:00: [mem 0x000d8000-0x000d7fff disabled]
[ 0.058193] pnp 00:00: [mem 0x000dc000-0x000dffff]
[ 0.058197] pnp 00:00: [mem 0x000e0000-0x000e3fff]
[ 0.058200] pnp 00:00: [mem 0x000e4000-0x000e7fff]
[ 0.058204] pnp 00:00: [mem 0x000e8000-0x000ebfff]
[ 0.058207] pnp 00:00: [mem 0x000ec000-0x000effff]
[ 0.058210] pnp 00:00: [mem 0x000f0000-0x000fffff]
[ 0.058214] pnp 00:00: [mem 0x00100000-0x3fffffff]
[ 0.058217] pnp 00:00: [mem 0xfec00000-0xffffffff]
[ 0.058317] system 00:00: [mem 0x00000000-0x0009ffff] could not be reserved
[ 0.058358] system 00:00: [mem 0x000c0000-0x000c3fff] could not be reserved
[ 0.058398] system 00:00: [mem 0x000c4000-0x000c7fff] could not be reserved
[ 0.058437] system 00:00: [mem 0x000c8000-0x000cbfff] could not be reserved
[ 0.058476] system 00:00: [mem 0x000cc000-0x000cffff] could not be reserved
[ 0.058515] system 00:00: [mem 0x000d0000-0x000d3fff] could not be reserved
[ 0.058554] system 00:00: [mem 0x000dc000-0x000dffff] could not be reserved
[ 0.058594] system 00:00: [mem 0x000e0000-0x000e3fff] could not be reserved
[ 0.058633] system 00:00: [mem 0x000e4000-0x000e7fff] could not be reserved
[ 0.058672] system 00:00: [mem 0x000e8000-0x000ebfff] could not be reserved
[ 0.058711] system 00:00: [mem 0x000ec000-0x000effff] could not be reserved
[ 0.058750] system 00:00: [mem 0x000f0000-0x000fffff] could not be reserved
[ 0.058790] system 00:00: [mem 0x00100000-0x3fffffff] could not be reserved
[ 0.058829] system 00:00: [mem 0xfec00000-0xffffffff] could not be reserved
[ 0.058870] system 00:00: Plug and Play ACPI device, IDs PNP0c01 (active)
[ 0.058906] pnp 00:01: [bus 00-ff]
[ 0.058910] pnp 00:01: [io 0x0cf8-0x0cff]
[ 0.058913] pnp 00:01: [io 0x0000-0x0cf7 window]
[ 0.058917] pnp 00:01: [io 0x0d00-0xffff window]
[ 0.058920] pnp 00:01: [mem 0x000a0000-0x000bffff window]
[ 0.058930] pnp 00:01: [mem 0x000c0000-0x000c3fff window]
[ 0.058934] pnp 00:01: [mem 0x000c4000-0x000c7fff window]
[ 0.058938] pnp 00:01: [mem 0x000c8000-0x000cbfff window]
[ 0.058941] pnp 00:01: [mem 0x000cc000-0x000cffff window]
[ 0.058945] pnp 00:01: [mem 0x000d0000-0x000d3fff window]
[ 0.058948] pnp 00:01: [mem 0x000d4000-0x000d7fff window]
[ 0.058952] pnp 00:01: [mem 0x000d8000-0x000dbfff window]
[ 0.058956] pnp 00:01: [mem 0x000dc000-0x000dffff window]
[ 0.058959] pnp 00:01: [mem 0x000e0000-0x000e3fff window]
[ 0.058963] pnp 00:01: [mem 0x000e4000-0x000e7fff window]
[ 0.058967] pnp 00:01: [mem 0x000e8000-0x000ebfff window]
[ 0.058970] pnp 00:01: [mem 0x000ec000-0x000effff window]
[ 0.058974] pnp 00:01: [mem 0x40000000-0xfebfffff window]
[ 0.059036] pnp 00:01: Plug and Play ACPI device, IDs PNP0a03 (active)
[ 0.059148] pnp 00:02: [io 0x0010-0x001f]
[ 0.059152] pnp 00:02: [io 0x0090-0x009f]
[ 0.059155] pnp 00:02: [io 0x0024-0x0025]
[ 0.059159] pnp 00:02: [io 0x0028-0x0029]
[ 0.059162] pnp 00:02: [io 0x002c-0x002d]
[ 0.059165] pnp 00:02: [io 0x0030-0x0031]
[ 0.059168] pnp 00:02: [io 0x0034-0x0035]
[ 0.059171] pnp 00:02: [io 0x0038-0x0039]
[ 0.059174] pnp 00:02: [io 0x003c-0x003d]
[ 0.059177] pnp 00:02: [io 0x00a4-0x00a5]
[ 0.059181] pnp 00:02: [io 0x00a8-0x00a9]
[ 0.059184] pnp 00:02: [io 0x00ac-0x00ad]
[ 0.059187] pnp 00:02: [io 0x00b0-0x00b5]
[ 0.059190] pnp 00:02: [io 0x00b8-0x00b9]
[ 0.059193] pnp 00:02: [io 0x00bc-0x00bd]
[ 0.059196] pnp 00:02: [io 0x0050-0x0053]
[ 0.059199] pnp 00:02: [io 0x0072-0x0077]
[ 0.059203] pnp 00:02: [io 0x002e-0x002f]
[ 0.059206] pnp 00:02: [io 0x1000-0x107f]
[ 0.059209] pnp 00:02: [io 0x1180-0x11bf]
[ 0.059212] pnp 00:02: [io 0x15e0-0x15ef]
[ 0.059215] pnp 00:02: [io 0x1600-0x162f]
[ 0.059218] pnp 00:02: [io 0x1632-0x167f]
[ 0.059222] pnp 00:02: [io 0x004e-0x004f]
[ 0.059225] pnp 00:02: [io 0x1630-0x1631]
[ 0.059313] system 00:02: [io 0x1000-0x107f] has been reserved
[ 0.059352] system 00:02: [io 0x1180-0x11bf] has been reserved
[ 0.059390] system 00:02: [io 0x15e0-0x15ef] has been reserved
[ 0.059428] system 00:02: [io 0x1600-0x162f] has been reserved
[ 0.059466] system 00:02: [io 0x1632-0x167f] has been reserved
[ 0.059504] system 00:02: [io 0x1630-0x1631] has been reserved
[ 0.059542] system 00:02: Plug and Play ACPI device, IDs PNP0c02 (active)
[ 0.059562] pnp 00:03: [io 0x0000-0x000f]
[ 0.059565] pnp 00:03: [io 0x0080-0x008f]
[ 0.059569] pnp 00:03: [io 0x00c0-0x00df]
[ 0.059573] pnp 00:03: [dma 4]
[ 0.059621] pnp 00:03: Plug and Play ACPI device, IDs PNP0200 (active)
[ 0.059635] pnp 00:04: [io 0x0061]
[ 0.059673] pnp 00:04: Plug and Play ACPI device, IDs PNP0800 (active)
[ 0.059687] pnp 00:05: [io 0x00f0]
[ 0.059692] pnp 00:05: [irq 13]
[ 0.059736] pnp 00:05: Plug and Play ACPI device, IDs PNP0c04 (active)
[ 0.059750] pnp 00:06: [io 0x0070-0x0071]
[ 0.059753] pnp 00:06: [irq 8]
[ 0.059793] pnp 00:06: Plug and Play ACPI device, IDs PNP0b00 (active)
[ 0.059806] pnp 00:07: [io 0x0060]
[ 0.059809] pnp 00:07: [io 0x0064]
[ 0.059812] pnp 00:07: [irq 1]
[ 0.059852] pnp 00:07: Plug and Play ACPI device, IDs PNP0303 (active)
[ 0.059871] pnp 00:08: [irq 12]
[ 0.059918] pnp 00:08: Plug and Play ACPI device, IDs IBM0057 PNP0f13 (active)
[ 0.060051] pnp 00:09: [io 0x03f8-0x03ff]
[ 0.060054] pnp 00:09: [irq 4]
[ 0.060174] pnp 00:09: Plug and Play ACPI device, IDs PNP0501 (active)
[ 0.060293] pnp 00:0a: [io 0x03bc-0x03be]
[ 0.060297] pnp 00:0a: [irq 7]
[ 0.060396] pnp 00:0a: Plug and Play ACPI device, IDs PNP0400 (active)
[ 0.060562] pnp 00:0b: Plug and Play ACPI device, IDs IBM0071 PNP0511 (disabled)
[ 0.060628] pnp: PnP ACPI: found 12 devices
[ 0.063079] ACPI: ACPI bus type pnp unregistered
[ 0.101376] Switching to clocksource acpi_pm
[ 0.101439] PCI: max bus depth: 2 pci_try_num: 3
[ 0.101469] pci 0000:00:1f.1: BAR 5: assigned [mem 0x40000000-0x400003ff]
[ 0.101513] pci 0000:00:1f.1: BAR 5: set to [mem 0x40000000-0x400003ff] (PCI address [0x40000000-0x400003ff])
[ 0.101565] pci 0000:01:00.0: BAR 6: assigned [mem 0xc0120000-0xc013ffff pref]
[ 0.101612] pci 0000:00:01.0: PCI bridge to [bus 01-01]
[ 0.101649] pci 0000:00:01.0: bridge window [io 0x3000-0x3fff]
[ 0.101688] pci 0000:00:01.0: bridge window [mem 0xc0100000-0xc01fffff]
[ 0.101728] pci 0000:00:01.0: bridge window [mem 0xe0000000-0xe7ffffff pref]
[ 0.101780] pci 0000:02:01.0: BAR 6: assigned [mem 0xe8000000-0xe800ffff pref]
[ 0.101827] pci 0000:02:00.1: BAR 16: assigned [mem 0xc4000000-0xc7ffffff]
[ 0.101866] pci 0000:02:00.1: BAR 15: assigned [mem 0xec000000-0xefffffff pref]
[ 0.101913] pci 0000:02:00.1: BAR 14: assigned [io 0x4000-0x40ff]
[ 0.101950] pci 0000:02:00.1: BAR 13: assigned [io 0x4400-0x44ff]
[ 0.101988] pci 0000:02:00.0: BAR 16: assigned [mem 0xc8000000-0xcbffffff]
[ 0.102027] pci 0000:02:00.0: BAR 15: assigned [mem 0xcc000000-0xcfffffff pref]
[ 0.102074] pci 0000:02:00.0: BAR 14: assigned [io 0x4800-0x48ff]
[ 0.102112] pci 0000:02:00.0: BAR 13: assigned [io 0x4c00-0x4cff]
[ 0.102150] pci 0000:02:00.0: CardBus bridge to [bus 03-06]
[ 0.102187] pci 0000:02:00.0: bridge window [io 0x4c00-0x4cff]
[ 0.102226] pci 0000:02:00.0: bridge window [io 0x4800-0x48ff]
[ 0.102265] pci 0000:02:00.0: bridge window [mem 0xcc000000-0xcfffffff pref]
[ 0.102313] pci 0000:02:00.0: bridge window [mem 0xc8000000-0xcbffffff]
[ 0.102353] pci 0000:02:00.1: CardBus bridge to [bus 07-07]
[ 0.102390] pci 0000:02:00.1: bridge window [io 0x4400-0x44ff]
[ 0.102428] pci 0000:02:00.1: bridge window [io 0x4000-0x40ff]
[ 0.102468] pci 0000:02:00.1: bridge window [mem 0xec000000-0xefffffff pref]
[ 0.102516] pci 0000:02:00.1: bridge window [mem 0xc4000000-0xc7ffffff]
[ 0.102555] pci 0000:00:1e.0: PCI bridge to [bus 02-08]
[ 0.102592] pci 0000:00:1e.0: bridge window [io 0x4000-0x8fff]
[ 0.102633] pci 0000:00:1e.0: bridge window [mem 0xc0200000-0xcfffffff]
[ 0.102674] pci 0000:00:1e.0: bridge window [mem 0xe8000000-0xefffffff pref]
[ 0.102737] pci 0000:00:1e.0: setting latency timer to 64
[ 0.102958] ACPI: PCI Interrupt Link [LNKA] enabled at IRQ 11
[ 0.102996] PCI: setting IRQ 11 as level-triggered
[ 0.103003] pci 0000:02:00.0: PCI INT A -> Link[LNKA] -> GSI 11 (level, low) -> IRQ 11
[ 0.103223] ACPI: PCI Interrupt Link [LNKB] enabled at IRQ 11
[ 0.103262] pci 0000:02:00.1: PCI INT B -> Link[LNKB] -> GSI 11 (level, low) -> IRQ 11
[ 0.103314] pci_bus 0000:00: resource 0 [io 0x0000-0xffff]
[ 0.103318] pci_bus 0000:00: resource 1 [mem 0x00000000-0xffffffff]
[ 0.103322] pci_bus 0000:01: resource 0 [io 0x3000-0x3fff]
[ 0.103325] pci_bus 0000:01: resource 1 [mem 0xc0100000-0xc01fffff]
[ 0.103329] pci_bus 0000:01: resource 2 [mem 0xe0000000-0xe7ffffff pref]
[ 0.103334] pci_bus 0000:02: resource 0 [io 0x4000-0x8fff]
[ 0.103337] pci_bus 0000:02: resource 1 [mem 0xc0200000-0xcfffffff]
[ 0.103341] pci_bus 0000:02: resource 2 [mem 0xe8000000-0xefffffff pref]
[ 0.103345] pci_bus 0000:02: resource 4 [io 0x0000-0xffff]
[ 0.103349] pci_bus 0000:02: resource 5 [mem 0x00000000-0xffffffff]
[ 0.103353] pci_bus 0000:03: resource 0 [io 0x4c00-0x4cff]
[ 0.103356] pci_bus 0000:03: resource 1 [io 0x4800-0x48ff]
[ 0.103360] pci_bus 0000:03: resource 2 [mem 0xcc000000-0xcfffffff pref]
[ 0.103364] pci_bus 0000:03: resource 3 [mem 0xc8000000-0xcbffffff]
[ 0.103368] pci_bus 0000:07: resource 0 [io 0x4400-0x44ff]
[ 0.103372] pci_bus 0000:07: resource 1 [io 0x4000-0x40ff]
[ 0.103375] pci_bus 0000:07: resource 2 [mem 0xec000000-0xefffffff pref]
[ 0.103379] pci_bus 0000:07: resource 3 [mem 0xc4000000-0xc7ffffff]
[ 0.103448] NET: Registered protocol family 2
[ 0.103567] IP route cache hash table entries: 32768 (order: 5, 131072 bytes)
[ 0.103994] TCP established hash table entries: 131072 (order: 8, 1048576 bytes)
[ 0.104589] TCP bind hash table entries: 65536 (order: 7, 524288 bytes)
[ 0.105776] TCP: Hash tables configured (established 131072 bind 65536)
[ 0.105817] TCP reno registered
[ 0.105855] UDP hash table entries: 512 (order: 2, 16384 bytes)
[ 0.105930] UDP-Lite hash table entries: 512 (order: 2, 16384 bytes)
[ 0.106188] NET: Registered protocol family 1
[ 0.106367] pci 0000:01:00.0: Boot video device
[ 0.106388] PCI: CLS 32 bytes, default 64
[ 0.106507] Unpacking initramfs...
[ 0.275038] Freeing initrd memory: 4092k freed
[ 0.281742] Simple Boot Flag at 0x35 set to 0x1
[ 0.282347] audit: initializing netlink socket (disabled)
[ 0.282412] type=2000 audit(1322404916.280:1): initialized
[ 0.301362] highmem bounce pool size: 64 pages
[ 0.301407] HugeTLB registered 4 MB page size, pre-allocated 0 pages
[ 0.304399] VFS: Disk quotas dquot_6.5.2
[ 0.304522] Dquot-cache hash table entries: 1024 (order 0, 4096 bytes)
[ 0.304696] msgmni has been set to 1747
[ 0.304997] alg: No test for stdrng (krng)
[ 0.305104] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 253)
[ 0.305177] io scheduler noop registered
[ 0.305211] io scheduler deadline registered
[ 0.305253] io scheduler cfq registered (default)
[ 0.305577] ERST: Table is not found!
[ 0.305696] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled
[ 0.305827] serial8250: ttyS0 at I/O 0x3f8 (irq = 4) is a NS16550A
[ 0.306361] 00:09: ttyS0 at I/O 0x3f8 (irq = 4) is a NS16550A
[ 0.306554] serial 0000:00:1f.6: PCI INT B -> Link[LNKB] -> GSI 11 (level, low) -> IRQ 11
[ 0.306628] serial 0000:00:1f.6: PCI INT B disabled
[ 0.306828] Linux agpgart interface v0.103
[ 0.307030] agpgart-intel 0000:00:00.0: Intel 855PM Chipset
[ 0.320679] agpgart-intel 0000:00:00.0: AGP aperture is 256M @ 0xd0000000
[ 0.320923] i8042: PNP: PS/2 Controller [PNP0303:KBD,PNP0f13:MOU] at 0x60,0x64 irq 1,12
[ 0.326398] serio: i8042 KBD port at 0x60,0x64 irq 1
[ 0.326442] serio: i8042 AUX port at 0x60,0x64 irq 12
[ 0.326649] mousedev: PS/2 mouse device common for all mice
[ 0.326742] rtc_cmos 00:06: RTC can wake from S4
[ 0.326897] rtc_cmos 00:06: rtc core: registered rtc_cmos as rtc0
[ 0.326951] rtc0: alarms up to one month, y3k, 114 bytes nvram
[ 0.326999] cpuidle: using governor ladder
[ 0.327033] cpuidle: using governor menu
[ 0.327395] TCP cubic registered
[ 0.327641] NET: Registered protocol family 10
[ 0.328475] Mobile IPv6
[ 0.328509] NET: Registered protocol family 17
[ 0.328548] Registering the dns_resolver key type
[ 0.328618] Using IPI No-Shortcut mode
[ 0.328780] registered taskstats version 1
[ 0.329158] rtc_cmos 00:06: setting system clock to 2011-11-27 14:41:57 UTC (1322404917)
[ 0.329262] Initializing network drop monitor service
[ 0.329429] Freeing unused kernel memory: 376k freed
[ 0.330791] input: AT Translated Set 2 keyboard as /devices/platform/i8042/serio0/input/input0
[ 0.348281] udevd[44]: starting version 175
[ 0.387776] usbcore: registered new interface driver usbfs
[ 0.387856] usbcore: registered new interface driver hub
[ 0.436509] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
[ 0.436557] e1000: Copyright (c) 1999-2006 Intel Corporation.
[ 0.436652] e1000 0000:02:01.0: PCI INT A -> Link[LNKA] -> GSI 11 (level, low) -> IRQ 11
[ 0.436837] usbcore: registered new device driver usb
[ 0.437787] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
[ 0.437859] ehci_hcd 0000:00:1d.7: power state changed by ACPI to D0
[ 0.437899] ehci_hcd 0000:00:1d.7: power state changed by ACPI to D0
[ 0.438186] ACPI: PCI Interrupt Link [LNKH] enabled at IRQ 11
[ 0.438226] ehci_hcd 0000:00:1d.7: PCI INT D -> Link[LNKH] -> GSI 11 (level, low) -> IRQ 11
[ 0.438290] ehci_hcd 0000:00:1d.7: setting latency timer to 64
[ 0.438295] ehci_hcd 0000:00:1d.7: EHCI Host Controller
[ 0.438380] ehci_hcd 0000:00:1d.7: new USB bus registered, assigned bus number 1
[ 0.438469] ehci_hcd 0000:00:1d.7: debug port 1
[ 0.442374] ehci_hcd 0000:00:1d.7: cache line size of 32 is not supported
[ 0.442877] SCSI subsystem initialized
[ 0.707994] libata version 3.00 loaded.
[ 0.735750] thermal LNXTHERM:00: registered as thermal_zone0
[ 0.735795] ACPI: Thermal Zone [THM0] (60 C)
[ 0.737493] ehci_hcd 0000:00:1d.7: irq 11, io mem 0xc0000000
[ 0.764032] ehci_hcd 0000:00:1d.7: USB 2.0 started, EHCI 1.00
[ 0.764148] usb usb1: New USB device found, idVendor=1d6b, idProduct=0002
[ 0.764187] usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1
[ 0.764234] usb usb1: Product: EHCI Host Controller
[ 0.764270] usb usb1: Manufacturer: Linux 3.2.0-rc3-next20111125.3-686-small ehci_hcd
[ 0.764317] usb usb1: SerialNumber: 0000:00:1d.7
[ 0.764538] hub 1-0:1.0: USB hub found
[ 0.764577] hub 1-0:1.0: 6 ports detected
[ 0.765439] uhci_hcd: USB Universal Host Controller Interface driver
[ 0.765532] uhci_hcd 0000:00:1d.0: power state changed by ACPI to D0
[ 0.765571] uhci_hcd 0000:00:1d.0: power state changed by ACPI to D0
[ 0.765619] uhci_hcd 0000:00:1d.0: PCI INT A -> Link[LNKA] -> GSI 11 (level, low) -> IRQ 11
[ 0.765678] uhci_hcd 0000:00:1d.0: setting latency timer to 64
[ 0.765683] uhci_hcd 0000:00:1d.0: UHCI Host Controller
[ 0.765731] uhci_hcd 0000:00:1d.0: new USB bus registered, assigned bus number 2
[ 0.765808] uhci_hcd 0000:00:1d.0: irq 11, io base 0x00001800
[ 0.765887] usb usb2: New USB device found, idVendor=1d6b, idProduct=0001
[ 0.765927] usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1
[ 0.765972] usb usb2: Product: UHCI Host Controller
[ 0.766008] usb usb2: Manufacturer: Linux 3.2.0-rc3-next20111125.3-686-small uhci_hcd
[ 0.766054] usb usb2: SerialNumber: 0000:00:1d.0
[ 0.766258] hub 2-0:1.0: USB hub found
[ 0.766295] hub 2-0:1.0: 2 ports detected
[ 0.766421] ata_piix 0000:00:1f.1: version 2.13
[ 0.766433] ata_piix 0000:00:1f.1: enabling device (0005 -> 0007)
[ 0.766708] ACPI: PCI Interrupt Link [LNKC] enabled at IRQ 11
[ 0.766747] ata_piix 0000:00:1f.1: PCI INT A -> Link[LNKC] -> GSI 11 (level, low) -> IRQ 11
[ 0.766844] ata_piix 0000:00:1f.1: setting latency timer to 64
[ 0.770968] scsi0 : ata_piix
[ 0.774751] scsi1 : ata_piix
[ 0.775447] ata1: PATA max UDMA/100 cmd 0x1f0 ctl 0x3f6 bmdma 0x1860 irq 14
[ 0.775487] ata2: PATA max UDMA/100 cmd 0x170 ctl 0x376 bmdma 0x1868 irq 15
[ 0.775622] uhci_hcd 0000:00:1d.1: power state changed by ACPI to D0
[ 0.775661] uhci_hcd 0000:00:1d.1: power state changed by ACPI to D0
[ 0.775884] ACPI: PCI Interrupt Link [LNKD] enabled at IRQ 11
[ 0.775924] uhci_hcd 0000:00:1d.1: PCI INT B -> Link[LNKD] -> GSI 11 (level, low) -> IRQ 11
[ 0.775982] uhci_hcd 0000:00:1d.1: setting latency timer to 64
[ 0.775987] uhci_hcd 0000:00:1d.1: UHCI Host Controller
[ 0.776085] uhci_hcd 0000:00:1d.1: new USB bus registered, assigned bus number 3
[ 0.776159] uhci_hcd 0000:00:1d.1: irq 11, io base 0x00001820
[ 0.776247] usb usb3: New USB device found, idVendor=1d6b, idProduct=0001
[ 0.776286] usb usb3: New USB device strings: Mfr=3, Product=2, SerialNumber=1
[ 0.776332] usb usb3: Product: UHCI Host Controller
[ 0.776368] usb usb3: Manufacturer: Linux 3.2.0-rc3-next20111125.3-686-small uhci_hcd
[ 0.779108] usb usb3: SerialNumber: 0000:00:1d.1
[ 0.781558] hub 3-0:1.0: USB hub found
[ 0.781598] hub 3-0:1.0: 2 ports detected
[ 0.781736] uhci_hcd 0000:00:1d.2: PCI INT C -> Link[LNKC] -> GSI 11 (level, low) -> IRQ 11
[ 0.781790] uhci_hcd 0000:00:1d.2: setting latency timer to 64
[ 0.781795] uhci_hcd 0000:00:1d.2: UHCI Host Controller
[ 0.781839] uhci_hcd 0000:00:1d.2: new USB bus registered, assigned bus number 4
[ 0.781907] uhci_hcd 0000:00:1d.2: irq 11, io base 0x00001840
[ 0.781984] usb usb4: New USB device found, idVendor=1d6b, idProduct=0001
[ 0.782023] usb usb4: New USB device strings: Mfr=3, Product=2, SerialNumber=1
[ 0.782069] usb usb4: Product: UHCI Host Controller
[ 0.782105] usb usb4: Manufacturer: Linux 3.2.0-rc3-next20111125.3-686-small uhci_hcd
[ 0.782151] usb usb4: SerialNumber: 0000:00:1d.2
[ 0.783591] hub 4-0:1.0: USB hub found
[ 0.783632] hub 4-0:1.0: 2 ports detected
[ 0.821711] e1000 0000:02:01.0: eth0: (PCI:33MHz:32-bit) 00:0d:60:b0:62:87
[ 0.821764] e1000 0000:02:01.0: eth0: Intel(R) PRO/1000 Network Connection
[ 0.940182] ata2.01: NODEV after polling detection
[ 0.944564] ata1.00: HPA detected: current 110257519, native 117210240
[ 0.944606] ata1.00: ATA-6: HTS726060M9AT00, MH4OA6BA, max UDMA/100
[ 0.944644] ata1.00: 110257519 sectors, multi 16: LBA
[ 0.948608] ata2.00: ATAPI: UJDA755yDVD/CDRW, 1.70, max UDMA/33
[ 0.960432] ata1.00: configured for UDMA/100
[ 0.960649] scsi 0:0:0:0: Direct-Access ATA HTS726060M9AT00 MH4O PQ: 0 ANSI: 5
[ 0.964539] ata2.00: configured for UDMA/33
[ 0.967473] scsi 1:0:0:0: CD-ROM MATSHITA UJDA755yDVD/CDRW 1.70 PQ: 0 ANSI: 5
[ 0.982055] sd 0:0:0:0: [sda] 110257519 512-byte logical blocks: (56.4 GB/52.5 GiB)
[ 0.982172] sd 0:0:0:0: [sda] Write Protect is off
[ 0.982210] sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
[ 0.982239] sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
[ 0.985432] sr0: scsi3-mmc drive: 24x/24x writer cd/rw xa/form2 cdda tray
[ 0.985473] cdrom: Uniform CD-ROM driver Revision: 3.20
[ 0.985928] sr 1:0:0:0: Attached scsi CD-ROM sr0
[ 1.042809] sda: sda1 sda2 sda3 sda4 < sda5 sda6 >
[ 1.043647] sd 0:0:0:0: [sda] Attached SCSI disk
[ 1.132028] usb 1-4: new high-speed USB device number 3 using ehci_hcd
[ 1.265119] usb 1-4: New USB device found, idVendor=152d, idProduct=2329
[ 1.265166] usb 1-4: New USB device strings: Mfr=10, Product=11, SerialNumber=3
[ 1.265214] usb 1-4: Product: Storagebird 35EV821
[ 1.265250] usb 1-4: Manufacturer: 0123456
[ 1.265285] usb 1-4: SerialNumber: 000000000340
[ 1.269688] usbcore: registered new interface driver uas
[ 1.271305] Initializing USB Mass Storage driver...
[ 1.271466] scsi2 : usb-storage 1-4:1.0
[ 1.271699] usbcore: registered new interface driver usb-storage
[ 1.271737] USB Mass Storage support registered.
[ 1.300021] Refined TSC clocksource calibration: 1694.501 MHz.
[ 1.300067] Switching to clocksource tsc
[ 1.504020] usb 3-1: new low-speed USB device number 2 using uhci_hcd
[ 1.643616] Btrfs loaded
[ 1.681094] usb 3-1: New USB device found, idVendor=046d, idProduct=c00e
[ 1.681137] usb 3-1: New USB device strings: Mfr=1, Product=2, SerialNumber=0
[ 1.681176] usb 3-1: Product: USB-PS/2 Optical Mouse
[ 1.681211] usb 3-1: Manufacturer: Logitech
[ 1.702623] input: Logitech USB-PS/2 Optical Mouse as /devices/pci0000:00/0000:00:1d.1/usb3/3-1/3-1:1.0/input/input1
[ 1.702868] generic-usb 0003:046D:C00E.0001: input,hidraw0: USB HID v1.10 Mouse [Logitech USB-PS/2 Optical Mouse] on usb-0000:00:1d.1-1/input0
[ 1.703127] usbcore: registered new interface driver usbhid
[ 1.703164] usbhid: USB HID core driver
[ 1.792123] EXT4-fs (sda5): mounted filesystem with ordered data mode. Opts: (null)
[ 2.505070] scsi 2:0:0:0: Direct-Access WDC WD10 EAVS-00D7B0 PQ: 0 ANSI: 2 CCS
[ 2.506414] sd 2:0:0:0: [sdb] 1953525168 512-byte logical blocks: (1.00 TB/931 GiB)
[ 2.507285] sd 2:0:0:0: [sdb] Write Protect is off
[ 2.507323] sd 2:0:0:0: [sdb] Mode Sense: 34 00 00 00
[ 2.508038] sd 2:0:0:0: [sdb] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
[ 2.590655] sdb: sdb1 sdb2 sdb3 sdb4 < sdb5 sdb6 sdb7 sdb8 >
[ 2.593647] sd 2:0:0:0: [sdb] Attached SCSI disk
[ 3.195019] systemd[1]: RTC configured in localtime, applying delta of 60 minutes to system time.
[ 3.243635] systemd[1]: systemd 37 running in system mode. (+PAM +LIBWRAP +AUDIT +SELINUX +SYSVINIT +LIBCRYPTSETUP; debian)
[ 3.360009] systemd[1]: Set hostname to <tbox>.
[ 5.448483] cfg80211: Calling CRDA to update world regulatory domain
[ 5.824630] ath5k 0000:02:02.0: PCI INT A -> Link[LNKC] -> GSI 11 (level, low) -> IRQ 11
[ 5.824756] ath5k 0000:02:02.0: registered as 'phy0'
[ 6.145733] ath: EEPROM regdomain: 0x61
[ 6.145737] ath: EEPROM indicates we should expect a direct regpair map
[ 6.145743] ath: Country alpha2 being used: 00
[ 6.145745] ath: Regpair used: 0x61
[ 6.174226] ieee80211 phy0: Selected rate control algorithm 'minstrel_ht'
[ 6.175101] Registered led device: ath5k-phy0::rx
[ 6.175135] Registered led device: ath5k-phy0::tx
[ 6.175151] ath5k phy0: Atheros AR5212 chip found (MAC: 0x56, PHY: 0x41)
[ 6.175195] ath5k phy0: RF5111 5GHz radio found (0x17)
[ 6.175231] ath5k phy0: RF2111 2GHz radio found (0x23)
[ 6.385793] udevd[246]: starting version 175
[ 7.739562] systemd-fsck[205]: /dev/sda5: sauber, 163794/640848 Dateien, 2233889/2560351 Bl\xffffffc3\xffffffb6\xffffffb6cke
[ 8.215046] input: Lid Switch as /devices/LNXSYSTM:00/device:00/PNP0C0D:00/input/input2
[ 8.218426] ACPI: Lid Switch [LID]
[ 8.218586] input: Sleep Button as /devices/LNXSYSTM:00/device:00/PNP0C0E:00/input/input3
[ 8.218639] ACPI: Sleep Button [SLPB]
[ 8.218782] input: Power Button as /devices/LNXSYSTM:00/LNXPWRBN:00/input/input4
[ 8.218830] ACPI: Power Button [PWRF]
[ 8.284523] input: Video Bus as /devices/LNXSYSTM:00/device:00/PNP0A03:00/device:02/LNXVIDEO:00/input/input5
[ 8.284586] ACPI: Video Device [VID] (multi-head: yes rom: no post: no)
[ 8.300513] Marking TSC unstable due to TSC halts in idle
[ 8.300572] ACPI: acpi_idle registered with cpuidle
[ 8.302987] Switching to clocksource acpi_pm
[ 8.328387] pci_hotplug: PCI Hot Plug PCI Core version: 0.5
[ 8.338828] input: PC Speaker as /devices/platform/pcspkr/input/input6
[ 8.374101] parport_pc 00:0a: reported by Plug and Play ACPI
[ 8.374186] parport0: PC-style at 0x3bc, irq 7 [PCSPP,TRISTATE]
[ 8.379383] shpchp: Standard Hot Plug PCI Controller Driver version: 0.4
[ 8.517903] Non-volatile memory driver v1.3
[ 8.550576] ACPI: Battery Slot [BAT0] (battery present)
[ 8.570443] NET: Registered protocol family 23
[ 8.669516] nsc-ircc 00:0b: [io 0x02f8-0x02ff]
[ 8.669578] nsc-ircc 00:0b: [irq 3]
[ 8.669584] nsc-ircc 00:0b: [dma 1]
[ 8.670036] nsc-ircc 00:0b: activated
[ 8.670241] nsc-ircc, chip->init
[ 8.670281] nsc-ircc, Found chip at base=0x02e
[ 8.670337] nsc-ircc, driver loaded (Dag Brattli)
[ 8.671274] IrDA: Registered device irda0
[ 8.671310] nsc-ircc, Using dongle: IBM31T1100 or Temic TFDS6000/TFDS6500
[ 8.719950] i801_smbus 0000:00:1f.3: PCI INT B -> Link[LNKB] -> GSI 11 (level, low) -> IRQ 11
[ 8.765019] [drm] Initialized drm 1.1.0 20060810
[ 9.059682] psmouse serio1: synaptics: Touchpad model: 1, fw: 5.9, id: 0x2c6ab1, caps: 0x884793/0x0/0x0
[ 9.059745] psmouse serio1: synaptics: serio: Synaptics pass-through port at isa0060/serio1/input0
[ 9.060755] [drm] radeon kernel modesetting enabled.
[ 9.060936] radeon 0000:01:00.0: power state changed by ACPI to D0
[ 9.060976] radeon 0000:01:00.0: power state changed by ACPI to D0
[ 9.061024] radeon 0000:01:00.0: PCI INT A -> Link[LNKA] -> GSI 11 (level, low) -> IRQ 11
[ 9.062185] [drm] initializing kernel modesetting (RV250 0x1002:0x4C66 0x1014:0x054D).
[ 9.062260] [drm] register mmio base: 0xC0100000
[ 9.062294] [drm] register mmio size: 65536
[ 9.062646] agpgart-intel 0000:00:00.0: AGP 2.0 bridge
[ 9.062695] agpgart-intel 0000:00:00.0: putting AGP V2 device into 4x mode
[ 9.062769] radeon 0000:01:00.0: putting AGP V2 device into 4x mode
[ 9.062832] radeon 0000:01:00.0: GTT: 256M 0xD0000000 - 0xDFFFFFFF
[ 9.062876] radeon 0000:01:00.0: VRAM: 128M 0x00000000E0000000 - 0x00000000E7FFFFFF (64M used)
[ 9.062930] [drm] Supports vblank timestamp caching Rev 1 (10.10.2010).
[ 9.062967] [drm] Driver supports precise vblank timestamp query.
[ 9.063017] [drm] radeon: irq initialized.
[ 9.063276] [drm] Detected VRAM RAM=128M, BAR=128M
[ 9.063345] [drm] RAM width 128bits DDR
[ 9.063533] [TTM] Zone kernel: Available graphics memory: 447436 kiB.
[ 9.063571] [TTM] Zone highmem: Available graphics memory: 516752 kiB.
[ 9.063608] [TTM] Initializing pool allocator.
[ 9.063680] [drm] radeon: 64M of VRAM memory ready
[ 9.063716] [drm] radeon: 256M of GTT memory ready.
[ 9.065032] radeon 0000:01:00.0: WB disabled
[ 9.065866] [drm] Loading R200 Microcode
[ 9.100188] input: SynPS/2 Synaptics TouchPad as /devices/platform/i8042/serio1/input/input7
[ 9.120498] ACPI: AC Adapter [AC] (on-line)
[ 9.465760] yenta_cardbus 0000:02:00.0: CardBus bridge found [1014:0512]
[ 9.465818] yenta_cardbus 0000:02:00.0: Using INTVAL to route CSC interrupts to PCI
[ 9.465865] yenta_cardbus 0000:02:00.0: Routing CardBus interrupts to PCI
[ 9.465904] yenta_cardbus 0000:02:00.0: TI: mfunc 0x01d21022, devctl 0x64
[ 9.521600] mtp-probe[313]: checking bus 3, device 2: "/sys/devices/pci0000:00/0000:00:1d.1/usb3/3-1"
[ 9.522098] mtp-probe[341]: checking bus 1, device 3: "/sys/devices/pci0000:00/0000:00:1d.7/usb1/1-4"
[ 9.600367] mtp-probe[341]: bus: 1, device: 3 was not an MTP device
[ 9.600568] mtp-probe[313]: bus: 3, device: 2 was not an MTP device
[ 9.634205] ata_id[454]: HDIO_GET_IDENTITY failed for '/dev/sdb': Invalid argument
[ 9.696817] yenta_cardbus 0000:02:00.0: ISA IRQ mask 0x0478, PCI irq 11
[ 9.696865] yenta_cardbus 0000:02:00.0: Socket status: 30000006
[ 9.696911] yenta_cardbus 0000:02:00.0: pcmcia: parent PCI bridge window: [io 0x4000-0x8fff]
[ 9.696960] yenta_cardbus 0000:02:00.0: pcmcia: parent PCI bridge window: [mem 0xc0200000-0xcfffffff]
[ 9.697009] pcmcia_socket pcmcia_socket0: cs: memory probe 0xc0200000-0xcfffffff: excluding 0xc0200000-0xc09fffff 0xc3a00000-0xd01fffff
[ 9.697168] yenta_cardbus 0000:02:00.0: pcmcia: parent PCI bridge window: [mem 0xe8000000-0xefffffff pref]
[ 9.697217] pcmcia_socket pcmcia_socket0: cs: memory probe 0xe8000000-0xefffffff: excluding 0xe8000000-0xefffffff
[ 9.700251] yenta_cardbus 0000:02:00.1: CardBus bridge found [1014:0512]
[ 9.700310] yenta_cardbus 0000:02:00.1: Using INTVAL to route CSC interrupts to PCI
[ 9.700357] yenta_cardbus 0000:02:00.1: Routing CardBus interrupts to PCI
[ 9.700397] yenta_cardbus 0000:02:00.1: TI: mfunc 0x01d21022, devctl 0x64
[ 9.876991] thinkpad_acpi: ThinkPad ACPI Extras v0.24
[ 9.877035] thinkpad_acpi: http://ibm-acpi.sf.net/
[ 9.877074] thinkpad_acpi: ThinkPad BIOS 1RETDRWW (3.23 ), EC 1RHT71WW-3.04
[ 9.877113] thinkpad_acpi: IBM ThinkPad T40p, model 2374SG6
[ 9.879340] thinkpad_acpi: detected a 8-level brightness capable ThinkPad
[ 9.894509] thinkpad_acpi: rfkill switch tpacpi_bluetooth_sw: radio is blocked
[ 9.895826] Registered led device: tpacpi::thinklight
[ 9.896246] Registered led device: tpacpi::power
[ 9.896613] Registered led device: tpacpi::standby
[ 9.903808] thinkpad_acpi: Console audio control enabled, mode: monitor (read only)
[ 9.909180] input: ThinkPad Extra Buttons as /devices/platform/thinkpad_acpi/input/input8
[ 9.932569] yenta_cardbus 0000:02:00.1: ISA IRQ mask 0x0478, PCI irq 11
[ 9.932617] yenta_cardbus 0000:02:00.1: Socket status: 30000006
[ 9.932666] yenta_cardbus 0000:02:00.1: pcmcia: parent PCI bridge window: [io 0x4000-0x8fff]
[ 9.932718] yenta_cardbus 0000:02:00.1: pcmcia: parent PCI bridge window: [mem 0xc0200000-0xcfffffff]
[ 9.932769] pcmcia_socket pcmcia_socket1: cs: memory probe 0xc0200000-0xcfffffff: excluding 0xc0200000-0xc09fffff 0xc3a00000-0xd01fffff
[ 9.933016] yenta_cardbus 0000:02:00.1: pcmcia: parent PCI bridge window: [mem 0xe8000000-0xefffffff pref]
[ 9.933067] pcmcia_socket pcmcia_socket1: cs: memory probe 0xe8000000-0xefffffff: excluding 0xe8000000-0xefffffff
[ 9.973619] [drm] radeon: ring at 0x00000000D0001000
[ 9.973682] [drm] ring test succeeded in 1 usecs
[ 9.974098] [drm] radeon: ib pool ready.
[ 9.974276] [drm] ib test succeeded in 0 usecs
[ 9.976846] [drm] Panel ID String: SXGA+ Single (85MHz)
[ 9.976889] [drm] Panel Size 1400x1050
[ 9.988392] [drm] radeon legacy LVDS backlight initialized
[ 9.988825] [drm] No TV DAC info found in BIOS
[ 9.988926] [drm] Radeon Display Connectors
[ 9.988961] [drm] Connector 0:
[ 9.988995] [drm] VGA
[ 9.989029] [drm] DDC: 0x60 0x60 0x60 0x60 0x60 0x60 0x60 0x60
[ 9.989066] [drm] Encoders:
[ 9.989100] [drm] CRT1: INTERNAL_DAC1
[ 9.989134] [drm] Connector 1:
[ 9.989167] [drm] DVI-D
[ 9.989199] [drm] HPD1
[ 9.989232] [drm] DDC: 0x64 0x64 0x64 0x64 0x64 0x64 0x64 0x64
[ 9.989269] [drm] Encoders:
[ 9.989302] [drm] DFP1: INTERNAL_TMDS1
[ 9.989337] [drm] Connector 2:
[ 9.989370] [drm] LVDS
[ 9.989402] [drm] Encoders:
[ 9.989435] [drm] LCD1: INTERNAL_LVDS
[ 9.989469] [drm] Connector 3:
[ 9.989501] [drm] S-video
[ 9.989534] [drm] Encoders:
[ 9.989567] [drm] TV1: INTERNAL_DAC2
[ 9.989625] [drm] radeon: power management initialized
[ 10.055879] [drm] fb mappable at 0xE0040000
[ 10.055922] [drm] vram apper at 0xE0000000
[ 10.055957] [drm] size 5914624
[ 10.055991] [drm] fb depth is 24
[ 10.056049] [drm] pitch is 5632
[ 10.056286] fbcon: radeondrmfb (fb0) is primary device
[ 10.126020] Console: switching to colour frame buffer device 175x65
[ 10.170694] fb0: radeondrmfb frame buffer device
[ 10.170862] drm: registered panic notifier
[ 10.173297] cfg80211: World regulatory domain updated:
[ 10.173493] cfg80211: (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp)
[ 10.173786] cfg80211: (2402000 KHz - 2472000 KHz @ 40000 KHz), (300 mBi, 2000 mBm)
[ 10.174068] cfg80211: (2457000 KHz - 2482000 KHz @ 20000 KHz), (300 mBi, 2000 mBm)
[ 10.174367] cfg80211: (2474000 KHz - 2494000 KHz @ 20000 KHz), (300 mBi, 2000 mBm)
[ 10.174647] cfg80211: (5170000 KHz - 5250000 KHz @ 40000 KHz), (300 mBi, 2000 mBm)
[ 10.174927] cfg80211: (5735000 KHz - 5835000 KHz @ 40000 KHz), (300 mBi, 2000 mBm)
[ 10.180156] [drm] Initialized radeon 2.12.0 20080528 for 0000:01:00.0 on minor 0
[ 10.188501] pcmcia_socket pcmcia_socket0: cs: memory probe 0x0c0000-0x0fffff:
[ 10.188965] pcmcia_socket pcmcia_socket1: cs: memory probe 0x0c0000-0x0fffff: excluding 0xc0000-0xd3fff 0xdc000-0xfffff
[ 10.189464] pcmcia_socket pcmcia_socket0: cs: memory probe 0xa0000000-0xa0ffffff: excluding 0xc0000-0xd3fff 0xdc000-0xfffff
[ 10.190038] pcmcia_socket pcmcia_socket1: cs: memory probe 0xa0000000-0xa0ffffff: clean.
[ 10.190443] clean.
[ 10.190569] pcmcia_socket pcmcia_socket0: cs: memory probe 0x60000000-0x60ffffff:
[ 10.190880] pcmcia_socket pcmcia_socket1: cs: memory probe 0x60000000-0x60ffffff: clean.
[ 10.191344] clean.
[ 10.440929] snd_intel8x0 0000:00:1f.5: PCI INT B -> Link[LNKB] -> GSI 11 (level, low) -> IRQ 11
[ 10.441287] snd_intel8x0 0000:00:1f.5: setting latency timer to 64
[ 11.046631] EXT4-fs (sda5): re-mounted. Opts: (null)
[ 11.367443] intel8x0_measure_ac97_clock: measured 58691 usecs (2827 samples)
[ 11.367711] intel8x0: clocking to 48000
[ 11.369882] snd_intel8x0m 0000:00:1f.6: PCI INT B -> Link[LNKB] -> GSI 11 (level, low) -> IRQ 11
[ 11.370228] snd_intel8x0m 0000:00:1f.6: setting latency timer to 64
[ 11.510333] systemd-fsck[609]: /dev/sda3: sauber, 151414/640848 Dateien, 1787664/2560359 Bl\xffffffc3\xffffffb6\xffffffb6cke
[ 11.567279] Adding 1052244k swap on /dev/sda2. Priority:0 extents:1 across:1052244k
[ 11.733413] EXT4-fs (sda3): mounted filesystem with ordered data mode. Opts: (null)
[ 13.180772] ADDRCONF(NETDEV_UP): wlan0: link is not ready
[ 14.442371] ifup[821]: /sbin/ifup: interface wlan0 already configured
[ 14.902765] anacron[893]: Anacron 2.3 started on 2011-11-27
[ 15.021038] IBM TrackPoint firmware: 0x0e, buttons: 3/3
[ 15.027034] anacron[893]: Will run job `cron.daily' in 5 min.
[ 15.027066] anacron[893]: Jobs will be executed sequentially
[ 15.289059] input: TPPS/2 IBM TrackPoint as /devices/platform/i8042/serio1/serio2/input/input9
[ 15.364870] /usr/sbin/gpm[967]: *** info [daemon/startup.c(131)]:
[ 15.405267] /usr/sbin/gpm[967]: Started gpm successfully. Entered daemon mode.
[ 15.603718] /usr/sbin/cron[965]: (CRON) INFO (pidfile fd = 3)
[ 15.632661] /usr/sbin/cron[980]: (CRON) STARTUP (fork ok)
[ 15.715087] /usr/sbin/cron[980]: (CRON) INFO (Running @reboot jobs)
[ 16.032763] lp0: using parport0 (interrupt-driven).
[ 16.072742] ppdev: user-space parallel port driver
[ 18.328164] sshd[1042]: Server listening on 0.0.0.0 port 22.
[ 18.356230] sshd[1042]: Server listening on :: port 22.
[ 18.504204] systemd-logind[922]: New seat seat0.
[ 21.149093] ADDRCONF(NETDEV_UP): eth0: link is not ready
[ 34.396369] wlan0: authenticate with 00:04:0e:e4:00:3d (try 1)
[ 34.397944] wlan0: authenticated
[ 34.408399] wlan0: associate with 00:04:0e:e4:00:3d (try 1)
[ 34.412596] wlan0: RX AssocResp from 00:04:0e:e4:00:3d (capab=0x411 status=0 aid=1)
[ 34.412602] wlan0: associated
[ 34.413433] ADDRCONF(NETDEV_CHANGE): wlan0: link becomes ready
[ 56.555972] EXT4-fs (sda5): re-mounted. Opts: commit=0
[ 56.969026] EXT4-fs (sda3): re-mounted. Opts: commit=0
^ permalink raw reply
* Re: (repost) vhost tree for linux-next
From: Michael S. Tsirkin @ 2011-11-27 13:59 UTC (permalink / raw)
To: James Bottomley; +Cc: linux-next, sfr, linux-pci, netdev, linux-scsi
In-Reply-To: <1322401139.2992.1.camel@dabdike.int.hansenpartnership.com>
On Sun, Nov 27, 2011 at 07:38:59AM -0600, James Bottomley wrote:
> On Sun, 2011-11-27 at 14:48 +0200, Michael S. Tsirkin wrote:
> > I normally merge things through Dave, Rusty, Jesse or Jens,
> > not directly to Linus. However, sometimes there's a large change
> > (for example, my recent RFC for pci_iomap changes)
> > where estimating how it interacts with other platforms and planned
> > changes in the next kernel would be beneficial.
> >
> > For this purpose, it would be helpful if my tree were added to linux-next.
> > The tree is:
> > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git linux-next
> >
> > Could you do this please?
> > (The current contents of that tree was posted for review/feedback
> > for the first time today. It might make sense to give it a few days
> > for any responses ...)
>
> I'm a little confused by your to: field. This is a linux-arch issue,
> isn't it, since it's altering architecture implementations of a PCI
> function rather than altering anything in SCSI or net?
>
> James
Yes. Stephen Rothwell asked me to Cc widely to see if anyone
objects to picking this stuff in linux-next.
Sorry about any confusion.
--
MST
^ permalink raw reply
* Re: (repost) vhost tree for linux-next
From: James Bottomley @ 2011-11-27 14:00 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: linux-next, sfr, linux-pci, netdev, linux-scsi
In-Reply-To: <20111127135916.GB23302@redhat.com>
On Sun, 2011-11-27 at 15:59 +0200, Michael S. Tsirkin wrote:
> On Sun, Nov 27, 2011 at 07:38:59AM -0600, James Bottomley wrote:
> > On Sun, 2011-11-27 at 14:48 +0200, Michael S. Tsirkin wrote:
> > > I normally merge things through Dave, Rusty, Jesse or Jens,
> > > not directly to Linus. However, sometimes there's a large change
> > > (for example, my recent RFC for pci_iomap changes)
> > > where estimating how it interacts with other platforms and planned
> > > changes in the next kernel would be beneficial.
> > >
> > > For this purpose, it would be helpful if my tree were added to linux-next.
> > > The tree is:
> > > git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git linux-next
> > >
> > > Could you do this please?
> > > (The current contents of that tree was posted for review/feedback
> > > for the first time today. It might make sense to give it a few days
> > > for any responses ...)
> >
> > I'm a little confused by your to: field. This is a linux-arch issue,
> > isn't it, since it's altering architecture implementations of a PCI
> > function rather than altering anything in SCSI or net?
> >
> > James
>
> Yes. Stephen Rothwell asked me to Cc widely to see if anyone
> objects to picking this stuff in linux-next.
> Sorry about any confusion.
I;m fine with that, but the fact that you didn't send it to linux-arch
was more my point ...
James
^ permalink raw reply
* Re: linux-next: build failure after merge of the cgroup tree
From: Tejun Heo @ 2011-11-27 19:33 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Rafael J. Wysocki
In-Reply-To: <20111125145022.d5578c15eb900e2628a072b2@canb.auug.org.au>
Hello,
On Fri, Nov 25, 2011 at 02:50:22PM +1100, Stephen Rothwell wrote:
> I don't know how to fix this up (the obvious fix will cause us to have
> nested rcu_read_lock()s and I have no idea if that is allowed). Can you
> please provide me with a merge resolution? I am also wondering why such
> closely related work is happening in 2 different trees.
Sorry about all the conflicts. There have been major updates to both
freezer and cgroup and cgroup_freezer happens to receive changes from
both subsystem changes. I dropped cgroup changes for now as Linus
doesn't seem to be too happy with the current approach. Once an
agreeable approach is found, I'll pull in pm-freezer branch into
cgroup and then put cgroup changes on top of them. That should remove
most of merging headaches.
Thanks.
--
tejun
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell @ 2011-11-27 23:56 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-next, linux-kernel, Tony Lindgren, Russell King,
Tomi Valkeinen
[-- Attachment #1: Type: text/plain, Size: 3977 bytes --]
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-omap/include/plat/common.h between commit 4e65331c6bb4
("ARM: 7159/1: OMAP: Introduce local common.h files") from the tree and
commit 13662dc5b177 ("ARM: OMAP: HWMOD: Unify DSS resets for OMAPs") from
the arm-soc tree.
I did the obvious fixup (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/plat-omap/include/plat/common.h
index 346098f,3ff3e36..0000000
--- a/arch/arm/plat-omap/include/plat/common.h
+++ b/arch/arm/plat-omap/include/plat/common.h
@@@ -27,12 -27,97 +27,16 @@@
#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H
#define __ARCH_ARM_MACH_OMAP_COMMON_H
-#include <linux/delay.h>
-
#include <plat/i2c.h>
+ #include <plat/omap_hwmod.h>
-struct sys_timer;
-
-extern void omap_map_common_io(void);
-extern struct sys_timer omap1_timer;
-extern struct sys_timer omap2_timer;
-extern struct sys_timer omap3_timer;
-extern struct sys_timer omap3_secure_timer;
-extern struct sys_timer omap4_timer;
-extern bool omap_32k_timer_init(void);
extern int __init omap_init_clocksource_32k(void);
extern unsigned long long notrace omap_32k_sched_clock(void);
extern void omap_reserve(void);
+
-void omap2420_init_early(void);
-void omap2430_init_early(void);
-void omap3430_init_early(void);
-void omap35xx_init_early(void);
-void omap3630_init_early(void);
-void omap3_init_early(void); /* Do not use this one */
-void am35xx_init_early(void);
-void ti816x_init_early(void);
-void omap4430_init_early(void);
-
+ extern int omap_dss_reset(struct omap_hwmod *);
+
void omap_sram_init(void);
-/*
- * IO bases for various OMAP processors
- * Except the tap base, rest all the io bases
- * listed are physical addresses.
- */
-struct omap_globals {
- u32 class; /* OMAP class to detect */
- void __iomem *tap; /* Control module ID code */
- void __iomem *sdrc; /* SDRAM Controller */
- void __iomem *sms; /* SDRAM Memory Scheduler */
- void __iomem *ctrl; /* System Control Module */
- void __iomem *ctrl_pad; /* PAD Control Module */
- void __iomem *prm; /* Power and Reset Management */
- void __iomem *cm; /* Clock Management */
- void __iomem *cm2;
-};
-
-void omap2_set_globals_242x(void);
-void omap2_set_globals_243x(void);
-void omap2_set_globals_3xxx(void);
-void omap2_set_globals_443x(void);
-void omap2_set_globals_ti816x(void);
-
-/* These get called from omap2_set_globals_xxxx(), do not call these */
-void omap2_set_globals_tap(struct omap_globals *);
-void omap2_set_globals_sdrc(struct omap_globals *);
-void omap2_set_globals_control(struct omap_globals *);
-void omap2_set_globals_prcm(struct omap_globals *);
-
-void omap242x_map_io(void);
-void omap243x_map_io(void);
-void omap3_map_io(void);
-void omap4_map_io(void);
-
-
-/**
- * omap_test_timeout - busy-loop, testing a condition
- * @cond: condition to test until it evaluates to true
- * @timeout: maximum number of microseconds in the timeout
- * @index: loop index (integer)
- *
- * Loop waiting for @cond to become true or until at least @timeout
- * microseconds have passed. To use, define some integer @index in the
- * calling code. After running, if @index == @timeout, then the loop has
- * timed out.
- */
-#define omap_test_timeout(cond, timeout, index) \
-({ \
- for (index = 0; index < timeout; index++) { \
- if (cond) \
- break; \
- udelay(1); \
- } \
-})
-
-extern struct device *omap2_get_mpuss_device(void);
-extern struct device *omap2_get_iva_device(void);
-extern struct device *omap2_get_l3_device(void);
-extern struct device *omap4_get_dsp_device(void);
-
#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build warning after merge of the drm tree
From: Stephen Rothwell @ 2011-11-28 2:36 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Alan Cox, Jesse Barnes
[-- Attachment #1: Type: text/plain, Size: 948 bytes --]
Hi Dave,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:
drivers/gpu/drm/gma500/framebuffer.c: In function 'psb_framebuffer_init':
drivers/gpu/drm/gma500/framebuffer.c:264:2: warning: passing argument 2 of 'drm_helper_mode_fill_fb_struct' from incompatible pointer type [enabled by default]
include/drm/drm_crtc_helper.h:121:12: note: expected 'struct drm_mode_fb_cmd2 *' but argument is of type 'struct drm_mode_fb_cmd *'
Caused by commit 4d8d096e9ae8 ("gma500: introduce the framebuffer support
code") interacting with commit 308e5bcbdb10 ("drm: add an fb creation
ioctl that takes a pixel format v5"). The version in staging was fixed
up, but not this version (which should been done during commit
b63e0f9cb433 ("Merge branch 'drm-gma500-alanc' into drm-core-next")).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build warning after merge of the drm tree
From: Stephen Rothwell @ 2011-11-28 2:41 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 831 bytes --]
Hi Dave,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:
drivers/gpu/drm/gma500/framebuffer.c: At top level:
drivers/gpu/drm/gma500/framebuffer.c:669:2: warning: initialization from incompatible pointer type [enabled by default]
drivers/gpu/drm/gma500/framebuffer.c:669:2: warning: (near initialization for 'psb_mode_funcs.fb_create') [enabled by default]
Caused by commit 4d8d096e9ae8 ("gma500: introduce the framebuffer support
code") interacting with commit 308e5bcbdb10 ("drm: add an fb creation
ioctl that takes a pixel format v5"). Again this should have been fixed
up in commit b63e0f9cb433 ("Merge branch 'drm-gma500-alanc' into
drm-core-next").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the drm tree
From: Stephen Rothwell @ 2011-11-28 2:49 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Arjan van de Ven, Alan Cox
[-- Attachment #1: Type: text/plain, Size: 4197 bytes --]
Hi Dave,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/gpu/drm/gma500/psb_drv.c: At top level:
drivers/gpu/drm/gma500/psb_drv.c:1162:2: warning: braces around scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1162:2: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1163:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1163:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1163:4: warning: initialization from incompatible pointer type [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1163:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1164:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1164:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1164:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1164:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1165:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1165:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1165:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1165:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1166:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1166:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1166:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1166:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1167:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1167:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1167:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1167:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1168:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1168:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1168:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1168:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1169:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1169:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1169:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1169:4: warning: (near initialization for 'driver.fops') [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1170:4: error: field name not in record or union initializer
drivers/gpu/drm/gma500/psb_drv.c:1170:4: error: (near initialization for 'driver.fops')
drivers/gpu/drm/gma500/psb_drv.c:1170:4: warning: excess elements in scalar initializer [enabled by default]
drivers/gpu/drm/gma500/psb_drv.c:1170:4: warning: (near initialization for 'driver.fops') [enabled by default]
Caused by commit 5c49fd3aa0ab ("gma500: Add the core DRM files and
headers") interacting with commit e08e96de986c ("drm: Make the per-driver
file_operations struct const"). Again needed fixing up in commit
b63e0f9cb433 ("Merge branch 'drm-gma500-alanc' into drm-core-next"). Or
Alan should do his work based on the drm-next tree (which would then have
to become non rebasing) ...
I have used the version of the drm tree from next-20111115 again.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm tree
From: Stephen Rothwell @ 2011-11-28 2:52 UTC (permalink / raw)
To: Alan Cox
Cc: Dave Airlie, linux-next, linux-kernel, Jesse Barnes,
Ville Syrjälä, Rob Clark, Greg KH
In-Reply-To: <20111125103011.18e167cd@lxorguk.ukuu.org.uk>
[-- Attachment #1: Type: text/plain, Size: 915 bytes --]
Hi Alan,
On Fri, 25 Nov 2011 10:30:11 +0000 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> > Ping?
>
> As I said last time you asked this - the correct merge resolution is to
> pull the DRM updates and mark the staging GMA500 Kconfig "&& BROKEN". The
> staging driver is frozen while we merge outside of staging and will not
> be getting any attention at this point - changes there just mess up the
> move work which is far more important.
>
> Also nothing in staging should be allowed to hold up real work. The
> resolution for anything in staging blocking merges is to mark the staging
> parts && BROKEN IMHO
Then if you are moving a driver out of staging, you should put a patch in
your tree to disable it in staging (or remove it in staging) and send
that patch to Greg as well.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm tree
From: Stephen Rothwell @ 2011-11-28 2:53 UTC (permalink / raw)
To: Dave Airlie; +Cc: Alan Cox, Dave Airlie, linux-next, linux-kernel, Jesse Barnes
In-Reply-To: <CAPM=9twsvX=hFS9S01-ht8JHhAAy4uP8N5NxPUDY9UpbsvQWmw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
Hi Dave,
On Fri, 25 Nov 2011 10:34:19 +0000 Dave Airlie <airlied@gmail.com> wrote:
>
> I just pushed jbarnes patch into my tree for now, at pushed out the
> mainline gma500 code with it.
And it is a mess (see my linux-next reports).
> But if someone can send a patch to Greg to mark GMA500 broken in
> staging that would be good.
See my reply to Alan.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the staging tree with Linus' tree
From: Stephen Rothwell @ 2011-11-28 4:18 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Andy Whitcroft
[-- Attachment #1: Type: text/plain, Size: 521 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/iio/industrialio-core.c between commit aaa0b4f00729
("iio: iio_event_getfd -- fix ev_int build failure") from Linus' tree and
commit f791cec85073 ("Subject: fix build breakage in
drivers/staging/iio/industrialio-core.c") from the staging tree.
The former was a more extensive fix (and is upstream), so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the staging tree with the driver-core tree
From: Stephen Rothwell @ 2011-11-28 4:22 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Lars-Peter Clausen
[-- Attachment #1: Type: text/plain, Size: 983 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/iio/adc/ad799x_core.c between commit 6e5af184f810
("staging:iio: Use module_i2c_driver to register I2C drivers") from the
tree and commit 55e4390cb04e ("staging:iio: Add missing
MODULE_DEVICE_TABLE and MODULE_ALIAS") from the staging tree.
Just context differences. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/iio/adc/ad799x_core.c
index c0d2f88,5bedb19..0000000
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@@ -934,4 -944,6 +935,3 @@@ module_i2c_driver(ad799x_driver)
MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
MODULE_DESCRIPTION("Analog Devices AD799x ADC");
MODULE_LICENSE("GPL v2");
- MODULE_ALIAS("i2c:ad799x");
-
-module_init(ad799x_init);
-module_exit(ad799x_exit);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm tree
From: Greg KH @ 2011-11-28 5:07 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Alan Cox, Dave Airlie, linux-next, linux-kernel, Jesse Barnes,
Ville Syrjälä, Rob Clark
In-Reply-To: <20111128135204.33bb929d7495d7830d09dfc3@canb.auug.org.au>
On Mon, Nov 28, 2011 at 01:52:04PM +1100, Stephen Rothwell wrote:
> Hi Alan,
>
> On Fri, 25 Nov 2011 10:30:11 +0000 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> >
> > > Ping?
> >
> > As I said last time you asked this - the correct merge resolution is to
> > pull the DRM updates and mark the staging GMA500 Kconfig "&& BROKEN". The
> > staging driver is frozen while we merge outside of staging and will not
> > be getting any attention at this point - changes there just mess up the
> > move work which is far more important.
> >
> > Also nothing in staging should be allowed to hold up real work. The
> > resolution for anything in staging blocking merges is to mark the staging
> > parts && BROKEN IMHO
>
> Then if you are moving a driver out of staging, you should put a patch in
> your tree to disable it in staging (or remove it in staging) and send
> that patch to Greg as well.
That patch is already in my staging-next tree, so all should be good
now.
Even then, I don't think that broken staging drivers should stop any
other tree from being included, except for the staging tree itself.
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with Linus' tree
From: Greg KH @ 2011-11-28 5:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Andy Whitcroft
In-Reply-To: <20111128151857.d4ce49d38ed4983f8ba4d68e@canb.auug.org.au>
On Mon, Nov 28, 2011 at 03:18:57PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/iio/industrialio-core.c between commit aaa0b4f00729
> ("iio: iio_event_getfd -- fix ev_int build failure") from Linus' tree and
> commit f791cec85073 ("Subject: fix build breakage in
> drivers/staging/iio/industrialio-core.c") from the staging tree.
>
> The former was a more extensive fix (and is upstream), so I used that.
Yes, that's fine, I'll handle the merge when 3.2-rc4 is out, thanks.
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the driver-core tree
From: Greg KH @ 2011-11-28 5:13 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Lars-Peter Clausen
In-Reply-To: <20111128152222.e6aeb95e31d45f44d8adf615@canb.auug.org.au>
On Mon, Nov 28, 2011 at 03:22:22PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/iio/adc/ad799x_core.c between commit 6e5af184f810
> ("staging:iio: Use module_i2c_driver to register I2C drivers") from the
> tree and commit 55e4390cb04e ("staging:iio: Add missing
> MODULE_DEVICE_TABLE and MODULE_ALIAS") from the staging tree.
>
> Just context differences. I fixed it up (see below) and can carry the
> fix as necessary.
Looks great, thanks.
greg k-h
^ permalink raw reply
* linux-next: Tree for Nov 28
From: Stephen Rothwell @ 2011-11-28 5:25 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 31087 bytes --]
Hi all,
Changes since 20111125:
My fixes tree is empty again.
The arm-soc tree gained a conflict against the arm tree.
The drm tree lost its build failure but gained another so I used the
version from next-20111115.
The net-next tree lost its conflict.
The cgroup tree lost its build failure.
The tty-next tree lost a conflict.
The staging tree gained conflicts against Linus' and the driver-core trees.
----------------------------------------------------------------------------
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/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 199 trees (counting Linus' and 27 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 (401d006 Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6)
Merging fixes/master (aaa0b4f iio: iio_event_getfd -- fix ev_int build failure)
Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.)
Merging arm-current/fixes (fe41db7 ARM: 7177/1: GIC: avoid skipping non-existent PPIs in irq_start calculation)
Merging m68k-current/for-linus (2690e21 m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging powerpc-merge/merge (49e4406 powerpc/44x: Add mtd ndfc to the ppx44x defconfig)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (0b64120 sparc64: Patch sun4v code sequences properly on module load.)
Merging scsi-rc-fixes/master (e5a44df [SCSI] hpsa: Disable ASPM)
Merging net/master (de68dca inet: add a redirect generation id in inetpeer)
Merging sound-current/for-linus (f339240 Merge branch 'fix/hda' into for-linus)
Merging pci-current/for-linus (4cac2eb PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs)
Merging wireless/master (82e5fc2 Revert "rt2800pci: handle spurious interrupts")
Merging driver-core.current/driver-core-linus (caca6a0 Linux 3.2-rc3)
Merging tty.current/tty-linus (caca6a0 Linux 3.2-rc3)
Merging usb.current/usb-linus (8746c83 USB: whci-hcd: fix endian conversion in qset_clear())
Merging staging.current/staging-linus (dfd8ee9 Staging: comedi: fix integer overflow in do_insnlist_ioctl())
Merging char-misc.current/char-misc-linus (caca6a0 Linux 3.2-rc3)
Merging cpufreq-current/fixes (eb0b38a [CPUFREQ] db8500: fix build error due to undeclared i variable)
Merging input-current/for-linus (77f6ca5 Input: ams_delta_serio - include linux/module.h)
Merging md-current/for-linus (257a4b4 md/raid5: STRIPE_ACTIVE has lock semantics, add barriers)
Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
Merging crypto-current/master (2742528 crypto: mv_cesa - fix hashing of chunks > 1920 bytes)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c)
Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
Merging devicetree-current/devicetree/merge (50e07f8 dt: add empty of_machine_is_compatible)
Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging arm/for-next (7c4fba6 Merge branch 'devel' into for-next)
Merging arm-lpae/for-next (b0d153e ARM: LPAE: Add the Kconfig entries)
CONFLICT (content): Merge conflict in arch/arm/mm/ioremap.c
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
Merging arm-soc/for-next (1a269a3 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/Kconfig
CONFLICT (content): Merge conflict in arch/arm/tools/mach-types
CONFLICT (content): Merge conflict in arch/arm/plat-omap/include/plat/common.h
Merging arm-perf/for-next/perf (f2288ad Merge branches 'perf/fixes', 'perf/event-nos', 'perf/omap4' and 'perf/updates' into for-next/perf)
Merging at91/at91-next (7d28809 usb: at91: fix clk_get error handling)
CONFLICT (add/add): Merge conflict in include/linux/platform_data/macb.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/setup.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/generic.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-snapper9260.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-cpuat91.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-cpu9krea.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-cap9adk.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9_alt_reset.S
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master)
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
CONFLICT (modify/delete): arch/arm/mach-mx5/pm-imx5.c deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/pm-imx5.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-mx5/Makefile deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Makefile left in tree.
CONFLICT (modify/delete): arch/arm/mach-mx5/Kconfig deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Kconfig left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx5.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/devices-imx53.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/clock-mx51-mx53.c
$ git rm -f arch/arm/mach-mx5/pm-imx5.c arch/arm/mach-mx5/Makefile arch/arm/mach-mx5/Kconfig
Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
Merging omap/for-next (322a8b0 Linux 3.1-rc1)
Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (a188e1e Merge branch 'next-samsung-devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/include/mach/entry-macro.S
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpu.c
Merging tegra/for-next (b48c54e Merge branch 'for-3.3/boards' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (9059054 blackfin: Fixup export.h includes)
Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
Merging ia64/next (2174f6d pstore: gracefully handle NULL pstore_info functions)
Merging m68k/for-next (9e9ceea m68k: Don't comment out syscalls used by glibc)
Merging m68knommu/for-next (285aa94 m68knommu: fix broken ColdFire slice timer read_clk() code)
CONFLICT (content): Merge conflict in arch/m68k/Kconfig.debug
Merging microblaze/next (7f80850 Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh)
Merging mips/mips-for-linux-next (3ea6cc0 Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next)
Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
Merging powerpc/next (5636879 Merge remote-tracking branch 'kumar/next' into next)
Merging 4xx/next (9fcd768 powerpc/40x: Remove obsolete HCU4 board)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (8e18862 drivers/serial/ucc_uart.c: Add missing call to init UCC UART port timeout)
Merging s390/features (100683e [S390] topology: cleanup z10 topology handling)
Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net)
Merging tile/master (1583171 Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile)
Merging unicore32/unicore32 (ed96dfb unicore32, exec: remove redundant set_fs(USER_DS))
Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
Merging cifs/master (9c32c63 cifs: Fix sparse warning when calling cifs_strtoUCS)
Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy)
Merging ecryptfs/next (aaef29d eCryptfs: Flush file in vma close)
Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
Merging ext4/dev (6e58ad6 ext4: fix up a undefined error in ext4_free_blocks in debugging code)
Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
Merging fuse/for-next (cfcfc9e Linux 3.2-rc2)
Merging gfs2/master (018a01c GFS2: We only need one ACL getting function)
Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
Merging logfs/master (011a85a logfs: Prevent memory corruption)
CONFLICT (content): Merge conflict in fs/logfs/file.c
Merging nfs/linux-next (24ca9a8 SUNRPC: Ensure we return EAGAIN in xs_nospace if congestion is cleared)
Merging nfsd/nfsd-next (353de31 nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error)
Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
Merging ocfs2/linux-next (249ec93 ocfs2: Use filemap_write_and_wait() instead of write_inode_now())
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K)
Merging v9fs/for-next (f8f5ed7 Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging ubifs/linux-next (eaecf43 UBIFS: Use kmemdup rather than duplicating its implementation)
Merging xfs/master (c889132 MAINTAINERS: update XFS maintainer entry)
Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check)
Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
Merging pci/linux-next (cfbf1bd PCI: msi: Disable msi interrupts when we initialize a pci device)
Merging hid/for-next (14359df Merge branch 'multitouch' into for-next)
Merging quilt/i2c (caca6a0 Linux 3.2-rc3)
Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge)
CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging quilt/jdelvare-hwmon (dda4fa1 hwmon: (lm63) Add support for LM96163)
Merging hwmon-staging/hwmon-next (14bab44 hwmon: (pmbus/zl6100) Only instantiate external temperature sensor if enabled)
Merging quilt/kernel-doc (c3b92c8 Linux 3.1)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (ed3825f Merge branch 'poll-pwc2' of /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in drivers/staging/media/as102/as102_drv.h
Merging kbuild/for-next (ddb550d Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (3fab0c1 ahci: start engine only during soft/hard resets)
Merging infiniband/for-next (042f36e IB/qib: Don't use schedule_work())
Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next)
Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization)
Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2)
Merging dlm/next (9beb3bf dlm: convert rsb list to rb_tree)
Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev)
Merging target-updates/for-next (5bda90c target: use ->exectute_task for all CDB emulation)
Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
Merging slave-dma/next (e696643 IMX/DMA : set the DMA direction in the sdma_control())
CONFLICT (content): Merge conflict in drivers/dma/pl330.c
Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
Merging net-next/master (c140d76 net/mlx4_en: bug fix for the case of vlan id 0 and UP 0)
Merging wireless-next/master (eb1852b rtlwifi: squash warning in _usb_read_sync)
Merging bluetooth/master (c6feeb2 Bluetooth: Use queue in the device list)
Merging mtd/master (e0d6511 Merge git://git.infradead.org/mtd-2.6)
Merging l2-mtd/master (b00fe13 mtd/docg3: add protection areas sysfs access)
Merging crypto/master (8b4d43a crypto: caam - add support for MD5 algorithm variants)
Merging sound/for-next (168ec0b Merge branch 'topic/misc' into for-next)
Merging sound-asoc/for-next (be086aa ASoC: Convert WM8962 to devm_kzalloc())
Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
Merging quilt/rr (78173d1 lguest: switch segment-voodoo-numbers to readable symbols)
Merging input/next (3d95fd6 Input: elantech - add resolution query support for v4 hardware)
CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c
Merging input-mt/next (02f8c6a Linux 3.0)
Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
Merging block/for-next (5dc34f4 Merge branch 'for-3.3/mtip32xx' into for-next)
Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
Merging battery/master (00a159a max8925_power: Check at probe time if power to set online)
Merging mmc/mmc-next (ce8fda6 mmc: core: Fix typo at mmc_card_sleep)
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
Merging slab/for-next (7436099 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (c7eefaf md/raid1: Mark device replaceable when we see a write error.)
Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates)
Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
Merging drm/drm-next (15b273b drm/staging/gma500: fix linux-next build)
$ git reset --hard HEAD^
Merging refs/next/20111115/drm
Merging fbdev/fbdev-next (64cebcb Merge branch 'fbdev-for-linus' into fbdev-next)
Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include <linux/module.h>)
Merging regulator/for-next (ae523fc Merge remote-tracking branch 'regulator/topic/dt' into regulator-next)
Merging security/next (de35353 digsig: build dependency fix)
Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (caca6a0 Linux 3.2-rc3)
Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (a7e892e Merge branches 'iommu/fixes', 'iommu/page-sizes' and 'iommu/group-id' into next)
Merging cputime/cputime (c5927fe [S390] cputime: add sparse checking and cleanup)
Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging nommu/master (0ce790e Linux 2.6.39-rc1)
Merging trivial/for-next (b12e2c1 leds: Kconfig: Fix typo 'D2NET_V2')
Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
Merging pm/linux-next (89b1f0a PM / Domains: Automatically update overoptimistic latency information)
Merging apm/for-next (282e5aa x86: Kconfig: drop unknown symbol 'APM_MODULE')
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
Merging irda/for-next (94d57c4 enic: Update MAINTAINERS)
Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (1f6189e amd64_edac: Cleanup return type of amd64_determine_edac_cap())
Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice)
Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h)
Merging tip/auto-latest (e79d72b Merge branch 'sched/core' into auto-latest)
CONFLICT (content): Merge conflict in arch/mips/kernel/perf_event_mipsxx.c
Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp())
Merging uprobes/for-next (b23a347 x86: skip singlestep where possible)
Merging cgroup/for-next (884a45d cgroup_freezer: fix freezing groups with stopped tasks)
CONFLICT (content): Merge conflict in kernel/cgroup_freezer.c
Merging kmemleak/kmemleak (99781ba kmemleak: Add support for memory hotplug)
Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
Merging oprofile/for-next (de346b6 Merge branch 'perf/core' into oprofile/master)
Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-two/linux-next (306e4b3 Merge branch 'stable/for-linus-3.3' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (67589c7 percpu: explain why per_cpu_ptr_to_phys() is more complicated than necessary)
Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue())
Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
Merging regmap/for-next (cce585c regmap: Fix rbtreee build when not using debugfs)
Merging hsi/for-next (a8b4dea HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (11e3123 uio: convert drivers/uio/* to use module_platform_driver())
Merging tty/tty-next (bb74041 TTY: Remove redundant spi driver bus initialization)
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig
Merging usb/usb-next (cc27c96 usb: convert drivers/usb/* to use module_platform_driver())
Merging staging/staging-next (b7cd2d9 staging/mei: don't check if list is empty before looping)
CONFLICT (content): Merge conflict in drivers/staging/iio/industrialio-core.c
CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad799x_core.c
Merging char-misc/char-misc-next (7f3379d misc: ad525x_dpot: Add support for SPI module device table matching)
Merging bkl-config/config (4ba8216 BKL: That's all, folks)
Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.)
CONFLICT (content): Merge conflict in mm/swapfile.c
Merging writeback/writeback-for-next (c37a78e fs: Make write(2) interruptible by SIGKILL)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (24118d0 pinctrl: GPIO direction support for muxing)
Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
Merging kvmtool/master (23fa6ed kvm tools: Use vring_need_event() to determine if interrupt is needed)
CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86: fix mmap random address range
Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
Applying: x86: tlb flush avoid superflous leave_mm()
Applying: x86: reduce clock calibration time during slave cpu startup
Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: drm: avoid switching to text console if there is no panic timeout
Applying: hrtimers: Special-case zero length sleeps
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: ipc/mqueue: cleanup definition names and locations
Applying: ipc/mqueue: switch back to using non-max values on create
Applying: ipc/mqueue: enforce hard limits
Applying: ipc/mqueue: update maximums for the mqueue subsystem
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
Applying: debugobjects: be smarter about static objects
Applying: debugobjects: extend to assert that an object is initialized
Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
Applying: ext4: use proper little-endian bitops
Applying: ocfs2: avoid unaligned access to dqc_bitmap
Applying: parisc, exec: remove redundant set_fs(USER_DS)
Applying: scsi: fix a header to include linux/types.h
Applying: drivers/scsi/megaraid.c: fix sparse warnings
Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm-add-free_hot_cold_page_list-helper-v2
Applying: mm-add-free_hot_cold_page_list-helper-v3
Applying: mm: remove unused pagevec_free
Applying: mm-tracepoint: rename page-free events
Applying: mm-tracepoint: fix documentation and examples
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: mm: migrate: one less atomic operation
Applying: mm: do not stall in synchronous compaction for THP allocations
Applying: mm-do-not-stall-in-synchronous-compaction-for-thp-allocations-v3
Applying: mm: avoid livelock on !__GFP_FS allocations
Applying: mm-avoid-livelock-on-__gfp_fs-allocations-fix
Applying: mm: reduce the amount of work done when updating min_free_kbytes
Applying: mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes-checkpatch-fixes
Applying: thp: reduce khugepaged freezing latency
Applying: hpet: factor timer allocate from open
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: kernel.h: neaten panic prototype
Applying: include/linux/linkage.h: remove unused NORET_AND macro
Applying: treewide: remove useless NORET_TYPE macro and uses
Applying: treewide: convert uses of ATTRIB_NORETURN to __noreturn
Applying: treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes
Applying: include/linux/linkage.h: remove unused ATTRIB_NORET macro
Applying: mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL
Applying: mm,x86,um: move CMPXCHG_LOCAL config option
Applying: mm,x86,um: move CMPXCHG_DOUBLE config option
Applying: audit: always follow va_copy() with va_end()
Applying: brlocks/lglocks: clean up code
Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
Applying: get_maintainers.pl: follow renames when looking up commit signers
Applying: checkpatch: update signature "might be better as" warning
Applying: checkpatch: prefer __printf over __attribute__((format(printf,...)))
Applying: crc32: optimize inner loop
Applying: epoll: limit paths
Applying: cgroups: add res_counter_write_u64() API
Applying: cgroups: new resource counter inheritance API
Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
Applying: cgroups: new cancel_attach_task() subsystem callback
Applying: cgroups: ability to stop res charge propagation on bounded ancestor
Applying: cgroups: add res counter common ancestor searching
Applying: res_counter: allow charge failure pointer to be null
Applying: cgroups: pull up res counter charge failure interpretation to caller
Applying: cgroups: allow subsystems to cancel a fork
Applying: cgroups: add a task counter subsystem
Applying: cgroups: ERR_PTR needs err.h
Applying: cgroup: Fix task counter common ancestor logic
Applying: cgroup-fix-task-counter-common-ancestor-logic-checkpatch-fixes
Applying: mm: memcg: consolidate hierarchy iteration primitives
Applying: mm: vmscan: distinguish global reclaim from global LRU scanning
Applying: mm: vmscan: distinguish between memcg triggering reclaim and memcg being scanned
Applying: mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes
Applying: mm: memcg: per-priority per-zone hierarchy scan generations
Applying: mm: move memcg hierarchy reclaim to generic reclaim code
Applying: mm: memcg: remove optimization of keeping the root_mem_cgroup LRU lists empty
Applying: mm: vmscan: convert global reclaim to per-memcg LRU lists
Applying: mm: collect LRU list heads into struct lruvec
Applying: mm: make per-memcg LRU lists exclusive
Applying: mm: memcg: remove unused node/section info from pc->flags
Applying: mm: memcg: remove unused node/section info from pc->flags fix
Applying: procfs: make proc_get_link to use dentry instead of inode
Applying: procfs: introduce the /proc/<pid>/map_files/ directory
Applying: procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes
Applying: workqueue: make alloc_workqueue() take printf fmt and args for name
Applying: workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-fix
Applying: cpumask: update setup_node_to_cpumask_map() comments
Applying: kdump: add missing RAM resource in crash_shrink_memory()
Applying: kdump: fix crash_kexec()/smp_send_stop() race in panic
Applying: kdump: Add udev events for memory online/offline
Applying: ipc/mqueue: simplify reading msgqueue limit
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks()
Applying: vfs: cache request_queue in struct block_device
Applying: dio: optimize cache misses in the submission path
Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
Applying: dio: using prefetch requires including prefetch.h
Applying: ramoops: update parameters only after successful init
Merging akpm (19a62b9 ramoops: update parameters only after successful init)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm tree
From: Alan Cox @ 2011-11-28 11:30 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Dave Airlie, linux-next, linux-kernel, Jesse Barnes
In-Reply-To: <20111128135317.a99880b234c6c060a622fa31@canb.auug.org.au>
On Mon, 28 Nov 2011 13:53:17 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Dave,
>
> On Fri, 25 Nov 2011 10:34:19 +0000 Dave Airlie <airlied@gmail.com> wrote:
> >
> > I just pushed jbarnes patch into my tree for now, at pushed out the
> > mainline gma500 code with it.
>
> And it is a mess (see my linux-next reports).
Well its very hard to sort stuff out when you are juggling a cross tree
set of dependancies and someone pointlessly stops one of them being
visible in next for ten days.
Whatever. I'm onto it, but I think blocking -next merges for staging
breakage is broken to the point that -next needs fixing, or we should
kill staging off.
Alan
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm tree
From: Alan Cox @ 2011-11-28 11:33 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, linux-next, linux-kernel, Jesse Barnes,
Ville Syrjälä, Rob Clark, Greg KH
In-Reply-To: <20111128135204.33bb929d7495d7830d09dfc3@canb.auug.org.au>
> Then if you are moving a driver out of staging, you should put a patch in
> your tree to disable it in staging (or remove it in staging) and send
> that patch to Greg as well.
I was migrating *part* of it. You've forced me to mark it all broken
despite several requests (to which no reply was recieved) not to do so
simply so the poor DRM team can get their work done. As a result anyone
working off Medfield hardware will have to go use other trees. In this
case it's not going to hurt anyone I suspect but who knows in future if
this sort of thing occurs again.
Staging build fail - just mark the staging item as broken, that or stop
including staging in -next.
Alan
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm tree
From: Stephen Rothwell @ 2011-11-28 13:13 UTC (permalink / raw)
To: Alan Cox; +Cc: Dave Airlie, Dave Airlie, linux-next, linux-kernel, Jesse Barnes
In-Reply-To: <20111128113056.2099e4c3@lxorguk.ukuu.org.uk>
[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]
Hi Alan,
On Mon, 28 Nov 2011 11:30:56 +0000 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> On Mon, 28 Nov 2011 13:53:17 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > On Fri, 25 Nov 2011 10:34:19 +0000 Dave Airlie <airlied@gmail.com> wrote:
> > >
> > > I just pushed jbarnes patch into my tree for now, at pushed out the
> > > mainline gma500 code with it.
> >
> > And it is a mess (see my linux-next reports).
>
> Well its very hard to sort stuff out when you are juggling a cross tree
> set of dependancies and someone pointlessly stops one of them being
> visible in next for ten days.
The mess in the drm tree has nothing to do with the staging tree. It has
happened because the merge of your gms500 changes into the drm tree
interacted with other changes in that tree and the interactions were not
fixed in that tree.
You did read my error report from today, didn't you? The build failure
was in drivers/gpu/drm/gma500/psb_drv.c. The warnings indicating other
unfixed interactions were in drivers/gpu/drm/gma500/framebuffer.c.
As far as I can see, building the gma500 driver in the drm tree (on its
own) will fail.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm tree
From: Alan Cox @ 2011-11-28 13:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, Dave Airlie, linux-next, linux-kernel, Jesse Barnes
In-Reply-To: <20111129001353.399142710ab77822b29552f0@canb.auug.org.au>
> > Well its very hard to sort stuff out when you are juggling a cross tree
> > set of dependancies and someone pointlessly stops one of them being
> > visible in next for ten days.
>
> The mess in the drm tree has nothing to do with the staging tree.
I would suggest you re-read the paragraph above, and the mails I sent you
about marking the staging gma500 tree broken (which given nothing
happened in response to any of them I imagine you didn't).
And if you still think that blocking the DRM tree from -next for ten days
thus stopping all sorts of other integration work and forcing people's
hands on moving from staging and the like didn't cause the problems and
is the right policy then we'll just have to agree to differ.
Alan
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm tree
From: Stephen Rothwell @ 2011-11-28 13:53 UTC (permalink / raw)
To: Alan Cox; +Cc: Dave Airlie, Dave Airlie, linux-next, linux-kernel, Jesse Barnes
In-Reply-To: <20111128131847.48bffb93@lxorguk.ukuu.org.uk>
[-- Attachment #1: Type: text/plain, Size: 2438 bytes --]
Hi Alan,
On Mon, 28 Nov 2011 13:18:47 +0000 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>
> > > Well its very hard to sort stuff out when you are juggling a cross tree
> > > set of dependancies and someone pointlessly stops one of them being
> > > visible in next for ten days.
> >
> > The mess in the drm tree has nothing to do with the staging tree.
>
> I would suggest you re-read the paragraph above, and the mails I sent you
> about marking the staging gma500 tree broken (which given nothing
> happened in response to any of them I imagine you didn't).
When I originally reported this problem, you responded:
> gma500 is frozen pending Dave Airlie's applying the patches moving it out
> of staging.
>
> <Prod, prod>
Which I assumed was aimed at Dave. Then Jesse (whose changes broke the
code in staging) responded with a patch which I assumed that Dave would
do something with. Then the next day you responded with:
> If the staging gma500 is causing this still please resolve it by marking
> the GMA500 in staging "&& BROKEN" for the moment.
And maybe I should have done something then. I fall back on the excuse
that I have about 200 trees to merge every day and when I use to fix
things for people I used to have lots of 12-16 hour days ...
> And if you still think that blocking the DRM tree from -next for ten days
> thus stopping all sorts of other integration work and forcing people's
> hands on moving from staging and the like didn't cause the problems and
> is the right policy then we'll just have to agree to differ.
If you are trying to get something merged into the drm tree, you should
be working with the drm tree and with the drm maintainer, not
linux-next. Linux-next is here to find integration problems between
trees and across architectures not to find problems with changes within
one tree.
And I repeat, the breakage today is nothing to do with the staging tree,
it is in the drm tree and how your gma500 changes were merged there (and
to be clear, there is nothing wrong with the gma500 changes per se).
In the future, I will try to remember to "kill staging first", but this
is the first time it has come up since staging started being built by an
allmodconfig build (which it used not to be - and that change was not my
choice).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm tree
From: Dave Airlie @ 2011-11-28 14:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Alan Cox, Dave Airlie, linux-next, linux-kernel, Jesse Barnes
In-Reply-To: <20111129005341.c5caf7f353876a0dd4764d3c@canb.auug.org.au>
On Mon, Nov 28, 2011 at 1:53 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Alan,
>
> On Mon, 28 Nov 2011 13:18:47 +0000 Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
>>
>> > > Well its very hard to sort stuff out when you are juggling a cross tree
>> > > set of dependancies and someone pointlessly stops one of them being
>> > > visible in next for ten days.
>> >
>> > The mess in the drm tree has nothing to do with the staging tree.
>>
>> I would suggest you re-read the paragraph above, and the mails I sent you
>> about marking the staging gma500 tree broken (which given nothing
>> happened in response to any of them I imagine you didn't).
>
> When I originally reported this problem, you responded:
>
>> gma500 is frozen pending Dave Airlie's applying the patches moving it out
>> of staging.
>>
>> <Prod, prod>
>
> Which I assumed was aimed at Dave. Then Jesse (whose changes broke the
> code in staging) responded with a patch which I assumed that Dave would
> do something with. Then the next day you responded with:
>
>> If the staging gma500 is causing this still please resolve it by marking
>> the GMA500 in staging "&& BROKEN" for the moment.
>
> And maybe I should have done something then. I fall back on the excuse
> that I have about 200 trees to merge every day and when I use to fix
> things for people I used to have lots of 12-16 hour days ...
>
>> And if you still think that blocking the DRM tree from -next for ten days
>> thus stopping all sorts of other integration work and forcing people's
>> hands on moving from staging and the like didn't cause the problems and
>> is the right policy then we'll just have to agree to differ.
>
> If you are trying to get something merged into the drm tree, you should
> be working with the drm tree and with the drm maintainer, not
> linux-next. Linux-next is here to find integration problems between
> trees and across architectures not to find problems with changes within
> one tree.
>
> And I repeat, the breakage today is nothing to do with the staging tree,
> it is in the drm tree and how your gma500 changes were merged there (and
> to be clear, there is nothing wrong with the gma500 changes per se).
>
> In the future, I will try to remember to "kill staging first", but this
> is the first time it has come up since staging started being built by an
> allmodconfig build (which it used not to be - and that change was not my
> choice).
Yeah I've tracked it down here, I had messed up the configs locally so
Alan's code wasn't built, I'll pile some fixes on top of it today.
Dave.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox