* Linux v2.6.12-rc6
@ 2005-06-06 18:08 Linus Torvalds
2005-06-06 19:26 ` Pavel Machek
` (4 more replies)
0 siblings, 5 replies; 36+ messages in thread
From: Linus Torvalds @ 2005-06-06 18:08 UTC (permalink / raw)
To: Kernel Mailing List
It's being uploaded right now, the git tree is already up-to-date, and by
the time this hits the mailing list the mirroring of the tar-ball will
hopefully be done too.
And since Jeff wrote me a shortlog script for git, the easist way to tell
what's new since -rc5 is to just do the shortlog and diffstat output.
Network drivers, USB and CPU-freq stand out.
And the good news is that people do seem to have taken my rumblings about
calming down for 2.6.12 seriously. Let's hope that pans out, and I can
release that one asap.. But give this a good beating first, and holler
(again, if you must) about any issues you have,
Linus
---
Adrian Bunk:
USB: remove drivers/usb/media/pwc/ChangeLog
drivers/net/hamradio/baycom_epp.c: cleanups
[IPV6]: Kill export of fl6_sock_lookup.
[IPVS]: remove net/ipv4/ipvs/ip_vs_proto_icmp.c
arch/i386/kernel/cpu/intel_cacheinfo.c: section fix
Input:
SIS900 must select MII
Alan Cox:
remove non-cleanroom pwc driver compression
Albert Lee:
libata: Fix zero sg_dma_len() on 64-bit platform
Alexander Nyberg:
acpi build fix: x86 setup.c
Note on ACPI build fix
Fixup VIA IRQ quirk
x86_64: CONFIG_BUG=n fixes
Alexey Dobriyan:
[TOKENRING]: net/802/tr.c: s/struct rif_cache_s/struct rif_cache/
[TOKENRING]: be'ify trh_hdr, trllc, rif_cache_s
Andi Kleen:
x86_64 CONFIG_ACPI=n build fix
x86_64: More fixes for compilation without CONFIG_ACPI
Andrew Morton:
Input: Fix a warning in psmouse-base.c
Andrew Vasquez:
[SCSI] qla2xxx: fix bad locking during eh_abort
Andy Currid:
PCI: amd74xx patch for new NVIDIA device IDs
Anton Blanchard:
ppc64: remove decr_overclock
ppc64: cleanup iseries runlight support
ppc64: cleanup SPR definitions
ppc64: allow timer based profiling on iseries
Bartlomiej Zolnierkiewicz:
convert IDE device drivers to driver-model
Benjamin Herrenschmidt:
ppc64: Fix result code handling in prom_init
ppc32/ppc64: cleanup /proc/device-tree
ppc32: Apple device-tree bug fix
ppc64: Fix a device-tree bug on Apple's
ppc32: Fix cpufreq vs. sleep issue
ppc32: Fix Alsa PowerMac driver on old machines
ppc32: small cpufreq update
Benjamin LaHaise:
ns83820 update
Bodo Stroesser:
s390: uml ptrace fixes
Christoph Hellwig:
[NET]: Fix locking in shaper driver.
[XFS] remove an over-zealous WARN_ON
Merge with /.../torvalds/linux-2.6.git
Colin Leroy:
therm_adt746x: show correct sensor locations
Make sure therm_adt746x only handles known hardware
Craig Shelley:
USB: CP2101 Add support for flow control
Dan Williams:
wireless/airo: WEXT and quality corrections
Daniel Ritz:
3c574_cs: disable interrupts in el3_close
Daniele Venzano:
More ethtool support for sis900 and warning fix
Dave Jones:
[CPUFREQ] Typos.
[CPUFREQ] longhaul - adjust transition latency.
[CPUFREQ] Longhaul: Magic timer frobbing.
[CPUFREQ] longhaul - disable PCI mastering around transition.
[CPUFREQ] ondemand governor default sampling downfactor as 1
[CPUFREQ] ondemand governor automatic downscaling
[CPUFREQ] ondemand,conservative governor idle_tick clean-up
[CPUFREQ] ondemand,conservative governor store the idle ticks for all cpus
[CPUFREQ] ondemand,conservative minor bug-fix and cleanup
[CPUFREQ] Allow ondemand stepping to be changed by user.
[CPUFREQ] Prevents un-necessary cpufreq changes if we are already at min/max
[CPUFREQ] Add support to cpufreq_ondemand to ignore 'nice' cpu time
[CPUFREQ] Conservative cpufreq governer
[CPUFREQ] fix up comment in cpufreq.h
[CPUFREQ] dual-core powernow-k8
[CPUFREQ] make cpufreq_gov_dbs static
[CPUFREQ] Recalibrate cpu_khz [2/2]
[CPUFREQ] Recalibrate cpu_khz [1/2]
[CPUFREQ] AMD Elan SC520 cpufreq driver.
[CPUFREQ] Add warning comment about default governors.
[CPUFREQ] speedstep-smi: it works on at least one P4M
[CPUFREQ] ondemand: trivial clean-ups
[CPUFREQ] speedstep-centrino: Pentium 4 - M (HT) support
[CPUFREQ] cpufreq-core: reduce warning messages.
[CPUFREQ] powernow-k7: don't print khz element of FSB.
Fix up pwc driver compilation.
David Brownell:
USB: resolve Zaurus problem
USB: add sl811_cs support
USB: sl811-hcd fixes
David Mosberger-Tang:
[IA64] Correct convert_to_non_syscall()
[IA64] Avoid .spillpsp directive in handcoded assembly
[IA64] fix "section mismatch" compile-time-error
[IA64] Fix stack placement when INIT hits in kernel mode.
David S. Miller:
[SPARC64]: Refine PCI strbuf ctx-based flush.
[SPARC64]: Fix streaming buffer flushing on PCI and SBUS.
Merge of /home/davem/src/GIT/tg3-2.6/
[NET]: Use %lx for netdev->features sysfs formatting.
[IPV6]: Clear up user copy warning in flowlabel code.
Merge of /home/davem/src/GIT/linux-2.6/.git/
Merge of davem@nuts.davemloft.net:/disk1/GIT/sparc-2.6/.git/
[SPARC64]: Add boot option to force UltraSPARC-III P-Cache on.
David Woodhouse:
Speedtouch resync after lost signal.
Dmitry Torokhov:
Input: synaptics - reduce verboseness of synaptics driver - there
Input: yet another model that does not play nicely when i8042 is
Input: automatically disable MUX mode on Toshiba Satellite P10
Input: gunze - fix out-of-bound array access reported by Adrian Bunk.
Input: Tone down the severity of a printk() in i386/ia64 arch code
Domen Puncer:
drivers/scsi/ahci: add #include req'd for the DMA_{64,32}BIT_MASK constants
drivers/scsi/sata_vsc: add #include req'd for DMA_32BIT_MASK constant
Don Fry:
pcnet32: fix resource leak with loopback test
Edgar E Iglesias:
[IPSEC]: Fix esp_decap_data size verification in esp4.
Edward Falk:
libata: update inline source docs
Francisco Javier:
sata_promise: add PCI ID for FastTrak TX2200 2-ports
Francois Romieu:
r8169: incoming frame length check
Frank Pavlic:
s390: qeth bug fixes
s390: qeth bug fixes
s390: fakell for high speed token ring
s390: qeth bug fixes
s390: enable iucv_send2way_xxx functions
s390: ctc code cleanup
s390: schedule_timeout cleanup in ctctty
s390: set online race in the lcs driver
s390: multicast address registration in lcs
s390: claw driver wiring
Gerald Schaefer:
s390: deadlock in appldata
Gerd Knorr:
v4l: bttv i2c oops fix
Goffredo Baroncelli:
UDF filesystem: array '__mon_yday' declared as not static
Greg Kroah-Hartman:
USB: add Vernier devices to HID blacklist
USB: fix usb-serial generic initialization
Greg Ungerer:
m68knommu: fix scheduling and race problems in idle loop
Harald Welte:
[NETFILTER]: Fix deadlock with ip_queue and tcp local input path.
[IPV4]: Primary and secondary addresses
Herbert Xu:
[IPV4]: Fix BUG() in 2.6.x, udp_poll(), fragments + CONFIG_HIGHMEM
Fw: [Bugme-new] [Bug 4482] New: natsemi: incorrect initialization of IPv6 Neighbor-discovery multicast
Hideaki YOSHIFUJI:
commit 2f872f0401d4b470990864fbf99c19130f25ad4d
Ian Abbott:
USB: ftdi_sio: new PID for ELV UM100
James Harper:
fix PROMISC/bridging in TLAN driver
Jan Beulich:
[ATM]: fix ATM makefile for out-of-source-tree builds
Jan Kara:
ext3: fix list scanning in __cleanup_transaction
ext3: fix log_do_checkpoint() assertion failure
Jay Vosburgh:
[BONDING]: bonding using arp_ip_target may stay down with active path
Jeff Dike:
uml: remove unused code
uml: fix segfault on exit with CONFIG_GCOV
uml: single-space a help message
uml: remove 2_5compat.h
uml: turn off kmalloc always on a fatal signal
uml: fix a couple of warnings
Jeff Garzik:
Automatic merge of /spare/repo/netdev-2.6 branch r8169-fix
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
libata: kernel-doc warning fixes
libata: more docs updates
libata: doc updates
libata: more doc updates
libata: minor DocBook update
libata: bump version
Automatic merge of /spare/repo/netdev-2.6 branch use-after-unmap
libata: Fix use-after-iounmap
Automatic merge of rsync://rsync.kernel.org/.../torvalds/linux-2.6.git branch HEAD
Automatic merge of rsync://rsync.kernel.org/.../torvalds/linux-2.6.git branch HEAD
Automatic merge of /spare/repo/netdev-2.6 branch tlan
Automatic merge of /spare/repo/netdev-2.6 branch sis900
Automatic merge of /spare/repo/netdev-2.6 branch veth
Automatic merge of /spare/repo/netdev-2.6 branch qeth
Automatic merge of /spare/repo/netdev-2.6 branch ns83820
Automatic merge of /spare/repo/netdev-2.6 branch natsemi
Automatic merge of /spare/repo/netdev-2.6 branch forcedeth
Automatic merge of /spare/repo/netdev-2.6 branch airo
Automatic merge of /spare/repo/netdev-2.6 branch atmel
Automatic merge of /spare/repo/netdev-2.6 branch amd8111
Automatic merge of /spare/repo/netdev-2.6 branch pcnet32
Automatic merge of /spare/repo/netdev-2.6 branch ixgb
Automatic merge of /spare/repo/netdev-2.6 branch e1000
Automatic merge of /spare/repo/netdev-2.6 branch e100
Merge of /spare/repo/netdev-2.6 branch misc-fixes
Jens Axboe:
Relax idecd dma alignment check
relax ide-cd dma restrictions
Jesper Juhl:
[ATM]: [drivers] kill pointless NULL checks and casts before kfree()
Jesse Barnes:
update sn2 maintainer
Jiri Benc:
[NET]: Fix HH_DATA_OFF.
John Hawkes:
drop note_interrupt() for per-CPU for proper scaling
John W. Linville:
tulip: add return to ULI526X clause in tulip_mdio_write
Jon Mason:
[NET]: Add ethtool support for NETIF_F_HW_CSUM.
Kenji Kaneshige:
PCI Hotplug: SHPCHP driver doesn't enable PERR and SERR properly
PCI Hotplug: shpchp driver doesn't program _HPP values properly
Kumar Gala:
ppc32: i8259 PIC should not be initialized if PCI is not configured
ppc32: Add soft reset to MPC834x
ppc32: MPC834x BCSR_SIZE too small for use in a BAT.
ppc32: Simplified load string emulation error checking
ppc32: Fix building MPC8555 CDS when CONFIG_PCI is disabled
ppc32: Add VIA IDE support to MPC8555 CDS platform
ppc32: Fix some minor issues related to FSL Book-E KGDB support
ppc32: Fix uImage make target to report success correctly
Kurt Garloff:
Input: Avoid double unregistering of i8042 PnP driver. This can happen
Len Brown:
ACPI build fix
VIA IRQ quirk
Linus Torvalds:
Linux 2.6.12-rc6
Automatic merge of 'misc-fixes' branch from
Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6
Automatic merge of rsync://rsync.kernel.org/.../davem/net-2.6
Merge of 'docs' branch from
Merge of master.kernel.org:/.../aegl/linux-2.6
Automatic merge of rsync://rsync.kernel.org/.../sfrench/cifs-2.6
Automatic merge of rsync://rsync.kernel.org/.../davem/net-2.6
Automatic merge of rsync://rsync.kernel.org/.../davem/sparc-2.6
Automatic merge of rsync://rsync.kernel.org/.../gregkh/usb-2.6
Automatic merge of rsync://rsync.kernel.org/.../gregkh/i2c-2.6
Automatic merge of rsync://rsync.kernel.org/.../gregkh/pci-2.6
Automatic merge of rsync://rsync.kernel.org/.../aegl/linux-2.6
Merge of rsync://rsync.kernel.org/.../davem/tg3-2.6
Automatic merge of 'misc-fixes' branch from
Automatic merge of 'for-linus' branch from
Automatic merge of rsync://rsync.kernel.org/.../hch/xfs-2.6
ide-cd: revert DMA mask test change
Automatic merge of rsync://rsync.kernel.org/.../davem/net-2.6
Automatic merge of 'for-linus' branch from
Merge of 'misc-fixes' branch from
Merge of rsync://rsync.kernel.org/.../davem/sparc-2.6
Merge of 'new-ids' branch from
Merge of 'for-linus' branch from
Liu Tao:
drivers/net/amd8111e.c: fix NAPI interrupt in poll
Lonnie Mendez:
USB: hid-core: add Earthmate lt-20 productid to blacklist table
Malli Chilakala:
e100: Driver version, white space, comments, device id
e100: Performance optimizations to e100 Tx Path
e100: Fix Wake on lan related issues
e100: Synchronize interface link state with poll routine
e100: Render e100 NAPI state machine
e100: Execute tx_timeout task outside interrupt context
ixgb: Driver version, white space, comments, device id
ixgb: Fixed msec_delay in osdep to use msleep
ixgb: Code optimization
ixgb: Remove hook for suspend, no power management
ixgb: Support for ethtool -d
ixgb: Fix EEPROM functions to be endian-aware
ixgb: Reset status in the Rx
ixgb: Mask RXO interrupt
ixgb: Change RDT write bump size to 4
ixgb: Do not set the RS bit on context descriptors
ixgb: Fix multi-cast packet count in statistics
e1000:Driver version,white space,comments,device id
e1000:Adjust flow control watermarks for Jumbo Frames
e1000:Fix Packet Buffer Allocation logic for 82547_rev_2
e1000:82573 specific code & packet split code
e1000: Modified e1000_clean: exit poll
e1000:Removed redundant statement in e1000_clean_tx_irq
e1000: Implement a workaround for 82546 errata 10
e1000: e1000 stops working after resume
e1000:Fix computation of netdev stats from controller stats counters
e1000: Dump information on Tx ring
e1000: Delay clean-up of last Tx packet
e1000: Fix kernel panic with 82541 LOM
e1000: Enable polling before enabling interrupts
e1000: MSI support for PCI-e adapters
e1000: Fix msec-delay definition to use msleep
e1000: made loopback test robust
Manfred Spraul:
forcedeth: Update error handling
Manu Abraham:
dvb: Small cleanup
dvb: Fix 22k tone control
dvb: Fix LNB power switching
dvb: Remove unnecessary casts
dvb: Fix Mini DiSEqC bug
Marcello Maggioni:
timeout at boottime with NEC3500A (and possibly others) when inserted a CD in it
Martin Schwidefsky:
s390: in_interrupt vs. in_atomic
s390: ptrace peek and poke
Matthias Urlichs:
USB: add Option Card driver
Michael Chan:
[TG3]: Fix bug in tg3_load_firmware_cpu
[TG3]: Add interrupt test
[TG3]: Add loopback test
[TG3]: Add memory test
[TG3]: Add register test
[TG3]: Add parameter to tg3_halt
[TG3]: Add link test
[TG3]: Add nvram test
[TG3]: Add basic selftest infrastructure
[BNX2]: New Broadcom gigabit network driver.
Michael Ellerman:
[NET]: Add is_multicast_ether_addr() in include/linux/etherdevice.h
iseries_veth: Cleanup skbs to prevent unregister_netdevice() hanging
iseries_veth: Don't leak skbs in RX path
iseries_veth: Set dev->trans_start so watchdog timer works right
iseries_veth: Don't send packets to LPARs which aren't up
Michal Schmidt:
forcedeth: netpoll support
NAKAMURA Kenta:
sata_sil: new ID 1002:437A for ATI IXP400
Nathan Lynch:
prom_find_machine_type typo breaks pSeries lpar boot
[SCSI] fix slab corruption during ipr probe
Nathan Scott:
[XFS] Fix directory inodes ioctl compat code, minor code consistency cleanups
Neil Horman:
ipmi build fix
Nick Piggin:
h8300 sleep problem
Oliver Korpilla:
x86_64: signal.c build fix
Paolo 'Blaisorblade' Giarrusso:
uml: remove jail mode + other leftovers
uml: fixlet for arch_prctl_skas
irq code: Add coherence test for PREEMPT_ACTIVE
uml: fix PREEMPT_ACTIVE
uml: stack dump fix
uml: split CONFIG_FRAME_POINTER from DEBUG_INFO
uml: add MOD_LICENSE to random driver
uml: add modversions support
Patrick McManus:
intelfb section fix
Paul Jackson:
cpuset exit NULL dereference fix
Paul Mackerras:
ppc64: actually call prom_send_capabilities
Paul Mundt:
sh: PREEMPT_ACTIVE fix
Paulo Marques:
USB: make MODALIAS code a bit smaller devices
Pavel Machek:
fix jumpy mouse cursor on console
Pete Zaitcev:
USB: Support multiply-LUN devices in ub
Peter Chubb:
[IA64] fix compilation warning in sys32_epoll_wait()
[IA64] Cleanup compile warnings for ski config
pcdp.c build fix
Phil Dibowitz:
USB Storage: Add unusual_devs for Trumpion Voice Recorder
Ping Cheng:
USB: add new wacom device to usb hid-core list
Pravin B. Shelar:
[IPV4]: Kill MULTIPATHHOLDROUTE flag.
Qu Fuping:
mpage_end_io_write() I/O error handling fix
Roland Dreier:
IB: fix endianness of path record MTU field
IB: fix potential ib_umad leak
IB: allow NULL sa_query callbacks
Roland McGrath:
i386: fix prevent_tail_call
Roman Kagan:
USB: update urb documentation
Roman Zippel:
flush icache in correct context
Rudolf Marek:
I2C: ALI1563 SMBus driver fix
Russ Anderson:
[IS64-SGI] Set Altix error handling features
[IA64-SGI] Make Altix SAL call to POD reentrant
[IA64-SGI] cpe interrupts are not being enabled.
Russell Cattelan:
[XFS] Fix a bug in xfs_iomap for extent handling of write cases
Scott Murray:
PCI Hotplug: more CPCI updates
Shaohua Li:
swsusp: ahd_dv_0 can't be stopped
Siddha, Suresh B:
x86: fix smp_num_siblings on buggy BIOSes
Simon Kelley:
atmel wireless
Stephen Hemminger:
[BRIDGE]: receive path optimization
[BRIDGE]: prevent bad forwarding table updates
[BRIDGE]: set features based on enslaved devices
[BRIDGE]: make dev->features unsigned
[BRIDGE]: features change notification
[PKT_SCHED] netem: allow random reordering (with fix)
[PKT_SCHED] netem: use only inner qdisc -- no private skbuff queue
[PKT_SCHED]: netem: reinsert for duplication
tlan: restore deleted module parameters.
Stephen Rothwell:
ppc64 iSeries: make virtual DVD-RAMs writable again
ppc64 iSeries: fix boot time setting
ppc64: fix initialisation of gettimeofday calculations
Steve French:
Merge with rsync://rsync.kernel.org/.../torvalds/linux-2.6.git
[CIFS] fix casts of unicode strings to match function definition
[CIFS] Fix oops in cifs_unlink. Caused in some cases when renaming over existing,
[CIFS] missing break needed to handle < when mount option "mapchars" specified
Stuart Hayes:
ide-scsi: kmap scatter/gather before doing PIO
Thomas Graf:
[PKT_SCHED]: Disable dsmark debugging messages by default
[PKT_SCHED]: make dsmark try using pfifo instead of noop while grafting
[PKT_SCHED]: Fix dsmark to count ignored indices while walking
Tony Luck:
[IA64] Use "PER_CPU" form of EXPORT macro
[IA64] initialize spinlock pfm_alt_install_check
Sync with Linus - rsync://rsync.kernel.org/.../torvalds/linux-2.6.git
[IA64] alternate perfmon handler
Merge with linus
Merge with /home/aegl/GIT/linus
Venkatesh Pallipadi:
cpufreq-stats driver documentation
cpufreq-stats driver updates
Vitaly Bordug:
ppc32: Support for 82xx PQII on-chip PCI bridge
Vojtech Pavlik:
Input: Fix fast scrolling scancodes in atkbd.c
input: Fix fast scrolling scancodes in atkbd.c
Input: Fix button mapping in joydev - BTN_TRIGGER was being
Input: Workaround for Sunrex K8561 IR Keyboard/Mouse. The mouse
Input: Only write the CTR in i8042 resume function. Reading it is
Input: Remove (now) unused variable in i8042.c
Input: Add a missing KERN_INFO message designation, fix behavior
Yoichi Yuasa:
serial: update NEC VR4100 series serial support
Zhang Yanmin:
[IA64] sys_mmap doesn't follow posix.1 when parameter len=0
Documentation/DocBook/libata.tmpl | 156 -
Documentation/cpu-freq/cpufreq-stats.txt | 128
MAINTAINERS | 10
Makefile | 2
arch/h8300/kernel/process.c | 2
arch/i386/Kconfig | 2
arch/i386/kernel/cpu/cpufreq/Kconfig | 14
arch/i386/kernel/cpu/cpufreq/Makefile | 1
arch/i386/kernel/cpu/cpufreq/longhaul.c | 58
arch/i386/kernel/cpu/cpufreq/powernow-k7.c | 11
arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 113
arch/i386/kernel/cpu/cpufreq/powernow-k8.h | 15
arch/i386/kernel/cpu/cpufreq/sc520_freq.c | 186 +
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | 6
arch/i386/kernel/cpu/cpufreq/speedstep-lib.c | 6
arch/i386/kernel/cpu/cpufreq/speedstep-smi.c | 3
arch/i386/kernel/cpu/intel_cacheinfo.c | 2
arch/i386/kernel/setup.c | 2
arch/i386/kernel/smpboot.c | 4
arch/i386/kernel/timers/common.c | 6
arch/i386/kernel/timers/timer_tsc.c | 20
arch/i386/pci/irq.c | 5
arch/ia64/ia32/sys_ia32.c | 2
arch/ia64/kernel/entry.S | 4
arch/ia64/kernel/mca.c | 8
arch/ia64/kernel/minstate.h | 3
arch/ia64/kernel/perfmon.c | 175 +
arch/ia64/kernel/ptrace.c | 20
arch/ia64/kernel/smpboot.c | 2
arch/ia64/kernel/sys_ia64.c | 7
arch/ia64/sn/kernel/setup.c | 2
arch/m68knommu/kernel/process.c | 17
arch/ppc/Kconfig | 4
arch/ppc/boot/images/Makefile | 3
arch/ppc/configs/mpc8555_cds_defconfig | 117
arch/ppc/kernel/head_fsl_booke.S | 15
arch/ppc/kernel/traps.c | 7
arch/ppc/platforms/83xx/mpc834x_sys.c | 1
arch/ppc/platforms/83xx/mpc834x_sys.h | 7
arch/ppc/platforms/85xx/mpc8540_ads.c | 3
arch/ppc/platforms/85xx/mpc85xx_cds_common.c | 143 +
arch/ppc/platforms/85xx/mpc85xx_cds_common.h | 3
arch/ppc/platforms/85xx/sbc8560.c | 3
arch/ppc/platforms/pmac_cpufreq.c | 36
arch/ppc/platforms/pq2ads.h | 47
arch/ppc/syslib/Makefile | 4
arch/ppc/syslib/m8260_pci.c | 193 -
arch/ppc/syslib/m8260_pci.h | 76
arch/ppc/syslib/m8260_pci_erratum9.c | 10
arch/ppc/syslib/m8260_setup.c | 11
arch/ppc/syslib/m82xx_pci.c | 383 +
arch/ppc/syslib/m82xx_pci.h | 92
arch/ppc/syslib/open_pic.c | 4
arch/ppc/syslib/ppc83xx_setup.c | 28
arch/ppc/syslib/ppc85xx_setup.c | 16
arch/ppc/syslib/prom_init.c | 10
arch/ppc64/kernel/entry.S | 9
arch/ppc64/kernel/head.S | 10
arch/ppc64/kernel/iSeries_setup.c | 22
arch/ppc64/kernel/idle.c | 8
arch/ppc64/kernel/mf.c | 85
arch/ppc64/kernel/pSeries_reconfig.c | 8
arch/ppc64/kernel/process.c | 3
arch/ppc64/kernel/prom_init.c | 118
arch/ppc64/kernel/rtc.c | 39
arch/ppc64/kernel/setup.c | 56
arch/ppc64/kernel/smp.c | 3
arch/ppc64/kernel/sysfs.c | 8
arch/ppc64/kernel/time.c | 3
arch/s390/appldata/appldata_base.c | 72
arch/s390/appldata/appldata_mem.c | 2
arch/s390/appldata/appldata_net_sum.c | 2
arch/s390/appldata/appldata_os.c | 4
arch/s390/kernel/ptrace.c | 55
arch/s390/mm/fault.c | 2
arch/sparc64/kernel/pci_iommu.c | 88
arch/sparc64/kernel/pci_psycho.c | 2
arch/sparc64/kernel/pci_sabre.c | 2
arch/sparc64/kernel/pci_schizo.c | 2
arch/sparc64/kernel/sbus.c | 20
arch/sparc64/kernel/setup.c | 11
arch/sparc64/kernel/smp.c | 3
arch/sparc64/kernel/traps.c | 19
arch/um/Kconfig.debug | 4
arch/um/drivers/random.c | 16
arch/um/drivers/ssl.c | 1
arch/um/drivers/stdio_console.c | 1
arch/um/drivers/ubd_kern.c | 7
arch/um/include/2_5compat.h | 24
arch/um/include/sysrq.h | 3
arch/um/kernel/exec_kern.c | 1
arch/um/kernel/initrd_kern.c | 59
arch/um/kernel/initrd_user.c | 46
arch/um/kernel/main.c | 42
arch/um/kernel/process_kern.c | 36
arch/um/kernel/ptrace.c | 19
arch/um/kernel/sysrq.c | 21
arch/um/kernel/trap_kern.c | 1
arch/um/kernel/tt/process_kern.c | 8
arch/um/kernel/um_arch.c | 6
arch/um/sys-i386/sysrq.c | 80
arch/um/sys-ppc/sysrq.c | 14
arch/um/sys-x86_64/syscalls.c | 16
arch/um/sys-x86_64/sysrq.c | 11
arch/x86_64/Kconfig | 3
arch/x86_64/kernel/io_apic.c | 1
arch/x86_64/kernel/mpparse.c | 1
arch/x86_64/kernel/signal.c | 1
arch/x86_64/kernel/time.c | 2
arch/x86_64/kernel/traps.c | 2
arch/x86_64/kernel/x8664_ksyms.c | 3
drivers/acpi/Kconfig | 5
drivers/acpi/pci_irq.c | 4
drivers/atm/Makefile | 3
drivers/atm/fore200e.c | 6
drivers/atm/he.c | 6
drivers/atm/nicstar.c | 20
drivers/atm/zatm.c | 11
drivers/block/ub.c | 598 +-
drivers/cdrom/viocd.c | 14
drivers/char/ipmi/ipmi_devintf.c | 4
drivers/cpufreq/Kconfig | 24
drivers/cpufreq/Makefile | 1
drivers/cpufreq/cpufreq.c | 8
drivers/cpufreq/cpufreq_conservative.c | 586 ++
drivers/cpufreq/cpufreq_ondemand.c | 180 -
drivers/cpufreq/cpufreq_stats.c | 47
drivers/firmware/pcdp.c | 1
drivers/i2c/busses/i2c-ali1563.c | 46
drivers/ide/ide-cd.c | 52
drivers/ide/ide-disk.c | 41
drivers/ide/ide-floppy.c | 42
drivers/ide/ide-probe.c | 51
drivers/ide/ide-proc.c | 52
drivers/ide/ide-tape.c | 51
drivers/ide/ide.c | 307 -
drivers/ide/pci/amd74xx.c | 3
drivers/infiniband/core/sa_query.c | 35
drivers/infiniband/core/user_mad.c | 4
drivers/infiniband/include/ib_sa.h | 4
drivers/input/gameport/Kconfig | 20
drivers/input/joydev.c | 2
drivers/input/keyboard/atkbd.c | 6
drivers/input/mouse/psmouse-base.c | 7
drivers/input/mouse/synaptics.c | 39
drivers/input/mousedev.c | 15
drivers/input/serio/i8042-x86ia64io.h | 32
drivers/input/serio/i8042.c | 50
drivers/input/touchscreen/gunze.c | 3
drivers/macintosh/therm_adt746x.c | 125
drivers/macintosh/via-pmu.c | 8
drivers/media/dvb/bt8xx/dst.c | 122
drivers/media/video/bttv-i2c.c | 3
drivers/net/Kconfig | 10
drivers/net/Makefile | 1
drivers/net/amd8111e.c | 24
drivers/net/bnx2.c | 5530 +++++++++++++++++++++
drivers/net/bnx2.h | 4352 +++++++++++++++++
drivers/net/bnx2_fw.h | 2468 +++++++++
drivers/net/bonding/bond_main.c | 2
drivers/net/e100.c | 165 +
drivers/net/e1000/e1000.h | 37
drivers/net/e1000/e1000_ethtool.c | 105
drivers/net/e1000/e1000_hw.c | 2147 ++++++--
drivers/net/e1000/e1000_hw.h | 570 ++
drivers/net/e1000/e1000_main.c | 1147 +++-
drivers/net/e1000/e1000_osdep.h | 32
drivers/net/e1000/e1000_param.c | 3
drivers/net/forcedeth.c | 103
drivers/net/hamradio/baycom_epp.c | 126
drivers/net/iseries_veth.c | 32
drivers/net/ixgb/ixgb.h | 2
drivers/net/ixgb/ixgb_ee.c | 24
drivers/net/ixgb/ixgb_ethtool.c | 4
drivers/net/ixgb/ixgb_main.c | 153 -
drivers/net/ixgb/ixgb_osdep.h | 3
drivers/net/natsemi.c | 6
drivers/net/ns83820.c | 69
drivers/net/pcmcia/3c574_cs.c | 3
drivers/net/pcnet32.c | 7
drivers/net/r8169.c | 31
drivers/net/shaper.c | 86
drivers/net/sis900.c | 52
drivers/net/tg3.c | 571 ++
drivers/net/tlan.c | 12
drivers/net/tulip/media.c | 1
drivers/net/wireless/airo.c | 150 -
drivers/net/wireless/atmel_cs.c | 1
drivers/pci/hotplug/cpci_hotplug_core.c | 302 +
drivers/pci/hotplug/cpci_hotplug_pci.c | 144 -
drivers/pci/hotplug/shpchprm_acpi.c | 4
drivers/pci/quirks.c | 40
drivers/s390/net/Makefile | 3
drivers/s390/net/ctcdbug.h | 12
drivers/s390/net/ctcmain.c | 616 +-
drivers/s390/net/ctcmain.h | 276 +
drivers/s390/net/ctctty.c | 5
drivers/s390/net/cu3088.c | 4
drivers/s390/net/cu3088.h | 3
drivers/s390/net/iucv.c | 10
drivers/s390/net/lcs.c | 33
drivers/s390/net/qeth.h | 35
drivers/s390/net/qeth_eddp.c | 51
drivers/s390/net/qeth_main.c | 316 +
drivers/s390/net/qeth_tso.c | 285 -
drivers/s390/net/qeth_tso.h | 168 +
drivers/scsi/ahci.c | 3
drivers/scsi/aic7xxx/aic79xx_osm.c | 2
drivers/scsi/ata_piix.c | 18
drivers/scsi/ide-scsi.c | 86
drivers/scsi/libata-core.c | 498 ++
drivers/scsi/libata-scsi.c | 2
drivers/scsi/libata.h | 2
drivers/scsi/qla2xxx/qla_os.c | 24
drivers/scsi/sata_nv.c | 2
drivers/scsi/sata_promise.c | 3
drivers/scsi/sata_qstor.c | 2
drivers/scsi/sata_sil.c | 2
drivers/scsi/sata_sis.c | 1
drivers/scsi/sata_svw.c | 1
drivers/scsi/sata_sx4.c | 2
drivers/scsi/sata_uli.c | 1
drivers/scsi/sata_via.c | 1
drivers/scsi/sata_vsc.c | 2
drivers/scsi/scsi_scan.c | 1
drivers/serial/vr41xx_siu.c | 66
drivers/usb/atm/speedtch.c | 2
drivers/usb/core/sysfs.c | 22
drivers/usb/host/Kconfig | 11
drivers/usb/host/Makefile | 1
drivers/usb/host/sl811-hcd.c | 146 -
drivers/usb/host/sl811_cs.c | 442 ++
drivers/usb/input/hid-core.c | 18
drivers/usb/media/pwc/ChangeLog | 143 -
drivers/usb/media/pwc/Makefile | 2
drivers/usb/media/pwc/pwc-ctrl.c | 14
drivers/usb/media/pwc/pwc-dec1.c | 42
drivers/usb/media/pwc/pwc-dec1.h | 36
drivers/usb/media/pwc/pwc-dec23.c | 623 --
drivers/usb/media/pwc/pwc-dec23.h | 58
drivers/usb/media/pwc/pwc-if.c | 9
drivers/usb/media/pwc/pwc-kiara.c | 573 --
drivers/usb/media/pwc/pwc-timon.c | 1130 ----
drivers/usb/media/pwc/pwc-uncompress.c | 4
drivers/usb/net/usbnet.c | 2
drivers/usb/serial/Kconfig | 11
drivers/usb/serial/Makefile | 1
drivers/usb/serial/cp2101.c | 363 +
drivers/usb/serial/ftdi_sio.c | 3
drivers/usb/serial/ftdi_sio.h | 2
drivers/usb/serial/option.c | 729 +++
drivers/usb/serial/usb-serial.c | 20
drivers/usb/storage/unusual_devs.h | 9
drivers/video/intelfb/intelfbdrv.c | 22
fs/cifs/README | 4
fs/cifs/cifsproto.h | 2
fs/cifs/cifssmb.c | 56
fs/cifs/dir.c | 3
fs/cifs/inode.c | 24
fs/cifs/misc.c | 1
fs/hostfs/hostfs_kern.c | 1
fs/jbd/checkpoint.c | 5
fs/mpage.c | 5
fs/proc/proc_devtree.c | 105
fs/udf/udftime.c | 2
fs/xfs/linux-2.6/xfs_aops.c | 1
fs/xfs/linux-2.6/xfs_file.c | 7
fs/xfs/linux-2.6/xfs_ioctl32.c | 29
fs/xfs/linux-2.6/xfs_ioctl32.h | 6
fs/xfs/linux-2.6/xfs_super.c | 3
fs/xfs/xfs_iomap.c | 4
include/asm-i386/linkage.h | 4
include/asm-i386/timer.h | 1
include/asm-ia64/perfmon.h | 8
include/asm-ia64/sn/sn_sal.h | 28
include/asm-ppc/cpm2.h | 46
include/asm-ppc/m8260_pci.h | 1
include/asm-ppc/mpc8260.h | 2
include/asm-ppc64/iSeries/mf.h | 1
include/asm-ppc64/processor.h | 186 -
include/asm-ppc64/prom.h | 13
include/asm-ppc64/thread_info.h | 4
include/asm-s390/user.h | 2
include/asm-sh/thread_info.h | 2
include/asm-sh64/thread_info.h | 2
include/asm-sparc64/iommu.h | 2
include/asm-sparc64/pbm.h | 8
include/asm-sparc64/spitfire.h | 3
include/asm-um/page.h | 8
include/asm-um/pgtable.h | 8
include/asm-um/thread_info.h | 9
include/asm-x86_64/bug.h | 2
include/linux/acpi.h | 5
include/linux/cpufreq.h | 2
include/linux/etherdevice.h | 22
include/linux/ethtool.h | 1
include/linux/gameport.h | 28
include/linux/hardirq.h | 6
include/linux/ide.h | 20
include/linux/if_shaper.h | 3
include/linux/if_tr.h | 6
include/linux/inetdevice.h | 2
include/linux/libata.h | 59
include/linux/mii.h | 8
include/linux/netdevice.h | 5
include/linux/notifier.h | 1
include/linux/pci_ids.h | 8
include/linux/pkt_sched.h | 9
include/linux/sysctl.h | 1
include/linux/usb.h | 6
include/net/route.h | 3
include/net/xfrm.h | 2
init/Kconfig | 2
kernel/cpuset.c | 24
kernel/irq/handle.c | 2
kernel/module.c | 6
lib/Kconfig.debug | 3
net/802/tr.c | 26
net/bridge/br_device.c | 15
net/bridge/br_if.c | 23
net/bridge/br_input.c | 8
net/bridge/br_notify.c | 9
net/bridge/br_private.h | 1
net/bridge/br_stp_bpdu.c | 3
net/core/dev.c | 12
net/core/ethtool.c | 20
net/core/net-sysfs.c | 3
net/ipv4/devinet.c | 34
net/ipv4/esp4.c | 2
net/ipv4/ipvs/Makefile | 2
net/ipv4/ipvs/ip_vs_proto.c | 3
net/ipv4/ipvs/ip_vs_proto_icmp.c | 182 -
net/ipv4/multipath_drr.c | 18
net/ipv4/multipath_rr.c | 20
net/ipv4/netfilter/ip_queue.c | 10
net/ipv4/udp.c | 12
net/ipv6/ip6_flowlabel.c | 10
net/ipv6/ipv6_syms.c | 1
net/ipv6/xfrm6_policy.c | 4
net/sched/sch_dsmark.c | 16
net/sched/sch_netem.c | 211 -
net/xfrm/xfrm_policy.c | 4
sound/oss/Kconfig | 12
sound/ppc/pmac.c | 30
344 files changed, 24709 insertions(+), 8238 deletions(-)
^ permalink raw reply [flat|nested] 36+ messages in thread* Re: Linux v2.6.12-rc6 2005-06-06 18:08 Linux v2.6.12-rc6 Linus Torvalds @ 2005-06-06 19:26 ` Pavel Machek 2005-06-06 19:54 ` Jeff Garzik 2005-06-06 20:12 ` Linus Torvalds 2005-06-07 9:11 ` Johannes Stezenbach ` (3 subsequent siblings) 4 siblings, 2 replies; 36+ messages in thread From: Pavel Machek @ 2005-06-06 19:26 UTC (permalink / raw) To: Linus Torvalds; +Cc: Kernel Mailing List Hi! > It's being uploaded right now, the git tree is already up-to-date, and by > the time this hits the mailing list the mirroring of the tar-ball will > hopefully be done too. > > And since Jeff wrote me a shortlog script for git, the easist way to tell > what's new since -rc5 is to just do the shortlog and diffstat output. > Network drivers, USB and CPU-freq stand out. > > And the good news is that people do seem to have taken my rumblings about > calming down for 2.6.12 seriously. Let's hope that pans out, and I can > release that one asap.. But give this a good beating first, and holler > (again, if you must) about any issues you have, > Pavel Machek: > fix jumpy mouse cursor on console This one was from Dmitry, and git logs know that: author Pavel Machek <pavel@suse.cz> Fri, 27 May 2005 12:53:03 -0700 committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 28 May 2005 11:14:01 -0700 [PATCH] fix jumpy mouse cursor on console Do not send empty events to gpm. (Keyboards are assumed to have scroll wheel these days, that makes them part-mouse. That means typing on keyboard generates empty mouse events). From: Dmitry Torokhov <dtor_core@ameritech.net> Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> ...perhaps shortlog script needs some updating? Pavel ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 19:26 ` Pavel Machek @ 2005-06-06 19:54 ` Jeff Garzik 2005-06-06 20:05 ` Pavel Machek 2005-06-06 20:12 ` Linus Torvalds 1 sibling, 1 reply; 36+ messages in thread From: Jeff Garzik @ 2005-06-06 19:54 UTC (permalink / raw) To: Pavel Machek; +Cc: Linus Torvalds, Kernel Mailing List Pavel Machek wrote: > Hi! > > >>It's being uploaded right now, the git tree is already up-to-date, and by >>the time this hits the mailing list the mirroring of the tar-ball will >>hopefully be done too. >> >>And since Jeff wrote me a shortlog script for git, the easist way to tell >>what's new since -rc5 is to just do the shortlog and diffstat output. >>Network drivers, USB and CPU-freq stand out. >> >>And the good news is that people do seem to have taken my rumblings about >>calming down for 2.6.12 seriously. Let's hope that pans out, and I can >>release that one asap.. But give this a good beating first, and holler >>(again, if you must) about any issues you have, > > > >>Pavel Machek: >> fix jumpy mouse cursor on console > > > This one was from Dmitry, and git logs know that: > > author Pavel Machek <pavel@suse.cz> Fri, 27 May 2005 12:53:03 -0700 > committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 28 May 2005 11:14:01 -0700 > > [PATCH] fix jumpy mouse cursor on console > > Do not send empty events to gpm. (Keyboards are assumed to have scroll > wheel these days, that makes them part-mouse. That means typing on > keyboard generates empty mouse events). > > From: Dmitry Torokhov <dtor_core@ameritech.net> > Signed-off-by: Pavel Machek <pavel@suse.cz> > Signed-off-by: Andrew Morton <akpm@osdl.org> > Signed-off-by: Linus Torvalds <torvalds@osdl.org> > > ...perhaps shortlog script needs some updating? In git-whatchanged, you are listed as the author: > diff-tree c1e4c8d3ee3300f363a52fd4cf3d90fdf5098f5a (from 8bd7f125e2f217c8aa3dff0 > Author: Pavel Machek <pavel@suse.cz> > Date: Fri May 27 12:53:03 2005 -0700 > > [PATCH] fix jumpy mouse cursor on console > > Do not send empty events to gpm. (Keyboards are assumed to have scroll > wheel these days, that makes them part-mouse. That means typing on > keyboard generates empty mouse events). > > From: Dmitry Torokhov <dtor_core@ameritech.net> > Signed-off-by: Pavel Machek <pavel@suse.cz> > Signed-off-by: Andrew Morton <akpm@osdl.org> > Signed-off-by: Linus Torvalds <torvalds@osdl.org> '^Author: ' is what git-shortlog looks at. Regards, Jeff ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 19:54 ` Jeff Garzik @ 2005-06-06 20:05 ` Pavel Machek 2005-06-06 21:11 ` Linus Torvalds 0 siblings, 1 reply; 36+ messages in thread From: Pavel Machek @ 2005-06-06 20:05 UTC (permalink / raw) To: Jeff Garzik; +Cc: Linus Torvalds, Kernel Mailing List Hi! > >...perhaps shortlog script needs some updating? > > > In git-whatchanged, you are listed as the author: > > > >diff-tree c1e4c8d3ee3300f363a52fd4cf3d90fdf5098f5a (from > >8bd7f125e2f217c8aa3dff0 > >Author: Pavel Machek <pavel@suse.cz> > >Date: Fri May 27 12:53:03 2005 -0700 > > > > [PATCH] fix jumpy mouse cursor on console > > > > Do not send empty events to gpm. (Keyboards are assumed to have scroll > > wheel these days, that makes them part-mouse. That means typing on > > keyboard generates empty mouse events). > > > > From: Dmitry Torokhov <dtor_core@ameritech.net> > > Signed-off-by: Pavel Machek <pavel@suse.cz> > > Signed-off-by: Andrew Morton <akpm@osdl.org> > > Signed-off-by: Linus Torvalds <torvalds@osdl.org> > > '^Author: ' is what git-shortlog looks at. Linus, perhaps your scripts are doing something wrong? They should have taken From in the description; or did I provide wrong changelog? Pavel ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 20:05 ` Pavel Machek @ 2005-06-06 21:11 ` Linus Torvalds 2005-06-06 21:54 ` Bill Davidsen 0 siblings, 1 reply; 36+ messages in thread From: Linus Torvalds @ 2005-06-06 21:11 UTC (permalink / raw) To: Pavel Machek; +Cc: Jeff Garzik, Kernel Mailing List On Mon, 6 Jun 2005, Pavel Machek wrote: > > Linus, perhaps your scripts are doing something wrong? They should > have taken From in the description; or did I provide wrong changelog? My scripts definitely do the expected thing. In git, the author is always in the fixed header, and you never look for it anywhere else. However, in order for the author to _get_ there in the first place, the person who commits the thing needs to haev the author info. In this case it was me, and I get the author information from the email when I commit an emailed patch. I take it from the first line of the body if that one is a valid "From:" line, and otherwise I fall back to taking it from the headers of the email. So in this case you got tagged, either because the patch came through Andrew (it has his sign-off) and _he_ sent the email but incorrectly had you as the "From:" person, or alternatively because you sent the email and took Andrew's sign-off but didn't put the "From:" in the right spot. Linus ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 21:11 ` Linus Torvalds @ 2005-06-06 21:54 ` Bill Davidsen 0 siblings, 0 replies; 36+ messages in thread From: Bill Davidsen @ 2005-06-06 21:54 UTC (permalink / raw) To: Linus Torvalds; +Cc: Jeff Garzik, Kernel Mailing List Linus Torvalds wrote: > > On Mon, 6 Jun 2005, Pavel Machek wrote: > >>Linus, perhaps your scripts are doing something wrong? They should >>have taken From in the description; or did I provide wrong changelog? > > > My scripts definitely do the expected thing. > > In git, the author is always in the fixed header, and you never look for > it anywhere else. However, in order for the author to _get_ there in the > first place, the person who commits the thing needs to haev the author > info. > > In this case it was me, and I get the author information from the email > when I commit an emailed patch. I take it from the first line of the body > if that one is a valid "From:" line, and otherwise I fall back to taking > it from the headers of the email. > > So in this case you got tagged, either because the patch came through > Andrew (it has his sign-off) and _he_ sent the email but incorrectly had > you as the "From:" person, or alternatively because you sent the email and > took Andrew's sign-off but didn't put the "From:" in the right spot. Any process which only works when multiple people do everything correctly is not going to be robust. Perhaps you want to use the first "signed-off-by" line or some such, rather than relying on mail headers? ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 19:26 ` Pavel Machek 2005-06-06 19:54 ` Jeff Garzik @ 2005-06-06 20:12 ` Linus Torvalds 2005-06-06 20:14 ` Pavel Machek 1 sibling, 1 reply; 36+ messages in thread From: Linus Torvalds @ 2005-06-06 20:12 UTC (permalink / raw) To: Pavel Machek; +Cc: Kernel Mailing List On Mon, 6 Jun 2005, Pavel Machek wrote: > > Pavel Machek: > > fix jumpy mouse cursor on console > > This one was from Dmitry, and git logs know that: No it doesn't. Somebody sent me a patch in the wrong format.. > author Pavel Machek <pavel@suse.cz> Fri, 27 May 2005 12:53:03 -0700 > committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 28 May 2005 11:14:01 -0700 > > [PATCH] fix jumpy mouse cursor on console > > Do not send empty events to gpm. (Keyboards are assumed to have scroll > wheel these days, that makes them part-mouse. That means typing on > keyboard generates empty mouse events). > > From: Dmitry Torokhov <dtor_core@ameritech.net> > Signed-off-by: Pavel Machek <pavel@suse.cz> > Signed-off-by: Andrew Morton <akpm@osdl.org> > Signed-off-by: Linus Torvalds <torvalds@osdl.org> > > ...perhaps shortlog script needs some updating? No, it isn't going to go through the body of the email. The way that author attributions get done right is if the first line of the body of the email has a "From: xyzzy <abc@xyz.com>" in it. Linus ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 20:12 ` Linus Torvalds @ 2005-06-06 20:14 ` Pavel Machek 2005-06-06 21:13 ` Linus Torvalds 0 siblings, 1 reply; 36+ messages in thread From: Pavel Machek @ 2005-06-06 20:14 UTC (permalink / raw) To: Linus Torvalds; +Cc: Kernel Mailing List Hi! > > > fix jumpy mouse cursor on console > > > > This one was from Dmitry, and git logs know that: > > No it doesn't. Somebody sent me a patch in the wrong format.. Okay, that was probably me, but... > > author Pavel Machek <pavel@suse.cz> Fri, 27 May 2005 12:53:03 -0700 > > committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 28 May 2005 11:14:01 -0700 > > > > [PATCH] fix jumpy mouse cursor on console > > > > Do not send empty events to gpm. (Keyboards are assumed to have scroll > > wheel these days, that makes them part-mouse. That means typing on > > keyboard generates empty mouse events). > > > > From: Dmitry Torokhov <dtor_core@ameritech.net> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Pavel Machek <pavel@suse.cz> > > Signed-off-by: Andrew Morton <akpm@osdl.org> > > Signed-off-by: Linus Torvalds <torvalds@osdl.org> > > > > ...perhaps shortlog script needs some updating? > > No, it isn't going to go through the body of the email. > > The way that author attributions get done right is if the first line of > the body of the email has a "From: xyzzy <abc@xyz.com>" in it. There is "From: Dmitry..." in the changelog. Do your script move first "From:" into author header and delete it from changelog? That would explain it... Pavel ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 20:14 ` Pavel Machek @ 2005-06-06 21:13 ` Linus Torvalds 2005-06-06 21:18 ` Pavel Machek 2005-06-06 21:57 ` Jesper Juhl 0 siblings, 2 replies; 36+ messages in thread From: Linus Torvalds @ 2005-06-06 21:13 UTC (permalink / raw) To: Pavel Machek; +Cc: Kernel Mailing List On Mon, 6 Jun 2005, Pavel Machek wrote: > > There is "From: Dmitry..." in the changelog. Do your script move first > "From:" into author header and delete it from changelog? That would > explain it... Yes. But note how it doesn't even take the "first" From: line, it literally takes the From: line _only_ if that line is the first line in the email body. See the "git-tools" archive if you want to see all the ugly details (start from http://www.kernel.org/git) Linus ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 21:13 ` Linus Torvalds @ 2005-06-06 21:18 ` Pavel Machek 2005-06-06 21:36 ` Linus Torvalds 2005-06-06 21:57 ` Jesper Juhl 1 sibling, 1 reply; 36+ messages in thread From: Pavel Machek @ 2005-06-06 21:18 UTC (permalink / raw) To: Linus Torvalds; +Cc: Kernel Mailing List Hi! > > There is "From: Dmitry..." in the changelog. Do your script move first > > "From:" into author header and delete it from changelog? That would > > explain it... > > Yes. But note how it doesn't even take the "first" From: line, it > literally takes the From: line _only_ if that line is the first line in > the email body. > > See the "git-tools" archive if you want to see all the ugly details (start > from http://www.kernel.org/git) Aha, okay, it was going to you through andrew, and it was me who posted the changelog in form Description From: XXX Signed-off-by: YYY I thought you are taking "first From: in the body", not "From: only if it is first line in the body". [Could you perhaps modify your scripts to take "first From: in the body"? It seems logical to put From "near" Signed-of-by: lines... Pavel ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 21:18 ` Pavel Machek @ 2005-06-06 21:36 ` Linus Torvalds 2005-06-06 21:41 ` Pavel Machek 0 siblings, 1 reply; 36+ messages in thread From: Linus Torvalds @ 2005-06-06 21:36 UTC (permalink / raw) To: Pavel Machek; +Cc: Kernel Mailing List On Mon, 6 Jun 2005, Pavel Machek wrote: > > I thought you are taking "first From: in the body", not "From: only if > it is first line in the body". [Could you perhaps modify your scripts > to take "first From: in the body"? It seems logical to put From "near" > Signed-of-by: lines... I really don't want to, for a number of reasons. Most notably because I don't want to mix things up with the sign-off, because authorship and sign-off are really separate things (sign-offs accumulate, authorship stays), but also because it's not entirely unambiguous to parse these things. With the "first line only" rule, it ends up being pretty clear what's going on when the script suddenly ate one line.. Linus ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 21:36 ` Linus Torvalds @ 2005-06-06 21:41 ` Pavel Machek 2005-06-06 21:53 ` Linus Torvalds 0 siblings, 1 reply; 36+ messages in thread From: Pavel Machek @ 2005-06-06 21:41 UTC (permalink / raw) To: Linus Torvalds; +Cc: Kernel Mailing List Hi! > > I thought you are taking "first From: in the body", not "From: only if > > it is first line in the body". [Could you perhaps modify your scripts > > to take "first From: in the body"? It seems logical to put From "near" > > Signed-of-by: lines... > > I really don't want to, for a number of reasons. Most notably because I > don't want to mix things up with the sign-off, because authorship and > sign-off are really separate things (sign-offs accumulate, authorship > stays), but also because it's not entirely unambiguous to parse these > things. With the "first line only" rule, it ends up being pretty clear > what's going on when the script suddenly ate one line.. Okay, I see. I'm little afraid that during forwards blank line will be inserted before "From: " and break this, but lets see how it works. Pavel ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 21:41 ` Pavel Machek @ 2005-06-06 21:53 ` Linus Torvalds 0 siblings, 0 replies; 36+ messages in thread From: Linus Torvalds @ 2005-06-06 21:53 UTC (permalink / raw) To: Pavel Machek; +Cc: Kernel Mailing List On Mon, 6 Jun 2005, Pavel Machek wrote: > > Okay, I see. I'm little afraid that during forwards blank line will be > inserted before "From: " and break this, but lets see how it works. Oh, I skip blank lines (and that means any line that is "whitespace only", ie tabs/spaces etc won't confuse the scripts), so at least it's not _that_ subtle. Linus ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 21:13 ` Linus Torvalds 2005-06-06 21:18 ` Pavel Machek @ 2005-06-06 21:57 ` Jesper Juhl 2005-06-06 22:07 ` Russell King 1 sibling, 1 reply; 36+ messages in thread From: Jesper Juhl @ 2005-06-06 21:57 UTC (permalink / raw) To: Linus Torvalds; +Cc: Pavel Machek, Kernel Mailing List On 6/6/05, Linus Torvalds <torvalds@osdl.org> wrote: > > > On Mon, 6 Jun 2005, Pavel Machek wrote: > > > > There is "From: Dmitry..." in the changelog. Do your script move first > > "From:" into author header and delete it from changelog? That would > > explain it... > > Yes. But note how it doesn't even take the "first" From: line, it > literally takes the From: line _only_ if that line is the first line in > the email body. > A lot of times I see mails getting forwarded to you/Andrew/other maintainer by someone without adding a From: or other indication of who was the original author, but in almost all cases the original author is the one listed as the first Signed-off-by: since authors are the first to sign off on a patch, so, wouldn't it make more sense to pick the author like this ; 1) If there's a "From:" at the start of the email, use that (note: a lot of times this actually breaks since From: is often set by maintainers to the person who forwarded the mail, not the actual author, but that's a matter of educating maintainers). 2) if there's no "From:" in the mail body, pick first "signed-off-by:" 3) Fall back on email headers. -- Jesper Juhl <jesper.juhl@gmail.com> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html Plain text mails only, please http://www.expita.com/nomime.html ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 21:57 ` Jesper Juhl @ 2005-06-06 22:07 ` Russell King 0 siblings, 0 replies; 36+ messages in thread From: Russell King @ 2005-06-06 22:07 UTC (permalink / raw) To: Jesper Juhl; +Cc: Linus Torvalds, Pavel Machek, Kernel Mailing List On Mon, Jun 06, 2005 at 11:57:00PM +0200, Jesper Juhl wrote: > On 6/6/05, Linus Torvalds <torvalds@osdl.org> wrote: > > > > > > On Mon, 6 Jun 2005, Pavel Machek wrote: > > > > > > There is "From: Dmitry..." in the changelog. Do your script move first > > > "From:" into author header and delete it from changelog? That would > > > explain it... > > > > Yes. But note how it doesn't even take the "first" From: line, it > > literally takes the From: line _only_ if that line is the first line in > > the email body. > > > > A lot of times I see mails getting forwarded to you/Andrew/other > maintainer by someone without adding a From: or other indication of > who was the original author, but in almost all cases the original > author is the one listed as the first Signed-off-by: since authors are > the first to sign off on a patch, so, wouldn't it make more sense to > pick the author like this ; Not necessarily. Re-read what Signed-off-by: is all about and who may provide that line. You should find that the first Signed-off-by: line may not be the author themselves, but someone else who is able to satisfy our requirements. I think people will just have to accept that there's no way to _always_ _automatically_ get the proper author for every patch. (and that calling it author in git was probably the first mistake - we never had these issues with BK which didn't specifically indentify anything as being the "author" as such.) -- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 18:08 Linux v2.6.12-rc6 Linus Torvalds 2005-06-06 19:26 ` Pavel Machek @ 2005-06-07 9:11 ` Johannes Stezenbach 2005-06-08 11:15 ` Johannes Stezenbach 2005-06-07 13:05 ` Erik Mouw ` (2 subsequent siblings) 4 siblings, 1 reply; 36+ messages in thread From: Johannes Stezenbach @ 2005-06-07 9:11 UTC (permalink / raw) To: Linus Torvalds; +Cc: Kernel Mailing List [-- Attachment #1: Type: text/plain, Size: 692 bytes --] Hype-threading stopped working for me (probably due to me not enabling ACPI). dmesg output and .config attached. -rc5 worked fine. The board is an Asus P4P800-Deluxe. dmesg: WARNING: 1 siblings found for CPU0, should be 2 $ cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 15 model : 2 model name : Intel(R) Pentium(R) 4 CPU 2.60GHz stepping : 9 cpu MHz : 2606.438 cache size : 512 KB fdiv_bug : no hlt_bug : no f00f_bug : no coma_bug : no fpu : yes fpu_exception : yes cpuid level : 2 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe cid xtpr bogomips : 5144.57 Johannes [-- Attachment #2: dmesg --] [-- Type: text/plain, Size: 13594 bytes --] Linux version 2.6.12-rc6 (root@abc) (gcc version 3.3.6 (Debian 1:3.3.6-5)) #2 SMP Mon Jun 6 23:24:53 CEST 2005 BIOS-provided physical RAM map: BIOS-e820: 0000000000000000 - 000000000009fc00 (usable) BIOS-e820: 000000000009fc00 - 00000000000a0000 (reserved) BIOS-e820: 00000000000e8000 - 0000000000100000 (reserved) BIOS-e820: 0000000000100000 - 000000003ff30000 (usable) BIOS-e820: 000000003ff30000 - 000000003ff40000 (ACPI data) BIOS-e820: 000000003ff40000 - 000000003fff0000 (ACPI NVS) BIOS-e820: 000000003fff0000 - 0000000040000000 (reserved) BIOS-e820: 00000000ffb80000 - 0000000100000000 (reserved) Warning only 896MB will be used. Use a HIGHMEM enabled kernel. 896MB LOWMEM available. found SMP MP-table at 000ff780 On node 0 totalpages: 229376 DMA zone: 4096 pages, LIFO batch:1 Normal zone: 225280 pages, LIFO batch:31 HighMem zone: 0 pages, LIFO batch:1 DMI 2.3 present. Intel MultiProcessor Specification v1.4 Virtual Wire compatibility mode. OEM ID: ASUSTek Product ID: APIC at: 0xFEE00000 Processor #0 15:2 APIC version 20 I/O APIC #2 Version 32 at 0xFEC00000. Enabling APIC mode: Flat. Using 1 I/O APICs Processors: 1 Allocating PCI resources starting at 40000000 (gap: 40000000:bfb80000) Built 1 zonelists Kernel command line: root=/dev/hda7 ro video=vesa:ywrap,mtrr vga=0x317 nmi_watchdog=1 profile=1 kernel profiling enabled (shift: 1) mapped APIC to ffffd000 (fee00000) mapped IOAPIC to ffffc000 (fec00000) Initializing CPU#0 CPU 0 irqstacks, hard=c0551000 soft=c054f000 PID hash table entries: 4096 (order: 12, 65536 bytes) Detected 2606.438 MHz processor. Using tsc for high-res timesource Console: colour dummy device 80x25 Dentry cache hash table entries: 131072 (order: 7, 524288 bytes) Inode-cache hash table entries: 65536 (order: 6, 262144 bytes) Memory: 898172k/917504k available (2949k kernel code, 18832k reserved, 1228k data, 208k init, 0k highmem) Checking if this processor honours the WP bit even in supervisor mode... Ok. Calibrating delay loop... 5144.57 BogoMIPS (lpj=2572288) Mount-cache hash table entries: 512 CPU: After generic identify, caps: bfebfbff 00000000 00000000 00000000 00004400 00000000 00000000 CPU: After vendor identify, caps: bfebfbff 00000000 00000000 00000000 00004400 00000000 00000000 CPU: Trace cache: 12K uops, L1 D cache: 8K CPU: L2 cache: 512K CPU: Physical Processor ID: 0 CPU: After all inits, caps: bfebfbff 00000000 00000000 00000080 00004400 00000000 00000000 Intel machine check architecture supported. Intel machine check reporting enabled on CPU#0. CPU0: Intel P4/Xeon Extended MCE MSRs (12) available CPU0: Thermal monitoring enabled Enabling fast FPU save and restore... done. Enabling unmasked SIMD FPU exception support... done. Checking 'hlt' instruction... OK. CPU0: Intel(R) Pentium(R) 4 CPU 2.60GHz stepping 09 Total of 1 processors activated (5144.57 BogoMIPS). WARNING: 1 siblings found for CPU0, should be 2 ENABLING IO-APIC IRQs ..TIMER: vector=0x31 pin1=2 pin2=0 Brought up 1 CPUs CPU0 attaching sched-domain: domain 0: span 1 groups: 1 domain 1: span 1 groups: 1 NET: Registered protocol family 16 PCI: PCI BIOS revision 2.10 entry at 0xf0031, last bus=2 PCI: Using configuration type 1 mtrr: v2.0 (20020519) SCSI subsystem initialized usbcore: registered new driver usbfs usbcore: registered new driver hub PCI: Probing PCI hardware PCI: Probing PCI hardware (bus 00) PCI: Ignoring BAR0-3 of IDE controller 0000:00:1f.1 Boot video device is 0000:01:00.0 PCI: Transparent bridge - 0000:00:1e.0 PCI: Using IRQ router PIIX/ICH [8086/24d0] at 0000:00:1f.0 PCI->APIC IRQ transform: 0000:00:1d.0[A] -> IRQ 16 PCI->APIC IRQ transform: 0000:00:1d.1[B] -> IRQ 19 PCI->APIC IRQ transform: 0000:00:1d.2[C] -> IRQ 18 PCI->APIC IRQ transform: 0000:00:1d.3[A] -> IRQ 16 PCI->APIC IRQ transform: 0000:00:1d.7[D] -> IRQ 23 PCI->APIC IRQ transform: 0000:00:1f.1[A] -> IRQ 18 PCI->APIC IRQ transform: 0000:00:1f.3[B] -> IRQ 17 PCI->APIC IRQ transform: 0000:00:1f.5[B] -> IRQ 17 PCI->APIC IRQ transform: 0000:01:00.0[A] -> IRQ 16 PCI->APIC IRQ transform: 0000:02:03.0[A] -> IRQ 20 PCI->APIC IRQ transform: 0000:02:05.0[A] -> IRQ 22 PCI->APIC IRQ transform: 0000:02:09.0[A] -> IRQ 21 PCI->APIC IRQ transform: 0000:02:0b.0[A] -> IRQ 23 PCI->APIC IRQ transform: 0000:02:0c.0[A] -> IRQ 20 PCI->APIC IRQ transform: 0000:02:0d.0[A] -> IRQ 21 PCI->APIC IRQ transform: 0000:02:0d.1[A] -> IRQ 21 Machine check exception polling timer started. apm: BIOS version 1.2 Flags 0x03 (Driver version 1.16ac) Installing knfsd (copyright (C) 1996 okir@monad.swb.de). Initializing Cryptographic API vesafb: framebuffer at 0xfa000000, mapped to 0xf8880000, using 3072k, total 32768k vesafb: mode is 1024x768x16, linelength=2048, pages=9 vesafb: protected mode interface info at c000:7d40 vesafb: scrolling: redraw vesafb: Truecolor: size=0:5:6:5, shift=0:11:5:0 Console: switching to colour frame buffer device 128x48 fb0: VESA VGA frame buffer device Real Time Clock Driver v1.12 Non-volatile memory driver v1.2 Linux agpgart interface v0.101 (c) Dave Jones agpgart: Detected an Intel 865 Chipset. agpgart: AGP aperture is 128M @ 0xf0000000 [drm] Initialized drm 1.0.0 20040925 [drm] Initialized mga 3.1.0 20021029 on minor 0: Matrox Graphics, Inc. MGA G550 AGP Hangcheck: starting hangcheck timer 0.9.0 (tick is 180 seconds, margin is 60 seconds). Hangcheck: Using monotonic_clock(). serio: i8042 AUX port at 0x60,0x64 irq 12 serio: i8042 KBD port at 0x60,0x64 irq 1 io scheduler noop registered io scheduler anticipatory registered io scheduler deadline registered io scheduler cfq registered Floppy drive(s): fd0 is 1.44M FDC 0 is a post-1991 82077 loop: loaded (max 8 devices) eth0: 3Com Gigabit LOM (3C940) PrefPort:A RlmtMode:Check Link State PPP generic driver version 2.4.2 PPP Deflate Compression module registered PPP BSD Compression module registered NET: Registered protocol family 24 8139too Fast Ethernet driver 0.9.27 eth1: RealTek RTL8139 at 0xf8826000, 00:00:1c:db:d7:b7, IRQ 23 eth1: Identified 8139 chip type 'RTL-8139B' Uniform Multi-Platform E-IDE driver Revision: 7.00alpha2 ide: Assuming 33MHz system bus speed for PIO modes; override with idebus=xx ICH5: IDE controller at PCI slot 0000:00:1f.1 PCI: Enabling device 0000:00:1f.1 (0005 -> 0007) ICH5: chipset revision 2 ICH5: not 100% native mode: will probe irqs later ide0: BM-DMA at 0xfc00-0xfc07, BIOS settings: hda:DMA, hdb:pio ide1: BM-DMA at 0xfc08-0xfc0f, BIOS settings: hdc:DMA, hdd:pio Probing IDE interface ide0... hda: SAMSUNG SP1614N, ATA DISK drive ide0 at 0x1f0-0x1f7,0x3f6 on irq 14 Probing IDE interface ide1... hdc: TEAC DV-W50D, ATAPI CD/DVD-ROM drive ide1 at 0x170-0x177,0x376 on irq 15 Probing IDE interface ide2... Probing IDE interface ide3... Probing IDE interface ide4... Probing IDE interface ide5... hda: max request size: 1024KiB hda: 312581808 sectors (160041 MB) w/8192KiB Cache, CHS=19457/255/63, UDMA(100) hda: cache flushes supported hda: hda1 hda2 < hda5 hda6 hda7 hda8 hda9 hda10 hda11 hda12 > hdc: ATAPI 32X DVD-ROM DVD-R CD-R/RW drive, 2000kB Cache, UDMA(33) Uniform CD-ROM driver Revision: 3.20 ohci1394: $Rev: 1250 $ Ben Collins <bcollins@debian.org> ohci1394: fw-host0: OHCI-1394 1.0 (PCI): IRQ=[20] MMIO=[feaff800-feafffff] Max Packet=[2048] ieee1394: raw1394: /dev/raw1394 device initialized sbp2: $Rev: 1219 $ Ben Collins <bcollins@debian.org> PCI: Setting latency timer of device 0000:00:1d.7 to 64 ehci_hcd 0000:00:1d.7: Intel Corporation 82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller ehci_hcd 0000:00:1d.7: debug port 1 ehci_hcd 0000:00:1d.7: new USB bus registered, assigned bus number 1 ehci_hcd 0000:00:1d.7: irq 23, io mem 0xfebffc00 PCI: cache line size of 128 is not supported by device 0000:00:1d.7 ehci_hcd 0000:00:1d.7: USB 2.0 initialized, EHCI 1.00, driver 10 Dec 2004 hub 1-0:1.0: USB hub found hub 1-0:1.0: 8 ports detected USB Universal Host Controller Interface driver v2.2 PCI: Setting latency timer of device 0000:00:1d.0 to 64 uhci_hcd 0000:00:1d.0: Intel Corporation 82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1 uhci_hcd 0000:00:1d.0: new USB bus registered, assigned bus number 2 uhci_hcd 0000:00:1d.0: irq 16, io base 0x0000ef00 hub 2-0:1.0: USB hub found hub 2-0:1.0: 2 ports detected PCI: Setting latency timer of device 0000:00:1d.1 to 64 uhci_hcd 0000:00:1d.1: Intel Corporation 82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2 uhci_hcd 0000:00:1d.1: new USB bus registered, assigned bus number 3 uhci_hcd 0000:00:1d.1: irq 19, io base 0x0000ef20 hub 3-0:1.0: USB hub found hub 3-0:1.0: 2 ports detected PCI: Setting latency timer of device 0000:00:1d.2 to 64 uhci_hcd 0000:00:1d.2: Intel Corporation 82801EB/ER (ICH5/ICH5R) USB UHCI #3 uhci_hcd 0000:00:1d.2: new USB bus registered, assigned bus number 4 uhci_hcd 0000:00:1d.2: irq 18, io base 0x0000ef40 hub 4-0:1.0: USB hub found hub 4-0:1.0: 2 ports detected PCI: Setting latency timer of device 0000:00:1d.3 to 64 uhci_hcd 0000:00:1d.3: Intel Corporation 82801EB/ER (ICH5/ICH5R) USB UHCI Controller #4 uhci_hcd 0000:00:1d.3: new USB bus registered, assigned bus number 5 uhci_hcd 0000:00:1d.3: irq 16, io base 0x0000ef80 hub 5-0:1.0: USB hub found hub 5-0:1.0: 2 ports detected usbcore: registered new driver usblp drivers/usb/class/usblp.c: v0.13: USB Printer Device Class driver Initializing USB Mass Storage driver... usbcore: registered new driver usb-storage USB Mass Storage support registered. usbcore: registered new driver hiddev usbcore: registered new driver usbhid drivers/usb/input/hid-core.c: v2.01:USB HID core driver mice: PS/2 mouse device common for all mice i2c /dev entries driver device-mapper: 4.4.0-ioctl (2005-01-12) initialised: dm-devel@redhat.com Advanced Linux Sound Architecture Driver Version 1.0.9rc2 (Thu Mar 24 10:33:39 2005 UTC). specify port PCI: Setting latency timer of device 0000:00:1f.5 to 64 input: AT Translated Set 2 keyboard on isa0060/serio0 input: ImPS/2 Generic Wheel Mouse on isa0060/serio1 AC'97 0 analog subsections not ready intel8x0_measure_ac97_clock: measured 49387 usecs intel8x0: clocking to 48000 ALSA device list: #0: Intel ICH5 with AD1985 at 0xfebff800, irq 17 NET: Registered protocol family 2 IP: routing cache hash table of 4096 buckets, 64Kbytes TCP established hash table entries: 131072 (order: 9, 2097152 bytes) TCP bind hash table entries: 65536 (order: 8, 1048576 bytes) TCP: Hash tables configured (established 131072 bind 65536) ip_conntrack version 2.1 (7168 buckets, 57344 max) - 224 bytes per conntrack ip_tables: (C) 2000-2002 Netfilter core team NET: Registered protocol family 1 NET: Registered protocol family 17 Testing NMI watchdog ... OK. EXT3-fs: mounted filesystem with ordered data mode. VFS: Mounted root (ext3 filesystem) readonly. Freeing unused kernel memory: 208k freed kjournald starting. Commit interval 5 seconds ieee1394: Host added: ID:BUS[0-00:1023] GUID[00e018000047e68c] Adding 1012052k swap on /dev/hda6. Priority:-1 extents:1 EXT3 FS on hda7, internal journal Serial: 8250/16550 driver $Revision: 1.90 $ 8 ports, IRQ sharing disabled ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A ttyS1 at I/O 0x2f8 (irq = 3) is a 16550A kjournald starting. Commit interval 5 seconds EXT3 FS on hda8, internal journal EXT3-fs: mounted filesystem with ordered data mode. Linux video capture interface: v1.00 saa7146: register extension 'dvb'. saa7146: found saa7146 @ mem f8c46400 (revision 1, irq 21) (0x110a,0x0000). DVB: registering new adapter (Fujitsu Siemens DVB-C). adapter has MAC addr = 00:d0:5c:02:04:4b dvb-ttpci: gpioirq unknown type=0 len=0 dvb-ttpci: info @ card 0: firm f0240009, rtsl b0250018, vid 71010068, app 8000261d dvb-ttpci: firmware @ card 0 supports CI link layer interface dvb-ttpci: DVB-C analog module @ card 0 detected, initializing MSP3400 saa7146_vv: saa7146 (0): registered device video0 [v4l2] saa7146_vv: saa7146 (0): registered device vbi0 [v4l2] DVB: registering frontend 0 (VLSI VES1820 DVB-C)... dvb-ttpci: found av7110-0. saa7130/34: v4l2 driver version 0.2.12 loaded saa7134[0]: found at 0000:02:0c.0, rev: 1, irq: 20, latency: 64, mmio: 0xfeafec00 saa7134[0]: subsystem: 1131:6752, board: BMK MPEX Tuner [card=23,insmod option] saa7134[0]: board init: gpio is 10000 saa7134[0]: i2c eeprom 00: 31 11 52 67 06 80 00 01 00 00 00 00 00 00 01 00 saa7134[0]: i2c eeprom 10: 00 ff c2 0f ff ff ff ff ff ff ff ff ff ff ff ff saa7134[0]: i2c eeprom 20: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff saa7134[0]: i2c eeprom 30: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff tuner 2-0060: chip found @ 0xc0 (saa7134[0]) tuner 2-0060: type set to 5 (Philips PAL_BG (FI1216 and compatibles)) saa6752hs: chip found @ 0x40 saa7134[0]: registered device video1 [v4l2] saa7134[0]: registered device vbi1 bttv: driver version 0.9.15 loaded bttv: using 8 buffers with 2080k (520 pages) each for capture bttv: Bt8xx card found (0). bttv0: Bt878 (rev 17) at 0000:02:0d.0, irq: 21, latency: 64, mmio: 0xfd7fe000 bttv0: detected: Twinhan VisionPlus DVB [card=113], PCI subsystem ID is 1822:0001 bttv0: using: Twinhan DST + clones [card=113,autodetected] bttv0: gpio: en=00000000, out=00000000 in=00f789ff [init] bttv0: using tuner=4 bttv0: add subdevice "dvb0" bt878: AUDIO driver version 0.0.0 loaded bt878: Bt878 AUDIO function found (0). bt878(0): Bt878 (rev 17) at 02:0d.1, irq: 21, latency: 64, memory: 0xfd7ff000 saa7134[0]/audio: audio carrier scan failed, using 5.500 MHz [default] eth0: network connection up using port A speed: 100 autonegotiation: yes duplex mode: full flowctrl: symmetric irq moderation: disabled scatter-gather: enabled [-- Attachment #3: .config --] [-- Type: text/plain, Size: 36047 bytes --] # # Automatically generated make config: don't edit # Linux kernel version: 2.6.12-rc6 # Mon Jun 6 23:16:45 2005 # CONFIG_X86=y CONFIG_MMU=y CONFIG_UID16=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y # # Code maturity level options # CONFIG_EXPERIMENTAL=y CONFIG_CLEAN_COMPILE=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # CONFIG_LOCALVERSION="" CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set # CONFIG_CPUSETS is not set # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y CONFIG_CC_ALIGN_FUNCTIONS=0 CONFIG_CC_ALIGN_LABELS=0 CONFIG_CC_ALIGN_LOOPS=0 CONFIG_CC_ALIGN_JUMPS=0 # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # # Loadable module support # CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_OBSOLETE_MODPARM=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y CONFIG_STOP_MACHINE=y # # Processor type and features # CONFIG_X86_PC=y # CONFIG_X86_ELAN is not set # CONFIG_X86_VOYAGER is not set # CONFIG_X86_NUMAQ is not set # CONFIG_X86_SUMMIT is not set # CONFIG_X86_BIGSMP is not set # CONFIG_X86_VISWS is not set # CONFIG_X86_GENERICARCH is not set # CONFIG_X86_ES7000 is not set # CONFIG_M386 is not set # CONFIG_M486 is not set # CONFIG_M586 is not set # CONFIG_M586TSC is not set # CONFIG_M586MMX is not set # CONFIG_M686 is not set # CONFIG_MPENTIUMII is not set # CONFIG_MPENTIUMIII is not set # CONFIG_MPENTIUMM is not set CONFIG_MPENTIUM4=y # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set # CONFIG_MCRUSOE is not set # CONFIG_MEFFICEON is not set # CONFIG_MWINCHIPC6 is not set # CONFIG_MWINCHIP2 is not set # CONFIG_MWINCHIP3D is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set # CONFIG_X86_GENERIC is not set CONFIG_X86_CMPXCHG=y CONFIG_X86_XADD=y CONFIG_X86_L1_CACHE_SHIFT=7 CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y CONFIG_X86_GOOD_APIC=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y # CONFIG_HPET_TIMER is not set CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_SCHED_SMT=y CONFIG_PREEMPT=y CONFIG_PREEMPT_BKL=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_TSC=y CONFIG_X86_MCE=y CONFIG_X86_MCE_NONFATAL=y CONFIG_X86_MCE_P4THERMAL=y # CONFIG_TOSHIBA is not set # CONFIG_I8K is not set # CONFIG_X86_REBOOTFIXUPS is not set # CONFIG_MICROCODE is not set CONFIG_X86_MSR=y # CONFIG_X86_CPUID is not set # # Firmware Drivers # # CONFIG_EDD is not set CONFIG_NOHIGHMEM=y # CONFIG_HIGHMEM4G is not set # CONFIG_HIGHMEM64G is not set # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y CONFIG_IRQBALANCE=y CONFIG_HAVE_DEC_LOCK=y CONFIG_REGPARM=y CONFIG_SECCOMP=y # # Power management options (ACPI, APM) # CONFIG_PM=y # CONFIG_PM_DEBUG is not set # CONFIG_SOFTWARE_SUSPEND is not set # # ACPI (Advanced Configuration and Power Interface) Support # # CONFIG_ACPI is not set # # APM (Advanced Power Management) BIOS Support # CONFIG_APM=y # CONFIG_APM_IGNORE_USER_SUSPEND is not set # CONFIG_APM_DO_ENABLE is not set # CONFIG_APM_CPU_IDLE is not set # CONFIG_APM_DISPLAY_BLANK is not set # CONFIG_APM_RTC_IS_GMT is not set # CONFIG_APM_ALLOW_INTS is not set CONFIG_APM_REAL_MODE_POWER_OFF=y # # CPU Frequency scaling # # CONFIG_CPU_FREQ is not set # # Bus options (PCI, PCMCIA, EISA, MCA, ISA) # CONFIG_PCI=y # CONFIG_PCI_GOBIOS is not set # CONFIG_PCI_GOMMCONFIG is not set # CONFIG_PCI_GODIRECT is not set CONFIG_PCI_GOANY=y CONFIG_PCI_BIOS=y CONFIG_PCI_DIRECT=y # CONFIG_PCIEPORTBUS is not set # CONFIG_PCI_MSI is not set # CONFIG_PCI_LEGACY_PROC is not set CONFIG_PCI_NAMES=y # CONFIG_PCI_DEBUG is not set CONFIG_ISA_DMA_API=y CONFIG_ISA=y # CONFIG_EISA is not set # CONFIG_MCA is not set # CONFIG_SCx200 is not set # # PCCARD (PCMCIA/CardBus) support # # CONFIG_PCCARD is not set # # PCI Hotplug Support # # CONFIG_HOTPLUG_PCI is not set # # Executable file formats # CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set # # Device Drivers # # # Generic Driver Options # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set # # Memory Technology Devices (MTD) # # CONFIG_MTD is not set # # Parallel port support # CONFIG_PARPORT=m CONFIG_PARPORT_PC=m # CONFIG_PARPORT_SERIAL is not set CONFIG_PARPORT_PC_FIFO=y # CONFIG_PARPORT_PC_SUPERIO is not set # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_1284=y # # Plug and Play support # # CONFIG_PNP is not set # # Block devices # CONFIG_BLK_DEV_FD=y # CONFIG_BLK_DEV_XD is not set # CONFIG_PARIDE is not set # CONFIG_BLK_CPQ_DA is not set # CONFIG_BLK_CPQ_CISS_DA is not set # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_CRYPTOLOOP=y # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_INITRAMFS_SOURCE="" # CONFIG_LBD is not set # CONFIG_CDROM_PKTCDVD is not set # # IO Schedulers # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y # CONFIG_ATA_OVER_ETH is not set # # ATA/ATAPI/MFM/RLL support # CONFIG_IDE=y CONFIG_BLK_DEV_IDE=y # # Please see Documentation/ide.txt for help/info on IDE drives # # CONFIG_BLK_DEV_IDE_SATA is not set # CONFIG_BLK_DEV_HD_IDE is not set CONFIG_BLK_DEV_IDEDISK=y # CONFIG_IDEDISK_MULTI_MODE is not set CONFIG_BLK_DEV_IDECD=y # CONFIG_BLK_DEV_IDETAPE is not set # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set # # IDE chipset support/bugfixes # CONFIG_IDE_GENERIC=y # CONFIG_BLK_DEV_CMD640 is not set CONFIG_BLK_DEV_IDEPCI=y CONFIG_IDEPCI_SHARE_IRQ=y # CONFIG_BLK_DEV_OFFBOARD is not set CONFIG_BLK_DEV_GENERIC=y # CONFIG_BLK_DEV_OPTI621 is not set # CONFIG_BLK_DEV_RZ1000 is not set CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set # CONFIG_BLK_DEV_AMD74XX is not set # CONFIG_BLK_DEV_ATIIXP is not set # CONFIG_BLK_DEV_CMD64X is not set # CONFIG_BLK_DEV_TRIFLEX is not set # CONFIG_BLK_DEV_CY82C693 is not set # CONFIG_BLK_DEV_CS5520 is not set # CONFIG_BLK_DEV_CS5530 is not set # CONFIG_BLK_DEV_HPT34X is not set # CONFIG_BLK_DEV_HPT366 is not set # CONFIG_BLK_DEV_SC1200 is not set CONFIG_BLK_DEV_PIIX=y # CONFIG_BLK_DEV_NS87415 is not set # CONFIG_BLK_DEV_PDC202XX_OLD is not set # CONFIG_BLK_DEV_PDC202XX_NEW is not set # CONFIG_BLK_DEV_SVWKS is not set # CONFIG_BLK_DEV_SIIMAGE is not set # CONFIG_BLK_DEV_SIS5513 is not set # CONFIG_BLK_DEV_SLC90E66 is not set # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_VIA82CXXX is not set # CONFIG_IDE_ARM is not set # CONFIG_IDE_CHIPSETS is not set CONFIG_BLK_DEV_IDEDMA=y # CONFIG_IDEDMA_IVB is not set CONFIG_IDEDMA_AUTO=y # CONFIG_BLK_DEV_HD is not set # # SCSI device support # CONFIG_SCSI=y CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set # CONFIG_CHR_DEV_SG is not set # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_LOGGING is not set # # SCSI Transport Attributes # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set # # SCSI low-level drivers # # CONFIG_BLK_DEV_3W_XXXX_RAID is not set # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_AHA152X is not set # CONFIG_SCSI_AHA1542 is not set # CONFIG_SCSI_AACRAID is not set # CONFIG_SCSI_AIC7XXX is not set # CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_AIC79XX is not set # CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_SCSI_SATA is not set # CONFIG_SCSI_BUSLOGIC is not set # CONFIG_SCSI_DMX3191D is not set # CONFIG_SCSI_DTC3280 is not set # CONFIG_SCSI_EATA is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_GDTH is not set # CONFIG_SCSI_GENERIC_NCR5380 is not set # CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INIA100 is not set # CONFIG_SCSI_PPA is not set # CONFIG_SCSI_IMM is not set # CONFIG_SCSI_NCR53C406A is not set # CONFIG_SCSI_SYM53C8XX_2 is not set # CONFIG_SCSI_IPR is not set # CONFIG_SCSI_PAS16 is not set # CONFIG_SCSI_PSI240I is not set # CONFIG_SCSI_QLOGIC_FAS is not set # CONFIG_SCSI_QLOGIC_FC is not set # CONFIG_SCSI_QLOGIC_1280 is not set CONFIG_SCSI_QLA2XXX=y # CONFIG_SCSI_QLA21XX is not set # CONFIG_SCSI_QLA22XX is not set # CONFIG_SCSI_QLA2300 is not set # CONFIG_SCSI_QLA2322 is not set # CONFIG_SCSI_QLA6312 is not set # CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_T128 is not set # CONFIG_SCSI_U14_34F is not set # CONFIG_SCSI_ULTRASTOR is not set # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set # # Old CD-ROM drivers (not SCSI, not IDE) # # CONFIG_CD_NO_IDESCSI is not set # # Multi-device support (RAID and LVM) # CONFIG_MD=y # CONFIG_BLK_DEV_MD is not set CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y # CONFIG_DM_SNAPSHOT is not set # CONFIG_DM_MIRROR is not set # CONFIG_DM_ZERO is not set # CONFIG_DM_MULTIPATH is not set # # Fusion MPT device support # # CONFIG_FUSION is not set # # IEEE 1394 (FireWire) support # CONFIG_IEEE1394=y # # Subsystem Options # # CONFIG_IEEE1394_VERBOSEDEBUG is not set # CONFIG_IEEE1394_OUI_DB is not set CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y # CONFIG_IEEE1394_CONFIG_ROM_IP1394 is not set # # Device Drivers # # CONFIG_IEEE1394_PCILYNX is not set CONFIG_IEEE1394_OHCI1394=y # # Protocol Drivers # # CONFIG_IEEE1394_VIDEO1394 is not set CONFIG_IEEE1394_SBP2=y # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set # CONFIG_IEEE1394_ETH1394 is not set CONFIG_IEEE1394_DV1394=y CONFIG_IEEE1394_RAWIO=y # CONFIG_IEEE1394_CMP is not set # # I2O device support # # CONFIG_I2O is not set # # Networking support # CONFIG_NET=y # # Networking options # CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_IP_MROUTE is not set # CONFIG_ARPD is not set CONFIG_SYN_COOKIES=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_TUNNEL is not set CONFIG_IP_TCPDIAG=y # CONFIG_IP_TCPDIAG_IPV6 is not set # # IP: Virtual Server Configuration # # CONFIG_IP_VS is not set # CONFIG_IPV6 is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set # # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=y # CONFIG_IP_NF_CT_ACCT is not set # CONFIG_IP_NF_CONNTRACK_MARK is not set # CONFIG_IP_NF_CT_PROTO_SCTP is not set CONFIG_IP_NF_FTP=y CONFIG_IP_NF_IRC=y # CONFIG_IP_NF_TFTP is not set # CONFIG_IP_NF_AMANDA is not set CONFIG_IP_NF_QUEUE=y CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_MATCH_LIMIT=y CONFIG_IP_NF_MATCH_IPRANGE=y CONFIG_IP_NF_MATCH_MAC=y CONFIG_IP_NF_MATCH_PKTTYPE=y CONFIG_IP_NF_MATCH_MARK=y CONFIG_IP_NF_MATCH_MULTIPORT=y # CONFIG_IP_NF_MATCH_TOS is not set # CONFIG_IP_NF_MATCH_RECENT is not set # CONFIG_IP_NF_MATCH_ECN is not set # CONFIG_IP_NF_MATCH_DSCP is not set # CONFIG_IP_NF_MATCH_AH_ESP is not set # CONFIG_IP_NF_MATCH_LENGTH is not set # CONFIG_IP_NF_MATCH_TTL is not set # CONFIG_IP_NF_MATCH_TCPMSS is not set # CONFIG_IP_NF_MATCH_HELPER is not set CONFIG_IP_NF_MATCH_STATE=y CONFIG_IP_NF_MATCH_CONNTRACK=y CONFIG_IP_NF_MATCH_OWNER=y CONFIG_IP_NF_MATCH_ADDRTYPE=y # CONFIG_IP_NF_MATCH_REALM is not set # CONFIG_IP_NF_MATCH_SCTP is not set # CONFIG_IP_NF_MATCH_COMMENT is not set # CONFIG_IP_NF_MATCH_HASHLIMIT is not set CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y CONFIG_IP_NF_TARGET_LOG=y CONFIG_IP_NF_TARGET_ULOG=y # CONFIG_IP_NF_TARGET_TCPMSS is not set CONFIG_IP_NF_NAT=y CONFIG_IP_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=y # CONFIG_IP_NF_TARGET_REDIRECT is not set # CONFIG_IP_NF_TARGET_NETMAP is not set # CONFIG_IP_NF_TARGET_SAME is not set # CONFIG_IP_NF_NAT_SNMP_BASIC is not set CONFIG_IP_NF_NAT_IRC=y CONFIG_IP_NF_NAT_FTP=y # CONFIG_IP_NF_MANGLE is not set # CONFIG_IP_NF_RAW is not set # CONFIG_IP_NF_ARPTABLES is not set # # SCTP Configuration (EXPERIMENTAL) # # CONFIG_IP_SCTP is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # # QoS and/or fair queueing # # CONFIG_NET_SCHED is not set # CONFIG_NET_CLS_ROUTE is not set # # Network testing # CONFIG_NET_PKTGEN=m # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set # # ARCnet devices # # CONFIG_ARCNET is not set # # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set # CONFIG_NET_VENDOR_3COM is not set # CONFIG_LANCE is not set # CONFIG_NET_VENDOR_SMC is not set # CONFIG_NET_VENDOR_RACAL is not set # # Tulip family network device support # # CONFIG_NET_TULIP is not set # CONFIG_AT1700 is not set # CONFIG_DEPCA is not set # CONFIG_HP100 is not set # CONFIG_NET_ISA is not set CONFIG_NET_PCI=y # CONFIG_PCNET32 is not set # CONFIG_AMD8111_ETH is not set # CONFIG_ADAPTEC_STARFIRE is not set # CONFIG_AC3200 is not set # CONFIG_APRICOT is not set # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set # CONFIG_CS89x0 is not set # CONFIG_DGRS is not set # CONFIG_EEPRO100 is not set # CONFIG_E100 is not set # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set # CONFIG_8139CP is not set CONFIG_8139TOO=y # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_8139TOO_8129 is not set # CONFIG_8139_OLD_RX_RESET is not set # CONFIG_SIS900 is not set # CONFIG_EPIC100 is not set # CONFIG_SUNDANCE is not set # CONFIG_TLAN is not set # CONFIG_VIA_RHINE is not set # CONFIG_NET_POCKET is not set # # Ethernet (1000 Mbit) # # CONFIG_ACENIC is not set # CONFIG_DL2K is not set # CONFIG_E1000 is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set # CONFIG_R8169 is not set CONFIG_SK98LIN=y # CONFIG_VIA_VELOCITY is not set # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set # # Ethernet (10000 Mbit) # # CONFIG_IXGB is not set # CONFIG_S2IO is not set # # Token Ring devices # # CONFIG_TR is not set # # Wireless LAN (non-hamradio) # # CONFIG_NET_RADIO is not set # # Wan interfaces # # CONFIG_WAN is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_PLIP is not set CONFIG_PPP=y # CONFIG_PPP_MULTILINK is not set CONFIG_PPP_FILTER=y CONFIG_PPP_ASYNC=y CONFIG_PPP_SYNC_TTY=y CONFIG_PPP_DEFLATE=y CONFIG_PPP_BSDCOMP=y CONFIG_PPPOE=y # CONFIG_SLIP is not set # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # # ISDN subsystem # # CONFIG_ISDN is not set # # Telephony Support # # CONFIG_PHONE is not set # # Input device support # CONFIG_INPUT=y # # Userland interfaces # CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_INPORT is not set # CONFIG_MOUSE_LOGIBM is not set # CONFIG_MOUSE_PC110PAD is not set # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_PCSPKR is not set CONFIG_INPUT_UINPUT=y # # Hardware I/O ports # CONFIG_SERIO=y CONFIG_SERIO_I8042=y CONFIG_SERIO_SERPORT=y # CONFIG_SERIO_CT82C710 is not set # CONFIG_SERIO_PARKBD is not set # CONFIG_SERIO_PCIPS2 is not set CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_RAW=y # CONFIG_GAMEPORT is not set # # Character devices # CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y # CONFIG_SERIAL_NONSTANDARD is not set # # Serial drivers # CONFIG_SERIAL_8250=m CONFIG_SERIAL_8250_NR_UARTS=4 # CONFIG_SERIAL_8250_EXTENDED is not set # # Non-8250 serial port support # CONFIG_SERIAL_CORE=m # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m # CONFIG_TIPAR is not set # # IPMI # # CONFIG_IPMI_HANDLER is not set # # Watchdog Cards # # CONFIG_WATCHDOG is not set # CONFIG_HW_RANDOM is not set CONFIG_NVRAM=y CONFIG_RTC=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set # CONFIG_SONYPI is not set # # Ftape, the floppy tape device driver # CONFIG_AGP=y # CONFIG_AGP_ALI is not set # CONFIG_AGP_ATI is not set # CONFIG_AGP_AMD is not set # CONFIG_AGP_AMD64 is not set CONFIG_AGP_INTEL=y # CONFIG_AGP_NVIDIA is not set # CONFIG_AGP_SIS is not set # CONFIG_AGP_SWORKS is not set # CONFIG_AGP_VIA is not set # CONFIG_AGP_EFFICEON is not set CONFIG_DRM=y # CONFIG_DRM_TDFX is not set # CONFIG_DRM_R128 is not set # CONFIG_DRM_RADEON is not set # CONFIG_DRM_I810 is not set # CONFIG_DRM_I830 is not set # CONFIG_DRM_I915 is not set CONFIG_DRM_MGA=y # CONFIG_DRM_SIS is not set # CONFIG_MWAVE is not set # CONFIG_RAW_DRIVER is not set CONFIG_HANGCHECK_TIMER=y # # TPM devices # # CONFIG_TCG_TPM is not set # # I2C support # CONFIG_I2C=y CONFIG_I2C_CHARDEV=y # # I2C Algorithms # CONFIG_I2C_ALGOBIT=y # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALGOPCA is not set # # I2C Hardware Bus support # # CONFIG_I2C_ALI1535 is not set # CONFIG_I2C_ALI1563 is not set # CONFIG_I2C_ALI15X3 is not set # CONFIG_I2C_AMD756 is not set # CONFIG_I2C_AMD8111 is not set # CONFIG_I2C_I801 is not set # CONFIG_I2C_I810 is not set # CONFIG_I2C_PIIX4 is not set CONFIG_I2C_ISA=y # CONFIG_I2C_NFORCE2 is not set # CONFIG_I2C_PARPORT is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_PROSAVAGE is not set # CONFIG_I2C_SAVAGE4 is not set # CONFIG_SCx200_ACB is not set # CONFIG_I2C_SIS5595 is not set # CONFIG_I2C_SIS630 is not set # CONFIG_I2C_SIS96X is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_VIA is not set CONFIG_I2C_VIAPRO=y # CONFIG_I2C_VOODOO3 is not set # CONFIG_I2C_PCA_ISA is not set # # Hardware Sensors Chip support # CONFIG_I2C_SENSOR=m # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set # CONFIG_SENSORS_ADM1031 is not set # CONFIG_SENSORS_ASB100 is not set # CONFIG_SENSORS_DS1621 is not set # CONFIG_SENSORS_FSCHER is not set # CONFIG_SENSORS_FSCPOS is not set # CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_LM63 is not set # CONFIG_SENSORS_LM75 is not set # CONFIG_SENSORS_LM77 is not set # CONFIG_SENSORS_LM78 is not set # CONFIG_SENSORS_LM80 is not set # CONFIG_SENSORS_LM83 is not set # CONFIG_SENSORS_LM85 is not set # CONFIG_SENSORS_LM87 is not set # CONFIG_SENSORS_LM90 is not set # CONFIG_SENSORS_LM92 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_PC87360 is not set # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SIS5595 is not set # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_VIA686A is not set # CONFIG_SENSORS_W83781D is not set # CONFIG_SENSORS_W83L785TS is not set CONFIG_SENSORS_W83627HF=m # # Other I2C Chip support # # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_RTC8564 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set # # Dallas's 1-wire bus # # CONFIG_W1 is not set # # Misc devices # # CONFIG_IBM_ASM is not set # # Multimedia devices # CONFIG_VIDEO_DEV=m # # Video For Linux # # # Video Adapters # CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_PMS is not set # CONFIG_VIDEO_BWQCAM is not set # CONFIG_VIDEO_CQCAM is not set # CONFIG_VIDEO_W9966 is not set # CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set CONFIG_TUNER_3036=m # CONFIG_VIDEO_STRADIS is not set # CONFIG_VIDEO_ZORAN is not set CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_DVB=m # CONFIG_VIDEO_MXB is not set # CONFIG_VIDEO_DPC is not set # CONFIG_VIDEO_HEXIUM_ORION is not set # CONFIG_VIDEO_HEXIUM_GEMINI is not set CONFIG_VIDEO_CX88=m CONFIG_VIDEO_CX88_DVB=m # CONFIG_VIDEO_OVCAMCHIP is not set # # Radio Adapters # # CONFIG_RADIO_CADET is not set # CONFIG_RADIO_RTRACK is not set # CONFIG_RADIO_RTRACK2 is not set # CONFIG_RADIO_AZTECH is not set # CONFIG_RADIO_GEMTEK is not set # CONFIG_RADIO_GEMTEK_PCI is not set # CONFIG_RADIO_MAXIRADIO is not set # CONFIG_RADIO_MAESTRO is not set # CONFIG_RADIO_SF16FMI is not set # CONFIG_RADIO_SF16FMR2 is not set # CONFIG_RADIO_TERRATEC is not set # CONFIG_RADIO_TRUST is not set # CONFIG_RADIO_TYPHOON is not set # CONFIG_RADIO_ZOLTRIX is not set # # Digital Video Broadcasting Devices # CONFIG_DVB=y CONFIG_DVB_CORE=m # # Supported SAA7146 based PCI Adapters # CONFIG_DVB_AV7110=m CONFIG_DVB_AV7110_OSD=y CONFIG_DVB_BUDGET=m CONFIG_DVB_BUDGET_CI=m CONFIG_DVB_BUDGET_AV=m CONFIG_DVB_BUDGET_PATCH=m # # Supported USB Adapters # CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_DIBUSB=m CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES=y CONFIG_DVB_DIBCOM_DEBUG=y CONFIG_DVB_CINERGYT2=m # CONFIG_DVB_CINERGYT2_TUNING is not set # # Supported FlexCopII (B2C2) Adapters # CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_DVB_B2C2_FLEXCOP_PCI=m CONFIG_DVB_B2C2_FLEXCOP_USB=m CONFIG_DVB_B2C2_FLEXCOP_DEBUG=y CONFIG_DVB_B2C2_SKYSTAR=m # # Supported BT878 Adapters # CONFIG_DVB_BT8XX=m # # Supported DVB Frontends # # # Customise DVB Frontends # # # DVB-S (satellite) frontends # CONFIG_DVB_STV0299=m CONFIG_DVB_CX24110=m CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA80XX=m CONFIG_DVB_MT312=m CONFIG_DVB_VES1X93=m # # DVB-T (terrestrial) frontends # CONFIG_DVB_SP8870=m CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m CONFIG_DVB_L64781=m CONFIG_DVB_TDA1004X=m CONFIG_DVB_NXT6000=m CONFIG_DVB_MT352=m CONFIG_DVB_DIB3000MB=m CONFIG_DVB_DIB3000MC=m # # DVB-C (cable) frontends # CONFIG_DVB_ATMEL_AT76C651=m CONFIG_DVB_VES1820=m CONFIG_DVB_TDA10021=m CONFIG_DVB_STV0297=m # # ATSC (North American/Korean Terresterial DTV) frontends # CONFIG_DVB_NXT2002=m CONFIG_DVB_OR51211=m CONFIG_DVB_OR51132=m CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m CONFIG_VIDEO_VIDEOBUF=m CONFIG_VIDEO_TUNER=m CONFIG_VIDEO_BUF=m CONFIG_VIDEO_BUF_DVB=m CONFIG_VIDEO_BTCX=m CONFIG_VIDEO_IR=m CONFIG_VIDEO_TVEEPROM=m # # Graphics support # CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_SOFT_CURSOR=y # CONFIG_FB_MACMODES is not set CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_CIRRUS is not set # CONFIG_FB_PM2 is not set # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set # CONFIG_FB_VGA16 is not set CONFIG_FB_VESA=y CONFIG_VIDEO_SELECT=y # CONFIG_FB_HGA is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_RIVA is not set # CONFIG_FB_I810 is not set # CONFIG_FB_INTEL is not set # CONFIG_FB_MATROX is not set # CONFIG_FB_RADEON_OLD is not set # CONFIG_FB_RADEON is not set # CONFIG_FB_ATY128 is not set # CONFIG_FB_ATY is not set # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set # CONFIG_FB_VOODOO1 is not set # CONFIG_FB_TRIDENT is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_VIRTUAL is not set # # Console display driver support # CONFIG_VGA_CONSOLE=y # CONFIG_MDA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y # # Logo configuration # # CONFIG_LOGO is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound # CONFIG_SOUND=y # # Advanced Linux Sound Architecture # CONFIG_SND=y CONFIG_SND_TIMER=y CONFIG_SND_PCM=y CONFIG_SND_RAWMIDI=y CONFIG_SND_SEQUENCER=y CONFIG_SND_SEQ_DUMMY=y CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=y CONFIG_SND_PCM_OSS=y CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_RTCTIMER=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set # # Generic devices # CONFIG_SND_MPU401_UART=y CONFIG_SND_DUMMY=m CONFIG_SND_VIRMIDI=m # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set CONFIG_SND_MPU401=y # # ISA devices # # CONFIG_SND_AD1848 is not set # CONFIG_SND_CS4231 is not set # CONFIG_SND_CS4232 is not set # CONFIG_SND_CS4236 is not set # CONFIG_SND_ES1688 is not set # CONFIG_SND_ES18XX is not set # CONFIG_SND_GUSCLASSIC is not set # CONFIG_SND_GUSEXTREME is not set # CONFIG_SND_GUSMAX is not set # CONFIG_SND_INTERWAVE is not set # CONFIG_SND_INTERWAVE_STB is not set # CONFIG_SND_OPTI92X_AD1848 is not set # CONFIG_SND_OPTI92X_CS4231 is not set # CONFIG_SND_OPTI93X is not set # CONFIG_SND_SB8 is not set # CONFIG_SND_SB16 is not set # CONFIG_SND_SBAWE is not set # CONFIG_SND_WAVEFRONT is not set # CONFIG_SND_CMI8330 is not set # CONFIG_SND_OPL3SA2 is not set # CONFIG_SND_SGALAXY is not set # CONFIG_SND_SSCAPE is not set # # PCI devices # CONFIG_SND_AC97_CODEC=y # CONFIG_SND_ALI5451 is not set # CONFIG_SND_ATIIXP is not set # CONFIG_SND_ATIIXP_MODEM is not set # CONFIG_SND_AU8810 is not set # CONFIG_SND_AU8820 is not set # CONFIG_SND_AU8830 is not set # CONFIG_SND_AZT3328 is not set # CONFIG_SND_BT87X is not set # CONFIG_SND_CS46XX is not set # CONFIG_SND_CS4281 is not set # CONFIG_SND_EMU10K1 is not set # CONFIG_SND_EMU10K1X is not set # CONFIG_SND_CA0106 is not set # CONFIG_SND_KORG1212 is not set # CONFIG_SND_MIXART is not set # CONFIG_SND_NM256 is not set # CONFIG_SND_RME32 is not set # CONFIG_SND_RME96 is not set # CONFIG_SND_RME9652 is not set # CONFIG_SND_HDSP is not set # CONFIG_SND_TRIDENT is not set # CONFIG_SND_YMFPCI is not set # CONFIG_SND_ALS4000 is not set # CONFIG_SND_CMIPCI is not set # CONFIG_SND_ENS1370 is not set # CONFIG_SND_ENS1371 is not set # CONFIG_SND_ES1938 is not set # CONFIG_SND_ES1968 is not set # CONFIG_SND_MAESTRO3 is not set # CONFIG_SND_FM801 is not set # CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1724 is not set CONFIG_SND_INTEL8X0=y # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_SONICVIBES is not set # CONFIG_SND_VIA82XX is not set # CONFIG_SND_VIA82XX_MODEM is not set # CONFIG_SND_VX222 is not set # CONFIG_SND_HDA_INTEL is not set # # USB devices # # CONFIG_SND_USB_AUDIO is not set # CONFIG_SND_USB_USX2Y is not set # # Open Sound System # # CONFIG_SOUND_PRIME is not set # # USB support # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB=y # CONFIG_USB_DEBUG is not set # # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y # CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG is not set # # USB Host Controller Drivers # CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_SPLIT_ISO=y # CONFIG_USB_EHCI_ROOT_HUB_TT is not set # CONFIG_USB_OHCI_HCD is not set CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # # USB Device Class drivers # # CONFIG_USB_AUDIO is not set # CONFIG_USB_BLUETOOTH_TTY is not set # CONFIG_USB_MIDI is not set # CONFIG_USB_ACM is not set CONFIG_USB_PRINTER=y # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information # CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set # CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_DPCM is not set # CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set # # USB Input Devices # CONFIG_USB_HID=y CONFIG_USB_HIDINPUT=y # CONFIG_HID_FF is not set CONFIG_USB_HIDDEV=y # CONFIG_USB_AIPTEK is not set CONFIG_USB_WACOM=m # CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set # CONFIG_USB_MTOUCH is not set # CONFIG_USB_EGALAX is not set # CONFIG_USB_XPAD is not set # CONFIG_USB_ATI_REMOTE is not set # # USB Imaging devices # # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set # # USB Multimedia devices # # CONFIG_USB_DABUSB is not set # CONFIG_USB_VICAM is not set # CONFIG_USB_DSBR is not set # CONFIG_USB_IBMCAM is not set # CONFIG_USB_KONICAWC is not set # CONFIG_USB_OV511 is not set # CONFIG_USB_SE401 is not set # CONFIG_USB_SN9C102 is not set # CONFIG_USB_STV680 is not set # CONFIG_USB_PWC is not set # # USB Network Adapters # # CONFIG_USB_CATC is not set # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set CONFIG_USB_MON=y # # USB port drivers # # CONFIG_USB_USS720 is not set # # USB Serial Converter support # # CONFIG_USB_SERIAL is not set # # USB Miscellaneous drivers # # CONFIG_USB_EMI62 is not set # CONFIG_USB_EMI26 is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_LED is not set # CONFIG_USB_CYTHERM is not set # CONFIG_USB_PHIDGETKIT is not set # CONFIG_USB_PHIDGETSERVO is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_SISUSBVGA is not set # CONFIG_USB_TEST is not set # # USB ATM/DSL drivers # # # USB Gadget Support # # CONFIG_USB_GADGET is not set # # MMC/SD Card support # # CONFIG_MMC is not set # # InfiniBand support # # CONFIG_INFINIBAND is not set # # File systems # CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y # CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set CONFIG_JBD=y CONFIG_JBD_DEBUG=y CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # # XFS support # # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set # # CD-ROM/DVD Filesystems # CONFIG_ISO9660_FS=y CONFIG_JOLIET=y CONFIG_ZISOFS=y CONFIG_ZISOFS_FS=y CONFIG_UDF_FS=y CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems # CONFIG_FAT_FS=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_NTFS_FS is not set # # Pseudo filesystems # CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_SYSFS=y # CONFIG_DEVFS_FS is not set # CONFIG_DEVPTS_FS_XATTR is not set CONFIG_TMPFS=y # CONFIG_TMPFS_XATTR is not set # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # # Miscellaneous filesystems # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set CONFIG_CRAMFS=y # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # # Network File Systems # CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set CONFIG_NFSD=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4 is not set CONFIG_NFSD_TCP=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=y CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set # # Partition Types # # CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y # # Native Language Support # CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set CONFIG_NLS_CODEPAGE_850=y # CONFIG_NLS_CODEPAGE_852 is not set # CONFIG_NLS_CODEPAGE_855 is not set # CONFIG_NLS_CODEPAGE_857 is not set # CONFIG_NLS_CODEPAGE_860 is not set # CONFIG_NLS_CODEPAGE_861 is not set # CONFIG_NLS_CODEPAGE_862 is not set # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set # CONFIG_NLS_CODEPAGE_865 is not set # CONFIG_NLS_CODEPAGE_866 is not set # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set # CONFIG_NLS_CODEPAGE_932 is not set # CONFIG_NLS_CODEPAGE_949 is not set # CONFIG_NLS_CODEPAGE_874 is not set # CONFIG_NLS_ISO8859_8 is not set # CONFIG_NLS_CODEPAGE_1250 is not set # CONFIG_NLS_CODEPAGE_1251 is not set CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_2 is not set # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set # CONFIG_NLS_ISO8859_6 is not set # CONFIG_NLS_ISO8859_7 is not set # CONFIG_NLS_ISO8859_9 is not set # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set CONFIG_NLS_ISO8859_15=y # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=y # # Profiling support # CONFIG_PROFILING=y CONFIG_OPROFILE=m # # Kernel hacking # # CONFIG_PRINTK_TIME is not set CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_SCHEDSTATS=y CONFIG_DEBUG_SLAB=y CONFIG_DEBUG_PREEMPT=y CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set CONFIG_DEBUG_FS=y CONFIG_FRAME_POINTER=y CONFIG_EARLY_PRINTK=y CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_KPROBES is not set # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_4KSTACKS=y CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y # # Security options # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set # # Cryptographic options # CONFIG_CRYPTO=y CONFIG_CRYPTO_HMAC=y # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y # CONFIG_CRYPTO_WP512 is not set CONFIG_CRYPTO_TGR192=y CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_BLOWFISH=y CONFIG_CRYPTO_TWOFISH=y CONFIG_CRYPTO_SERPENT=y CONFIG_CRYPTO_AES_586=y CONFIG_CRYPTO_CAST5=y CONFIG_CRYPTO_CAST6=y # CONFIG_CRYPTO_TEA is not set # CONFIG_CRYPTO_ARC4 is not set # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_ANUBIS is not set CONFIG_CRYPTO_DEFLATE=y # CONFIG_CRYPTO_MICHAEL_MIC is not set CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_TEST is not set # # Hardware crypto devices # # CONFIG_CRYPTO_DEV_PADLOCK is not set # # Library routines # CONFIG_CRC_CCITT=y CONFIG_CRC32=y CONFIG_LIBCRC32C=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_X86_SMP=y CONFIG_X86_HT=y CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_TRAMPOLINE=y CONFIG_PC=y ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-07 9:11 ` Johannes Stezenbach @ 2005-06-08 11:15 ` Johannes Stezenbach 2005-06-08 11:23 ` Brice Goglin 0 siblings, 1 reply; 36+ messages in thread From: Johannes Stezenbach @ 2005-06-08 11:15 UTC (permalink / raw) To: Linus Torvalds, Kernel Mailing List Johannes Stezenbach wrote: > Hype-threading stopped working for me (probably due to > me not enabling ACPI). dmesg output and .config attached. > -rc5 worked fine. The board is an Asus P4P800-Deluxe. > > dmesg: WARNING: 1 siblings found for CPU0, should be 2 Indeed SMT works fine if I enable ACPI. Is SMT without ACPI not supported? Johannes ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-08 11:15 ` Johannes Stezenbach @ 2005-06-08 11:23 ` Brice Goglin 2005-06-08 11:37 ` Johannes Stezenbach 0 siblings, 1 reply; 36+ messages in thread From: Brice Goglin @ 2005-06-08 11:23 UTC (permalink / raw) To: Johannes Stezenbach; +Cc: Linus Torvalds, Kernel Mailing List Johannes Stezenbach a écrit : > Johannes Stezenbach wrote: > >>Hype-threading stopped working for me (probably due to >>me not enabling ACPI). dmesg output and .config attached. >>-rc5 worked fine. The board is an Asus P4P800-Deluxe. >> >>dmesg: WARNING: 1 siblings found for CPU0, should be 2 > > > Indeed SMT works fine if I enable ACPI. > Is SMT without ACPI not supported? > > Johannes You can pass acpi=ht into the kernel command line to disable ACPI except the minimum required to get HT support. >From Documentation/kernel-parameters.txt: acpi= [HW,ACPI] Advanced Configuration and Power Interface ... ht -- run only enough ACPI to enable Hyper Threading Brice ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-08 11:23 ` Brice Goglin @ 2005-06-08 11:37 ` Johannes Stezenbach 2005-06-17 17:48 ` Bill Davidsen 0 siblings, 1 reply; 36+ messages in thread From: Johannes Stezenbach @ 2005-06-08 11:37 UTC (permalink / raw) To: Brice Goglin; +Cc: Linus Torvalds, Kernel Mailing List Brice Goglin wrote: > Johannes Stezenbach a écrit : > > Johannes Stezenbach wrote: > > > >>Hype-threading stopped working for me (probably due to > >>me not enabling ACPI). dmesg output and .config attached. > >>-rc5 worked fine. The board is an Asus P4P800-Deluxe. > >> > >>dmesg: WARNING: 1 siblings found for CPU0, should be 2 > > > > > > Indeed SMT works fine if I enable ACPI. > > Is SMT without ACPI not supported? > > You can pass acpi=ht into the kernel command line to disable > ACPI except the minimum required to get HT support. That's nice, but I was thinking along the lines of: diff -ur linux-2.6.12-rc6.orig/arch/i386/Kconfig linux-2.6.12-rc6/arch/i386/Kconfig --- linux-2.6.12-rc6.orig/arch/i386/Kconfig 2005-06-06 23:16:27.000000000 +0200 +++ linux-2.6.12-rc6/arch/i386/Kconfig 2005-06-08 13:35:08.000000000 +0200 @@ -503,7 +503,7 @@ config SCHED_SMT bool "SMT (Hyperthreading) scheduler support" - depends on SMP + depends on SMP && ACPI default off help SMT scheduler support improves the CPU scheduler's decision making Comments? Is this intended? Johannes ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-08 11:37 ` Johannes Stezenbach @ 2005-06-17 17:48 ` Bill Davidsen 2005-06-18 13:57 ` Johannes Stezenbach 0 siblings, 1 reply; 36+ messages in thread From: Bill Davidsen @ 2005-06-17 17:48 UTC (permalink / raw) To: Johannes Stezenbach; +Cc: Linus Torvalds, Kernel Mailing List Johannes Stezenbach wrote: > Brice Goglin wrote: > >>Johannes Stezenbach a écrit : >> >>>Johannes Stezenbach wrote: >>> >>> >>>>Hype-threading stopped working for me (probably due to >>>>me not enabling ACPI). dmesg output and .config attached. >>>>-rc5 worked fine. The board is an Asus P4P800-Deluxe. >>>> >>>>dmesg: WARNING: 1 siblings found for CPU0, should be 2 >>> >>> >>>Indeed SMT works fine if I enable ACPI. >>>Is SMT without ACPI not supported? >> >>You can pass acpi=ht into the kernel command line to disable >>ACPI except the minimum required to get HT support. > > > That's nice, but I was thinking along the lines of: > > diff -ur linux-2.6.12-rc6.orig/arch/i386/Kconfig linux-2.6.12-rc6/arch/i386/Kconfig > --- linux-2.6.12-rc6.orig/arch/i386/Kconfig 2005-06-06 23:16:27.000000000 +0200 > +++ linux-2.6.12-rc6/arch/i386/Kconfig 2005-06-08 13:35:08.000000000 +0200 > @@ -503,7 +503,7 @@ > > config SCHED_SMT > bool "SMT (Hyperthreading) scheduler support" > - depends on SMP > + depends on SMP && ACPI > default off > help > SMT scheduler support improves the CPU scheduler's decision making > > Comments? Is this intended? I would think that you can't do HT without ACPI, so there's no point in building in HT scheduling unless you can have HT. Is that what you were asking? I was hoping someone else would comment. Scheduling is getting harder and harder to get right... I have this thought of a Beowolf cluster of NUMA machines, with each node being HT multicore SMP. By "right" I meant "optimal," I'm sure that setup would do something reasonable with current scheduling. -- -bill davidsen (davidsen@tmr.com) "The secret to procrastination is to put things off until the last possible moment - but no longer" -me ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-17 17:48 ` Bill Davidsen @ 2005-06-18 13:57 ` Johannes Stezenbach 2005-06-18 17:10 ` Johannes Stezenbach 0 siblings, 1 reply; 36+ messages in thread From: Johannes Stezenbach @ 2005-06-18 13:57 UTC (permalink / raw) To: Bill Davidsen; +Cc: Linus Torvalds, Kernel Mailing List Bill Davidsen wrote: > Johannes Stezenbach wrote: > >Brice Goglin wrote: > >>Johannes Stezenbach a écrit : > >>>Indeed SMT works fine if I enable ACPI. > >>>Is SMT without ACPI not supported? > >> > >>You can pass acpi=ht into the kernel command line to disable > >>ACPI except the minimum required to get HT support. > > > > > >That's nice, but I was thinking along the lines of: > > > >diff -ur linux-2.6.12-rc6.orig/arch/i386/Kconfig > >linux-2.6.12-rc6/arch/i386/Kconfig > >--- linux-2.6.12-rc6.orig/arch/i386/Kconfig 2005-06-06 > >23:16:27.000000000 +0200 > >+++ linux-2.6.12-rc6/arch/i386/Kconfig 2005-06-08 > >13:35:08.000000000 +0200 > >@@ -503,7 +503,7 @@ > > > > config SCHED_SMT > > bool "SMT (Hyperthreading) scheduler support" > >- depends on SMP > >+ depends on SMP && ACPI > > default off > > help > > SMT scheduler support improves the CPU scheduler's decision making > > > >Comments? Is this intended? > > I would think that you can't do HT without ACPI, so there's no point in > building in HT scheduling unless you can have HT. > > Is that what you were asking? I was hoping someone else would comment. In 2.6.12-rc5 SMT worked without CONFIG_ACPI. (IIRC the kernel used some minimal ACPI stuff anyway for CPU initialisation). I don't use power management or other features of ACPI so I had it disabled, and my build broke with 2.6.12-rc6. Johannes ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-18 13:57 ` Johannes Stezenbach @ 2005-06-18 17:10 ` Johannes Stezenbach 0 siblings, 0 replies; 36+ messages in thread From: Johannes Stezenbach @ 2005-06-18 17:10 UTC (permalink / raw) To: Bill Davidsen, Linus Torvalds, Kernel Mailing List Johannes Stezenbach wrote: > In 2.6.12-rc5 SMT worked without CONFIG_ACPI. (IIRC the kernel used some > minimal ACPI stuff anyway for CPU initialisation). > > I don't use power management or other features of ACPI so I > had it disabled, and my build broke with 2.6.12-rc6. Correction: It built fine, but didn't recognize the second "CPU". Johannes ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 18:08 Linux v2.6.12-rc6 Linus Torvalds 2005-06-06 19:26 ` Pavel Machek 2005-06-07 9:11 ` Johannes Stezenbach @ 2005-06-07 13:05 ` Erik Mouw 2005-06-07 15:28 ` Linus Torvalds 2005-06-07 18:47 ` Jean Delvare 2005-06-08 13:37 ` segfaults suddenly appearing Jakob Oestergaard 4 siblings, 1 reply; 36+ messages in thread From: Erik Mouw @ 2005-06-07 13:05 UTC (permalink / raw) To: Linus Torvalds; +Cc: Kernel Mailing List On Mon, Jun 06, 2005 at 11:08:25AM -0700, Linus Torvalds wrote: Over here the script can get the correct information from git branches: > Jeff Garzik: > Automatic merge of /spare/repo/netdev-2.6 branch r8169-fix But for your own changes it seems to fail: > Linus Torvalds: > Linux 2.6.12-rc6 > Automatic merge of 'misc-fixes' branch from ... from what? > Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6 > Automatic merge of rsync://rsync.kernel.org/.../davem/net-2.6 And this again works. > Merge of 'docs' branch from > Merge of master.kernel.org:/.../aegl/linux-2.6 > Automatic merge of rsync://rsync.kernel.org/.../sfrench/cifs-2.6 > Automatic merge of rsync://rsync.kernel.org/.../davem/net-2.6 > Automatic merge of rsync://rsync.kernel.org/.../davem/sparc-2.6 > Automatic merge of rsync://rsync.kernel.org/.../gregkh/usb-2.6 > Automatic merge of rsync://rsync.kernel.org/.../gregkh/i2c-2.6 > Automatic merge of rsync://rsync.kernel.org/.../gregkh/pci-2.6 > Automatic merge of rsync://rsync.kernel.org/.../aegl/linux-2.6 > Merge of rsync://rsync.kernel.org/.../davem/tg3-2.6 > Automatic merge of 'misc-fixes' branch from > Automatic merge of 'for-linus' branch from > Automatic merge of rsync://rsync.kernel.org/.../hch/xfs-2.6 > ide-cd: revert DMA mask test change > Automatic merge of rsync://rsync.kernel.org/.../davem/net-2.6 > Automatic merge of 'for-linus' branch from > Merge of 'misc-fixes' branch from > Merge of rsync://rsync.kernel.org/.../davem/sparc-2.6 > Merge of 'new-ids' branch from > Merge of 'for-linus' branch from I don't see what's going wrong, maybe you can figure out. Erik -- +-- Erik Mouw -- www.harddisk-recovery.com -- +31 70 370 12 90 -- | Lab address: Delftechpark 26, 2628 XH, Delft, The Netherlands ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-07 13:05 ` Erik Mouw @ 2005-06-07 15:28 ` Linus Torvalds 2005-06-07 17:11 ` Erik Mouw ` (2 more replies) 0 siblings, 3 replies; 36+ messages in thread From: Linus Torvalds @ 2005-06-07 15:28 UTC (permalink / raw) To: Erik Mouw; +Cc: Kernel Mailing List, Jeff Garzik On Tue, 7 Jun 2005, Erik Mouw wrote: > > Over here the script can get the correct information from git > branches: > > > Jeff Garzik: > > Automatic merge of /spare/repo/netdev-2.6 branch r8169-fix > > But for your own changes it seems to fail: > > > Linus Torvalds: > > Linux 2.6.12-rc6 > > Automatic merge of 'misc-fixes' branch from > > ... from what? Yeah, I guess I need to redo my merge messages. Or alternatively, I should just remove merges from the shortlog. The merge message that goes along with that shortlog entry is Author: Linus Torvalds <torvalds@ppc970.osdl.org> Date: Sat Jun 4 08:18:39 2005 -0700 Automatic merge of 'misc-fixes' branch from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 which is pretty readable in the long format, but causes the shortlog to pick up just the partial (largely uninteresing) first line. Removing merges from the shortlog is actually likely the _right_ thing to do, since we already miss a lot of merges: any truly trivial merge (ie no parallellism) is invisible anyway, except that the committer changed. Besides, it's what the old BK changelogs did. So I guess I'll leave the merge message as is (unless somebody can suggest a more readable format), and just update my release scripts to not include merge messages. (Using Jeff's syntax for merge messages isn't very good, since with remote repositories the names of the repos get so long that the message gets unwieldly..) > > Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6 > > Automatic merge of rsync://rsync.kernel.org/.../davem/net-2.6 > > And this again works. That's because they don't have branches - when I take the HEAD of the repostitory, the changelog entry ends up being just a one-liner again. Do a "git log" if you have the git tree (or just look at the full ChangeLog, which is just the output of that), you'll see what's up. (Btw, Jeff, I think the git-shortlog script is slightly buggered, it doesn't do the nice word-wrap, and it _only_ takes the first line, even from a multi-line header. I think it should stop at the first empty line in the commit, not just take the first one). Linus ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-07 15:28 ` Linus Torvalds @ 2005-06-07 17:11 ` Erik Mouw 2005-06-07 17:28 ` Linus Torvalds 2005-06-08 2:08 ` Paul Mackerras 2005-06-08 16:20 ` Linux v2.6.12-rc6 Nicolas Pitre 2 siblings, 1 reply; 36+ messages in thread From: Erik Mouw @ 2005-06-07 17:11 UTC (permalink / raw) To: Linus Torvalds; +Cc: Kernel Mailing List, Jeff Garzik On Tue, Jun 07, 2005 at 08:28:45AM -0700, Linus Torvalds wrote: > On Tue, 7 Jun 2005, Erik Mouw wrote: > > > Linus Torvalds: > > > Linux 2.6.12-rc6 > > > Automatic merge of 'misc-fixes' branch from > > > > ... from what? > > Yeah, I guess I need to redo my merge messages. Or alternatively, I should > just remove merges from the shortlog. > > The merge message that goes along with that shortlog entry is > > Author: Linus Torvalds <torvalds@ppc970.osdl.org> > Date: Sat Jun 4 08:18:39 2005 -0700 > > Automatic merge of 'misc-fixes' branch from > > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 > > which is pretty readable in the long format, but causes the shortlog to > pick up just the partial (largely uninteresing) first line. Fair enough. > Removing merges from the shortlog is actually likely the _right_ thing to > do, since we already miss a lot of merges: any truly trivial merge (ie no > parallellism) is invisible anyway, except that the committer changed. > Besides, it's what the old BK changelogs did. > > So I guess I'll leave the merge message as is (unless somebody can suggest > a more readable format), and just update my release scripts to not include > merge messages. Well, it's nice to know which repos you pulled from for a particular release, that makes it easier to figure out what's wrong if/when something breaks. > > > Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6 > > > Automatic merge of rsync://rsync.kernel.org/.../davem/net-2.6 > > > > And this again works. > > That's because they don't have branches - when I take the HEAD of the > repostitory, the changelog entry ends up being just a one-liner again. Isn't the easy fix to put the long changelog information on a single line? Erik [blissfully ignorant about git internals] -- +-- Erik Mouw -- www.harddisk-recovery.nl -- 0800 220 20 20 -- | Eigen lab: Delftechpark 26, 2628 XH, Delft, Nederland | Files foetsie, bestanden kwijt, alle data weg?! | Blijf kalm en neem contact op met Harddisk-recovery.nl! ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-07 17:11 ` Erik Mouw @ 2005-06-07 17:28 ` Linus Torvalds 0 siblings, 0 replies; 36+ messages in thread From: Linus Torvalds @ 2005-06-07 17:28 UTC (permalink / raw) To: Erik Mouw; +Cc: Kernel Mailing List, Jeff Garzik On Tue, 7 Jun 2005, Erik Mouw wrote: > > Well, it's nice to know which repos you pulled from for a particular > release, that makes it easier to figure out what's wrong if/when > something breaks. Well, the thing is, you don't actually get a full list - you at best get a _partial_ list of the merges I do. In fact, it's almost always a proper subset, with (wild wag) 10% of the merges never showing up. If a repo has already merged with me on the far end, my merge will be just a "fast-forward to what they did", which won't show up as a separate commit. Similarly, if somebody is on a different time-zone from me and just happens to do his work while I'm sleeping, and I pull the tree first thing in the morning, there won't be any overlapping development and again it's just a fast-forward. So no merges at _all_ may be showing on either side in that case.. This very much does happen, exactly because we have a "merge often" > Isn't the easy fix to put the long changelog information on a single > line? Sure. It's just a shell script that generates the message: merge_name=$(echo "$1" | sed 's:\.git/*$::') if [ "$2" ] then merge_name="'$2' branch from $merge_name" merge_head="refs/heads/$2" fi but the reason I do it on multiple lines is that that looks better in the long format, I think. But maybe the short format is the one I should prioritize, since that's the one that also shows up in the summary line for the graphical tools (webgit and gitk). Linus ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-07 15:28 ` Linus Torvalds 2005-06-07 17:11 ` Erik Mouw @ 2005-06-08 2:08 ` Paul Mackerras 2005-06-08 17:11 ` Linus Torvalds 2005-06-08 23:16 ` gitk (was Re: Linux v2.6.12-rc6) Linus Torvalds 2005-06-08 16:20 ` Linux v2.6.12-rc6 Nicolas Pitre 2 siblings, 2 replies; 36+ messages in thread From: Paul Mackerras @ 2005-06-08 2:08 UTC (permalink / raw) To: Linus Torvalds; +Cc: Erik Mouw, Kernel Mailing List, Jeff Garzik Linus Torvalds writes: > The merge message that goes along with that shortlog entry is > > Author: Linus Torvalds <torvalds@ppc970.osdl.org> > Date: Sat Jun 4 08:18:39 2005 -0700 > > Automatic merge of 'misc-fixes' branch from > > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 > > which is pretty readable in the long format, but causes the shortlog to > pick up just the partial (largely uninteresing) first line. This also affects gitk, which takes the first line of the commit message as the headline. I could make gitk take the first paragraph (i.e. until the first blank line) as the headline but even that wouldn't help since you put a blank line between the "Automatic merge" line and the actual URL. Could you leave out that blank line in future, or do you have a better suggestion? Paul. ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-08 2:08 ` Paul Mackerras @ 2005-06-08 17:11 ` Linus Torvalds 2005-06-08 23:16 ` gitk (was Re: Linux v2.6.12-rc6) Linus Torvalds 1 sibling, 0 replies; 36+ messages in thread From: Linus Torvalds @ 2005-06-08 17:11 UTC (permalink / raw) To: Paul Mackerras; +Cc: Erik Mouw, Kernel Mailing List, Jeff Garzik On Wed, 8 Jun 2005, Paul Mackerras wrote: > > This also affects gitk, which takes the first line of the commit > message as the headline. I could make gitk take the first paragraph > (i.e. until the first blank line) as the headline but even that > wouldn't help since you put a blank line between the "Automatic merge" > line and the actual URL. Could you leave out that blank line in > future, or do you have a better suggestion? I'll just make future messages much denser. They should now be just Merge repo or Merge 'name' branch of <repo> (and I may decide to replace "branch of" with "from" to make it even denser.) Linus ^ permalink raw reply [flat|nested] 36+ messages in thread
* gitk (was Re: Linux v2.6.12-rc6) 2005-06-08 2:08 ` Paul Mackerras 2005-06-08 17:11 ` Linus Torvalds @ 2005-06-08 23:16 ` Linus Torvalds 2005-06-10 10:57 ` Paul Mackerras 1 sibling, 1 reply; 36+ messages in thread From: Linus Torvalds @ 2005-06-08 23:16 UTC (permalink / raw) To: Paul Mackerras; +Cc: Git Mailing List Btw, Paul, one thing I end up missing in gitk is that looking at merges doesn't show any output, yet in many ways merges are actually the most interesting ones where you'd like to see where a file comes from.. Now, handling multi-way merges may be hard, but at least the normal two-way merges end up pretty straightforward, I think, and only have four cases for each file: - not touched by either side (ie it doesn't show up in either of "git-diff-tree TREE PARENT1" or "git-diff-tree TREE PARENT2") - changed by PARENT1 only (ie it shows up in the git-diff-tree between TREE and PARENT2) - changed by PARENT2 only - changed since both and it would be cool if the "filename list" panel on the right side colorized the names by these things (only three cases - leave the "not touched" files off entirely, of course). Also, it should actually possible to do a diff for these things with just doing a "diff3" on the two parents and on the merge result (diff3 normally expects the "original", but hey, the "original" might as well be the result), and thus color a merge file by whether the lines came from one side or the other or both (or neither, which would be a manual merge fixup). Maybe I'm crazy. But it _seems_ like a good idea that shouldn't be fundamentally hard. Linus ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: gitk (was Re: Linux v2.6.12-rc6) 2005-06-08 23:16 ` gitk (was Re: Linux v2.6.12-rc6) Linus Torvalds @ 2005-06-10 10:57 ` Paul Mackerras 0 siblings, 0 replies; 36+ messages in thread From: Paul Mackerras @ 2005-06-10 10:57 UTC (permalink / raw) To: Linus Torvalds; +Cc: Git Mailing List Linus Torvalds writes: > and it would be cool if the "filename list" panel on the right side > colorized the names by these things (only three cases - leave the "not > touched" files off entirely, of course). Hmmm. How about this: each parent is given a color, and the file names are colored according to which parent they differ in. If a file differs in more than one parent it gets listed more than once in the colors for the parents in which it differs, with those entries being consecutive in the list. If instead I list the file once in yet another color, I don't see how to make it intuitively obvious that that's what the color means, and I get a combinatorial explosion in the number of colors required as the number of parents grows (I would potentially need 2^n - 1 colors for n parents). > Also, it should actually possible to do a diff for these things with just > doing a "diff3" on the two parents and on the merge result (diff3 normally > expects the "original", but hey, the "original" might as well be the > result), and thus color a merge file by whether the lines came from one > side or the other or both (or neither, which would be a manual merge > fixup). I already have code in dirdiff to display n-way diffs in a single window, so it's certainly doable. I think I will do it a little differently in this case, though, because the final result has a special status. If I color lines according to which parent(s) they are present in and then have some other way to show which version was chosen (maybe a black box around those lines? or a little tick (check mark) or cross icon at the left hand edge of the line?) I think that should be pretty clear. (I'll need another color for the cases where the result is different to all of the parents, of course.) Sounds interesting. I'll have a look at it. Paul. ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-07 15:28 ` Linus Torvalds 2005-06-07 17:11 ` Erik Mouw 2005-06-08 2:08 ` Paul Mackerras @ 2005-06-08 16:20 ` Nicolas Pitre 2 siblings, 0 replies; 36+ messages in thread From: Nicolas Pitre @ 2005-06-08 16:20 UTC (permalink / raw) To: Linus Torvalds; +Cc: Kernel Mailing List, Jeff Garzik On Tue, 7 Jun 2005, Linus Torvalds wrote: > (Btw, Jeff, I think the git-shortlog script is slightly buggered, it > doesn't do the nice word-wrap, and it _only_ takes the first line, even > from a multi-line header. I think it should stop at the first empty line > in the commit, not just take the first one). Also if the lists of commits could be shown in chronological order (like the bk shortlog script did) that would be nice. Right now the list is reversed. Nicolas ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-06 18:08 Linux v2.6.12-rc6 Linus Torvalds ` (2 preceding siblings ...) 2005-06-07 13:05 ` Erik Mouw @ 2005-06-07 18:47 ` Jean Delvare 2005-06-09 8:10 ` Greg KH 2005-06-08 13:37 ` segfaults suddenly appearing Jakob Oestergaard 4 siblings, 1 reply; 36+ messages in thread From: Jean Delvare @ 2005-06-07 18:47 UTC (permalink / raw) To: LKML Hi all, > Alan Cox: > remove non-cleanroom pwc driver compression This one triggers a compilation warning. Proposed fix: Signed-off-by: Jean Delvare <khali@linux-fr.org> drivers/usb/media/pwc/pwc-uncompress.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- linux-2.6.12-rc6.orig/drivers/usb/media/pwc/pwc-uncompress.c 2005-06-07 07:14:50.000000000 +0200 +++ linux-2.6.12-rc6/drivers/usb/media/pwc/pwc-uncompress.c 2005-06-07 20:35:12.000000000 +0200 @@ -120,7 +120,6 @@ switch (pdev->type) { -#if 0 case 675: case 680: case 690: @@ -128,15 +127,16 @@ case 730: case 740: case 750: +#if 0 pwc_dec23_decompress(&pdev->image, &pdev->view, &pdev->offset, yuv, image, flags, pdev->decompress_data, pdev->vbandlength); break; +#endif case 645: case 646: /* TODO & FIXME */ -#endif return -ENXIO; /* No such device or address: missing decompressor */ break; } -- Jean Delvare ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-07 18:47 ` Jean Delvare @ 2005-06-09 8:10 ` Greg KH 2005-06-09 15:52 ` Jean Delvare 0 siblings, 1 reply; 36+ messages in thread From: Greg KH @ 2005-06-09 8:10 UTC (permalink / raw) To: Jean Delvare; +Cc: LKML On Tue, Jun 07, 2005 at 08:47:33PM +0200, Jean Delvare wrote: > Hi all, > > > Alan Cox: > > remove non-cleanroom pwc driver compression > > This one triggers a compilation warning. Proposed fix: What warning? I don't see anything here... thanks, greg k-h ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-09 8:10 ` Greg KH @ 2005-06-09 15:52 ` Jean Delvare 2005-06-09 16:32 ` Greg KH 0 siblings, 1 reply; 36+ messages in thread From: Jean Delvare @ 2005-06-09 15:52 UTC (permalink / raw) To: Greg KH; +Cc: LKML Hi Greg, all, > > This one triggers a compilation warning. Proposed fix: > > What warning? I don't see anything here... drivers/usb/media/pwc/pwc-uncompress.c: In function `pwc_decompress': drivers/usb/media/pwc/pwc-uncompress.c:140: warning: unreachable code at beginning of switch statement This is gcc 3.3.4. Strange that you don't have it. Thanks, -- Jean Delvare ^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: Linux v2.6.12-rc6 2005-06-09 15:52 ` Jean Delvare @ 2005-06-09 16:32 ` Greg KH 0 siblings, 0 replies; 36+ messages in thread From: Greg KH @ 2005-06-09 16:32 UTC (permalink / raw) To: Jean Delvare; +Cc: LKML On Thu, Jun 09, 2005 at 05:52:36PM +0200, Jean Delvare wrote: > Hi Greg, all, > > > > This one triggers a compilation warning. Proposed fix: > > > > What warning? I don't see anything here... > > drivers/usb/media/pwc/pwc-uncompress.c: In function `pwc_decompress': > drivers/usb/media/pwc/pwc-uncompress.c:140: warning: unreachable code at beginning of switch statement > > This is gcc 3.3.4. Strange that you don't have it. gcc 3.4.4 here does not show that warning. Odd... thanks, greg k-h ^ permalink raw reply [flat|nested] 36+ messages in thread
* segfaults suddenly appearing 2005-06-06 18:08 Linux v2.6.12-rc6 Linus Torvalds ` (3 preceding siblings ...) 2005-06-07 18:47 ` Jean Delvare @ 2005-06-08 13:37 ` Jakob Oestergaard 4 siblings, 0 replies; 36+ messages in thread From: Jakob Oestergaard @ 2005-06-08 13:37 UTC (permalink / raw) To: Kernel Mailing List On Mon, Jun 06, 2005 at 11:08:25AM -0700, Linus Torvalds wrote: > > It's being uploaded right now, the git tree is already up-to-date, and by > the time this hits the mailing list the mirroring of the tar-ball will > hopefully be done too. ... Guys, here's a (yes I know, fairly vague) error report - I'm just beginning to narrow this down. Any suggestions would be greatly appreciated. Dual opteron (Sun Fire v20z), 2G RAM, untainted x86_64 kernels (no preempt or other fancy stuff, just plain and simple K8 NUMA ACPI configs); Problem with 2.6.11.11: Machine hangs during backup (amanda) - right after the estimates are done the box will freeze hard, nothing on console. Tried 2.6.12-rc6 in the hope that it would at least print out a panic or oops for me: Haven't tried the backup yet, but I got the following in the logs which I've never seen before: gcc[18818]: segfault at 00000000332c8e54 rip 000000005555a0a8 rsp 00000000ffffba4c error 6 klogd[3116]: segfault at 000000003ef1b373 rip 000000000804a3b3 rsp 00000000ffffbbe0 error 4 gcc[18857]: segfault at 00000000332c8e54 rip 000000005555a0a8 rsp 00000000ffffbedc error 6 gcc[19049]: segfault at 00000000332c8e54 rip 000000005555a0a8 rsp 00000000ffffaefc error 6 gcc[19097]: segfault at 00000000332c8e54 rip 000000005555a0a8 rsp 00000000ffffb1fc error 6 gcc[19251]: segfault at 00000000332c8e54 rip 000000005555a0a8 rsp 00000000ffffc9dc error 6 gcc[19272]: segfault at 00000000332c8e54 rip 000000005555a0a8 rsp 00000000ffffb1bc error 6 gcc[1569]: segfault at 00000000332c8e54 rip 000000005555a0a8 rsp 00000000ffffb56c error 6 gcc[16458]: segfault at 00000000332c8e54 rip 000000005555a0a8 rsp 00000000ffffc9ac error 6 So, with 2.6.12-rc6 all of the sudden klogd and gcc starts segfaulting... No ECC errors or other anormalities reported via the service processor. Anything you want me to try? Need more information? -- / jakob ^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2005-06-18 17:08 UTC | newest] Thread overview: 36+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2005-06-06 18:08 Linux v2.6.12-rc6 Linus Torvalds 2005-06-06 19:26 ` Pavel Machek 2005-06-06 19:54 ` Jeff Garzik 2005-06-06 20:05 ` Pavel Machek 2005-06-06 21:11 ` Linus Torvalds 2005-06-06 21:54 ` Bill Davidsen 2005-06-06 20:12 ` Linus Torvalds 2005-06-06 20:14 ` Pavel Machek 2005-06-06 21:13 ` Linus Torvalds 2005-06-06 21:18 ` Pavel Machek 2005-06-06 21:36 ` Linus Torvalds 2005-06-06 21:41 ` Pavel Machek 2005-06-06 21:53 ` Linus Torvalds 2005-06-06 21:57 ` Jesper Juhl 2005-06-06 22:07 ` Russell King 2005-06-07 9:11 ` Johannes Stezenbach 2005-06-08 11:15 ` Johannes Stezenbach 2005-06-08 11:23 ` Brice Goglin 2005-06-08 11:37 ` Johannes Stezenbach 2005-06-17 17:48 ` Bill Davidsen 2005-06-18 13:57 ` Johannes Stezenbach 2005-06-18 17:10 ` Johannes Stezenbach 2005-06-07 13:05 ` Erik Mouw 2005-06-07 15:28 ` Linus Torvalds 2005-06-07 17:11 ` Erik Mouw 2005-06-07 17:28 ` Linus Torvalds 2005-06-08 2:08 ` Paul Mackerras 2005-06-08 17:11 ` Linus Torvalds 2005-06-08 23:16 ` gitk (was Re: Linux v2.6.12-rc6) Linus Torvalds 2005-06-10 10:57 ` Paul Mackerras 2005-06-08 16:20 ` Linux v2.6.12-rc6 Nicolas Pitre 2005-06-07 18:47 ` Jean Delvare 2005-06-09 8:10 ` Greg KH 2005-06-09 15:52 ` Jean Delvare 2005-06-09 16:32 ` Greg KH 2005-06-08 13:37 ` segfaults suddenly appearing Jakob Oestergaard
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.