Re: Linux 2.6.12-rc3

Re: Linux 2.6.12-rc3

[Borislav Petkov]

On Thursday 21 April 2005 02:59, you wrote:
<snip>
Hello,

[build.log]
...
drivers/usb/storage/debug.c: In function `usb_stor_show_sense':
drivers/usb/storage/debug.c:166: warning: implicit declaration of function
`scsi_sense_key_string'
drivers/usb/storage/debug.c:166: warning: assignment makes pointer from
integer without a cast
drivers/usb/storage/debug.c:167: warning: implicit declaration of function
`scsi_extd_sense_format'
drivers/usb/storage/debug.c:167: warning: assignment makes pointer from
integer without a cast
...

Hmm, actually I've already sent the trivial patch below for this to Andrew a
few weeks ago and he included it in mm but somehow it is not there..

--- drivers/usb/storage/debug.c.orig	2005-04-05 14:24:21.000000000 +0200
+++ drivers/usb/storage/debug.c	2005-04-05 14:24:35.000000000 +0200
@@ -47,7 +47,7 @@
 #include <linux/cdrom.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
-
+#include <scsi/scsi_dbg.h>
 #include "debug.h"
 #include "scsi.h"

Regards,
Boris.

Re: Linux 2.6.12-rc3

[Greg KH]

On Fri, Apr 22, 2005 at 09:56:43AM +0200, Borislav Petkov wrote:
> On Thursday 21 April 2005 02:59, you wrote:
> <snip>
> Hello,
> 
> [build.log]
> ...
> drivers/usb/storage/debug.c: In function `usb_stor_show_sense':
> drivers/usb/storage/debug.c:166: warning: implicit declaration of function
> `scsi_sense_key_string'
> drivers/usb/storage/debug.c:166: warning: assignment makes pointer from
> integer without a cast
> drivers/usb/storage/debug.c:167: warning: implicit declaration of function
> `scsi_extd_sense_format'
> drivers/usb/storage/debug.c:167: warning: assignment makes pointer from
> integer without a cast
> ...
> 
> Hmm, actually I've already sent the trivial patch below for this to Andrew a
> few weeks ago and he included it in mm but somehow it is not there..

What is your .config that generates this?  What arch?

thanks,

greg k-h

Re: Linux 2.6.12-rc3

[Borislav Petkov]

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

On Sunday 24 April 2005 07:42, Greg KH wrote:
> On Fri, Apr 22, 2005 at 09:56:43AM +0200, Borislav Petkov wrote:
> > On Thursday 21 April 2005 02:59, you wrote:
> > <snip>
> > Hello,
> >
> > [build.log]
> > ...
> > drivers/usb/storage/debug.c: In function `usb_stor_show_sense':
> > drivers/usb/storage/debug.c:166: warning: implicit declaration of
> > function `scsi_sense_key_string'
> > drivers/usb/storage/debug.c:166: warning: assignment makes pointer from
> > integer without a cast
> > drivers/usb/storage/debug.c:167: warning: implicit declaration of
> > function `scsi_extd_sense_format'
> > drivers/usb/storage/debug.c:167: warning: assignment makes pointer from
> > integer without a cast
> > ...
> >
> > Hmm, actually I've already sent the trivial patch below for this to
> > Andrew a few weeks ago and he included it in mm but somehow it is not
> > there..
>
Hi Greg,

> What is your .config that generates this?  What arch?
i386, .config attached.

Regards,
Boris.

[-- Attachment #2: config-2.6.12-rc3 --]
[-- Type: text/plain, Size: 29420 bytes --]

#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.12-rc3
# Fri Apr 22 09:32:06 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 is not set
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_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y
# CONFIG_AUDIT is not set
CONFIG_HOTPLUG=y
CONFIG_KOBJECT_UEVENT=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
# CONFIG_CPUSETS is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
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_OBSOLETE_MODPARM=y
CONFIG_MODULE_SRCVERSION_ALL=y
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_MGEODE 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=y
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_MICROCODE is not set
# CONFIG_X86_MSR is not set
# CONFIG_X86_CPUID is not set

#
# Firmware Drivers
#
CONFIG_NOHIGHMEM=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
# CONFIG_EFI is not set
CONFIG_IRQBALANCE=y
CONFIG_HAVE_DEC_LOCK=y
CONFIG_SECCOMP=y

#
# Power management options (ACPI, APM)
#
CONFIG_PM=y
CONFIG_PM_DEBUG=y

#
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m
CONFIG_ACPI_BUTTON=m
CONFIG_ACPI_FAN=m
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_THERMAL=m
# CONFIG_ACPI_ASUS is not set
# CONFIG_ACPI_IBM is not set
# CONFIG_ACPI_TOSHIBA is not set
CONFIG_ACPI_BLACKLIST_YEAR=0
# CONFIG_ACPI_DEBUG is not set
CONFIG_ACPI_BUS=y
CONFIG_ACPI_EC=y
CONFIG_ACPI_POWER=y
CONFIG_ACPI_PCI=y
CONFIG_ACPI_SYSTEM=y

#
# APM (Advanced Power Management) BIOS Support
#
# CONFIG_APM is not set

#
# 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_PCI_MMCONFIG=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=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
#

#
# Executable file formats
#
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m

#
# Device Drivers
#

#
# Generic Driver Options
#
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=m
# CONFIG_DEBUG_DRIVER is not set

#
# Memory Technology Devices (MTD)
#
# CONFIG_MTD is not set

#
# Parallel port support
#
CONFIG_PARPORT=y
CONFIG_PARPORT_PC=y
CONFIG_PARPORT_SERIAL=y
# CONFIG_PARPORT_GSC is not set
# CONFIG_PARPORT_1284 is not set

#
# Plug and Play support
#
CONFIG_PNP=y
# CONFIG_PNP_DEBUG is not set

#
# Protocols
#
# CONFIG_ISAPNP is not set

#
# Block devices
#
# CONFIG_BLK_DEV_FD is not set
# 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_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=m
CONFIG_BLK_DEV_CRYPTOLOOP=m
# 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=m
CONFIG_BLK_DEV_RAM_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=4096
CONFIG_INITRAMFS_SOURCE=""
# CONFIG_LBD is not set
CONFIG_CDROM_PKTCDVD=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE 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=y
CONFIG_BLK_DEV_IDECD=y
# 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_IDEPNP 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_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_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=m
# CONFIG_SCSI_PROC_FS is not set

#
# SCSI support type (disk, tape, CD-ROM)
#
# CONFIG_BLK_DEV_SD is not set
# 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 is not set
# CONFIG_SCSI_CONSTANTS is not set
# 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=m
# 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_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 is not set

#
# Fusion MPT device support
#
# CONFIG_FUSION is not set

#
# IEEE 1394 (FireWire) support
#
# CONFIG_IEEE1394 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 is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
# CONFIG_IP_PNP is not set
CONFIG_NET_IPIP=m
CONFIG_NET_IPGRE=m
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=m
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=m
CONFIG_IP_NF_CT_ACCT=y
# CONFIG_IP_NF_CONNTRACK_MARK is not set
CONFIG_IP_NF_FTP=m
CONFIG_IP_NF_IRC=m
CONFIG_IP_NF_TFTP=m
CONFIG_IP_NF_AMANDA=m
CONFIG_IP_NF_QUEUE=m
CONFIG_IP_NF_IPTABLES=m
CONFIG_IP_NF_MATCH_LIMIT=m
CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_IP_NF_MATCH_MAC=m
CONFIG_IP_NF_MATCH_PKTTYPE=m
CONFIG_IP_NF_MATCH_MARK=m
CONFIG_IP_NF_MATCH_MULTIPORT=m
CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_DSCP=m
CONFIG_IP_NF_MATCH_AH_ESP=m
CONFIG_IP_NF_MATCH_LENGTH=m
CONFIG_IP_NF_MATCH_TTL=m
CONFIG_IP_NF_MATCH_TCPMSS=m
CONFIG_IP_NF_MATCH_HELPER=m
CONFIG_IP_NF_MATCH_STATE=m
CONFIG_IP_NF_MATCH_CONNTRACK=m
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_REALM=m
CONFIG_IP_NF_MATCH_SCTP=m
CONFIG_IP_NF_MATCH_COMMENT=m
CONFIG_IP_NF_MATCH_HASHLIMIT=m
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_LOG=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_TARGET_TCPMSS=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_NAT_NEEDED=y
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
CONFIG_IP_NF_TARGET_NETMAP=m
CONFIG_IP_NF_TARGET_SAME=m
CONFIG_IP_NF_NAT_IRC=m
CONFIG_IP_NF_NAT_FTP=m
CONFIG_IP_NF_NAT_TFTP=m
CONFIG_IP_NF_NAT_AMANDA=m
CONFIG_IP_NF_MANGLE=m
CONFIG_IP_NF_TARGET_TOS=m
CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_DSCP=m
CONFIG_IP_NF_TARGET_MARK=m
CONFIG_IP_NF_TARGET_CLASSIFY=m
CONFIG_IP_NF_RAW=m
CONFIG_IP_NF_TARGET_NOTRACK=m
CONFIG_IP_NF_ARPTABLES=m
CONFIG_IP_NF_ARPFILTER=m
CONFIG_IP_NF_ARP_MANGLE=m
CONFIG_XFRM=y
# CONFIG_XFRM_USER 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

#
# QoS and/or fair queueing
#
# CONFIG_NET_SCHED is not set
CONFIG_NET_CLS_ROUTE=y

#
# Network testing
#
# CONFIG_NET_PKTGEN is not set
# 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
# CONFIG_NET_SB1000 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_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_APRICOT 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_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_R8169 is not set
# CONFIG_SK98LIN is not set
# CONFIG_VIA_VELOCITY is not set
# CONFIG_TIGON3 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=y

#
# Obsolete Wireless cards support (pre-802.11)
#
# CONFIG_STRIP is not set
# CONFIG_ARLAN is not set
# CONFIG_WAVELAN is not set

#
# Wireless 802.11b ISA/PCI cards support
#
# CONFIG_AIRO is not set
# CONFIG_HERMES is not set

#
# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
#
CONFIG_NET_WIRELESS=y

#
# Wan interfaces
#
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_PLIP is not set
CONFIG_PPP=m
CONFIG_PPP_FILTER=y
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
# CONFIG_SLIP is not set
# CONFIG_NET_FC 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 is not set
# 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=m
# 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=m
# CONFIG_INPUT_UINPUT is not set

#
# Hardware I/O ports
#
CONFIG_SERIO=y
CONFIG_SERIO_I8042=y
# CONFIG_SERIO_SERPORT is not set
# 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 is not set
# CONFIG_GAMEPORT is not set
CONFIG_SOUND_GAMEPORT=y

#
# Character devices
#
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
# CONFIG_SERIAL_NONSTANDARD is not set

#
# Serial drivers
#
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
# CONFIG_SERIAL_8250_ACPI is not set
CONFIG_SERIAL_8250_NR_UARTS=4
# CONFIG_SERIAL_8250_EXTENDED is not set

#
# Non-8250 serial port support
#
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
# CONFIG_TIPAR is not set

#
# IPMI
#
# CONFIG_IPMI_HANDLER is not set

#
# Watchdog Cards
#
# CONFIG_WATCHDOG is not set
CONFIG_HW_RANDOM=m
# CONFIG_NVRAM is not set
CONFIG_RTC=m
# CONFIG_GEN_RTC is not set
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM 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=y
# CONFIG_DRM_I810 is not set
# CONFIG_DRM_I830 is not set
# CONFIG_DRM_I915 is not set
# CONFIG_DRM_MGA is not set
# CONFIG_DRM_SIS is not set
# CONFIG_MWAVE is not set
# CONFIG_RAW_DRIVER is not set
# CONFIG_HPET is not set
# CONFIG_HANGCHECK_TIMER is not set

#
# TPM devices
#

#
# I2C support
#
CONFIG_I2C=m
# CONFIG_I2C_CHARDEV is not set

#
# I2C Algorithms
#
CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_ALGOPCA=m

#
# I2C Hardware Bus support
#
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_SCx200_ACB is not set
# CONFIG_I2C_PCA_ISA is not set

#
# Hardware Sensors Chip support
#
# CONFIG_I2C_SENSOR is not set
# CONFIG_SENSORS_LM83 is not set
# CONFIG_SENSORS_LM90 is not set

#
# Other I2C Chip support
#
# 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
#

#
# 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_CPIA is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
# CONFIG_TUNER_3036 is not set
# CONFIG_VIDEO_ZORAN is not set
# CONFIG_VIDEO_SAA7134 is not set
# 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_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 is not set
CONFIG_VIDEO_TUNER=m
CONFIG_VIDEO_BUF=m
CONFIG_VIDEO_BTCX=m
CONFIG_VIDEO_IR=m
CONFIG_VIDEO_TVEEPROM=m

#
# Graphics support
#
# CONFIG_FB is not set
# CONFIG_VIDEO_SELECT is not set

#
# Console display driver support
#
CONFIG_VGA_CONSOLE=y
# CONFIG_MDA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y

#
# Sound
#
CONFIG_SOUND=y

#
# Advanced Linux Sound Architecture
#
CONFIG_SND=y
CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
CONFIG_SND_HWDEP=y
CONFIG_SND_RAWMIDI=y
CONFIG_SND_SEQUENCER=y
# CONFIG_SND_SEQ_DUMMY is not set
CONFIG_SND_OSSEMUL=y
CONFIG_SND_MIXER_OSS=y
CONFIG_SND_PCM_OSS=y
CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_RTCTIMER=m
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set

#
# Generic devices
#
CONFIG_SND_MPU401_UART=y
CONFIG_SND_OPL3_LIB=y
# CONFIG_SND_DUMMY is not set
# CONFIG_SND_VIRMIDI is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set

#
# 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_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=y
# 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 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=y

#
# Miscellaneous USB options
#
CONFIG_USB_DEVICEFS=y

#
# USB Host Controller Drivers
#
CONFIG_USB_EHCI_HCD=y
# 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=m
# CONFIG_USB_BLUETOOTH_TTY is not set
# CONFIG_USB_MIDI is not set
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m

#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
#
CONFIG_USB_STORAGE=m
CONFIG_USB_STORAGE_DEBUG=y
# CONFIG_USB_STORAGE_FREECOM is not set
# CONFIG_USB_STORAGE_ISD200 is not set
# CONFIG_USB_STORAGE_DPCM is not set

#
# USB Input Devices
#
CONFIG_USB_HID=m
# CONFIG_USB_HIDINPUT is not set
# CONFIG_USB_HIDDEV is not set

#
# USB HID Boot Protocol drivers
#
# CONFIG_USB_KBD is not set
# CONFIG_USB_MOUSE is not set
# CONFIG_USB_AIPTEK is not set
# CONFIG_USB_WACOM is not set
# 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_MICROTEK is not set

#
# USB Multimedia devices
#
# CONFIG_USB_DABUSB 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_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_USBNET is not set
# CONFIG_USB_ZD1201 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_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

#
# 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=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_XATTR=y
CONFIG_EXT3_FS_POSIX_ACL=y
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=y
# CONFIG_JBD_DEBUG is not set
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
CONFIG_FS_POSIX_ACL=y

#
# 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=m
CONFIG_JOLIET=y
# CONFIG_ZISOFS is not set
CONFIG_UDF_FS=m
CONFIG_UDF_NLS=y

#
# DOS/FAT/NT Filesystems
#
CONFIG_FAT_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_NTFS_FS=m
CONFIG_NTFS_DEBUG=y
CONFIG_NTFS_RW=y

#
# Pseudo filesystems
#
CONFIG_PROC_FS=y
CONFIG_PROC_KCORE=y
CONFIG_SYSFS=y
# 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_HFSPLUS_FS is not set
# CONFIG_CRAMFS is not set
# 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=m
CONFIG_NFS_V3=y
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_SUNRPC=m
CONFIG_SMB_FS=m
# CONFIG_SMB_NLS_DEFAULT is not set
CONFIG_CIFS=m
# CONFIG_CIFS_STATS is not set
# CONFIG_CIFS_XATTR is not set
# CONFIG_CIFS_EXPERIMENTAL is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_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-15"
CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_CODEPAGE_737=m
CONFIG_NLS_CODEPAGE_775=m
CONFIG_NLS_CODEPAGE_850=m
CONFIG_NLS_CODEPAGE_852=m
CONFIG_NLS_CODEPAGE_855=m
CONFIG_NLS_CODEPAGE_857=m
CONFIG_NLS_CODEPAGE_860=m
CONFIG_NLS_CODEPAGE_861=m
CONFIG_NLS_CODEPAGE_862=m
CONFIG_NLS_CODEPAGE_863=m
CONFIG_NLS_CODEPAGE_864=m
CONFIG_NLS_CODEPAGE_865=m
CONFIG_NLS_CODEPAGE_866=m
CONFIG_NLS_CODEPAGE_869=m
CONFIG_NLS_CODEPAGE_936=m
CONFIG_NLS_CODEPAGE_950=m
CONFIG_NLS_CODEPAGE_932=m
CONFIG_NLS_CODEPAGE_949=m
CONFIG_NLS_CODEPAGE_874=m
CONFIG_NLS_ISO8859_8=m
CONFIG_NLS_CODEPAGE_1250=m
CONFIG_NLS_CODEPAGE_1251=m
# CONFIG_NLS_ASCII is not set
CONFIG_NLS_ISO8859_1=m
CONFIG_NLS_ISO8859_2=m
CONFIG_NLS_ISO8859_3=m
CONFIG_NLS_ISO8859_4=m
CONFIG_NLS_ISO8859_5=m
CONFIG_NLS_ISO8859_6=m
CONFIG_NLS_ISO8859_7=m
CONFIG_NLS_ISO8859_9=m
CONFIG_NLS_ISO8859_13=m
CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_KOI8_R=m
CONFIG_NLS_KOI8_U=m
CONFIG_NLS_UTF8=m

#
# Kernel hacking
#
CONFIG_PRINTK_TIME=y
CONFIG_DEBUG_KERNEL=y
CONFIG_MAGIC_SYSRQ=y
CONFIG_LOG_BUF_SHIFT=15
CONFIG_SCHEDSTATS=y
CONFIG_DEBUG_SLAB=y
CONFIG_DEBUG_PREEMPT=y
CONFIG_DEBUG_SPINLOCK=y
CONFIG_DEBUG_SPINLOCK_SLEEP=y
CONFIG_DEBUG_KOBJECT=y
CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEBUG_INFO=y
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=y
# 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=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_CAPABILITIES=y
# CONFIG_SECURITY_ROOTPLUG is not set
CONFIG_SECURITY_SECLVL=m
# CONFIG_SECURITY_SELINUX is not set

#
# Cryptographic options
#
CONFIG_CRYPTO=y
# CONFIG_CRYPTO_HMAC is not set
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_SHA1=m
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_AES_586=m
CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST6=m
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_ARC4=y
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_ANUBIS=m
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_TEST=m

#
# Hardware crypto devices
#
# CONFIG_CRYPTO_DEV_PADLOCK is not set

#
# Library routines
#
CONFIG_CRC_CCITT=m
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=m
CONFIG_ZLIB_DEFLATE=m
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

Re: Linux 2.6.12-rc3

[Christoph Hellwig]

On Sat, Apr 23, 2005 at 10:42:31PM -0700, Greg KH wrote:
> What is your .config that generates this?  What arch?

should happen on all architectures with usb-storage debugging enabled.

Someone fucked up usb-stroage again after I cleaned up usage of the
old-style scsi.h header, and this is the result of scsi.h gradually
going away.

The patch posted isthe correct fix.

Re: Linux 2.6.12-rc3

[Geert Uytterhoeven]

On Tue, 26 Apr 2005, Al Viro wrote:
> On Mon, Apr 25, 2005 at 09:14:01PM +0200, Geert Uytterhoeven wrote:
> > On Thu, 21 Apr 2005, Al Viro wrote:
> > > As far as I can see that's the minimally intrusive header changes needed
> > > to avoid problems - better than variant with splitting sched.h as in m68k CVS.
> > 
> > We can discuss about that. IIRC, HCH is also in favor of splitting off struct
> > task_struct from sched.h.
> 
> Sure, but splitting sched.h is a separate story.  Mixing it with m68k
> merge will only make both harder.  It requires more include reordering
> and I'd rather keep that headache separate from m68k issues.  I agree
> that eventual splitup of sched.h makes sense.  However, I think that
> going for minimally intrusive variant of merge and then dealing with
> sched.h would be easier for everyone.

I agree, it's a separate story.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: Linux 2.6.12-rc3

[Andrew Morton]

Len Brown <len.brown@intel.com> wrote:
>
> ...
> Also, I would think Bitmover would be interested in having you enabled
> to keep people like me as happy paying customers.

hm.  I guess I can continue to use bk until the end of July or until we hit
the 65535th cset.  After that things become murky.

> The question for bk use is what do we do for a reference "Linus tree"
> history.  It would be most effective if we could have a single bk history
> rather than everybody rolling their own.

yes, someone needs to set up a bk tree which is fed diffs from Linus's git
tree.  Let's call this the linus-git-bk-tree.  You then pull this into the
acpi tree.

> > - How do I do a bk `gcapatch' is there is no Linus bk tree to base it off?
> > 
> > - If none of the above, which maintainers will put up-to-date raw patches
> >   in places where Andrew can get at them?
> 
> I can do this if you require it.

Once you have the linus-git-bk-tree, then yes, it would be very nice if you
(or someone else) were to set up another machine which every six hours or
so does

	cd bk-acpi/
	bk pull bk://linux-acpi.bkbits.net/to-akpm
	gcapatch > /ftp-dir/bk-acpi.patch

and makes /ftp-dir available.  The same machine could also publish all the
other bk trees, such as Tony's
http://lia64.bkbits.net/linux-ia64-test-2.6.12.  I have all the bk url's.

The fact that some developers change the bk URL between major kernel
releases will be a bit of a pain.

>  The current "acpi patch" includes
> 68 patches: 200 files changed, 7780 insertions(+), 5455 deletions(-)
> 
> Everything in it is intended to go to Linus on day-one of 2.6.13.
> Some of it should really go into 2.6.12 - but frankly, I hesitate
> to touch 2.6.12 while the tools are in such flux.

"flux".  I've never seen it spelled that way before ;)

> > I don't know how all this will pan out.  I guess the next -mm won't have
> > many subsystem trees and I'll gradually add them as things get sorted out.
> 
> Please do not roll -mm without including the ACPI sub-system.
> -mm provides the broadest pre-integration test coverage we've ever had.
> It has allowed us to significantly reduce regressions in Linus' tree
> as we encounter the inevitable setbacks associated with making
> the ACPI sub-system in Linux the best in the industry.

OK, well once we have linus-git-bk-tree I can continue to do bk pulls until
either the bk license explodes or we hit the 65536-csets problem.

After that, the automated-patch-exports thing above would be needed.

In the very short-term, please email me the patch.  Some automated daily
thing would suit.

Re: Linux 2.6.12-rc3

[Len Brown]

On Sun, 2005-04-24 at 06:26, Andrew Morton wrote:

> Andrew has some work to do before he can regain momentum:
> 
> - Which subsystem maintainers will have public git trees?
> 
> - Which maintainers will continue to use bk?

I will continue to use bk
until an alternative emerges that makes my role
as a sub-system maintainer easier -- rather than harder.

My employer pays for a commercial bk license.

> - Can Andrew legally use the bk client?
> 
> - Can Andrew legally use a bk client which won't go phut at cset 65535?

I don't see why not.  Given your central role to the Linux development
process, I would think it would be trivial to justify OSDL arming you
with any and all tools you desire if they make you even slightly more effective.

Also, I would think Bitmover would be interested in having you enabled
to keep people like me as happy paying customers.

The question for bk use is what do we do for a reference "Linus tree"
history.  It would be most effective if we could have a single bk history
rather than everybody rolling their own.

> - How do I do a bk `gcapatch' is there is no Linus bk tree to base it off?
> 
> - If none of the above, which maintainers will put up-to-date raw patches
>   in places where Andrew can get at them?

I can do this if you require it.  The current "acpi patch" includes
68 patches: 200 files changed, 7780 insertions(+), 5455 deletions(-)

Everything in it is intended to go to Linus on day-one of 2.6.13.
Some of it should really go into 2.6.12 - but frankly, I hesitate
to touch 2.6.12 while the tools are in such flux.

> I don't know how all this will pan out.  I guess the next -mm won't have
> many subsystem trees and I'll gradually add them as things get sorted out.

Please do not roll -mm without including the ACPI sub-system.
-mm provides the broadest pre-integration test coverage we've ever had.
It has allowed us to significantly reduce regressions in Linus' tree
as we encounter the inevitable setbacks associated with making
the ACPI sub-system in Linux the best in the industry.

thanks,
-Len

Re: Linux 2.6.12-rc3

[Al Viro]

On Mon, Apr 25, 2005 at 09:14:01PM +0200, Geert Uytterhoeven wrote:
> On Thu, 21 Apr 2005, Al Viro wrote:
> > As far as I can see that's the minimally intrusive header changes needed
> > to avoid problems - better than variant with splitting sched.h as in m68k CVS.
> 
> We can discuss about that. IIRC, HCH is also in favor of splitting off struct
> task_struct from sched.h.

Sure, but splitting sched.h is a separate story.  Mixing it with m68k
merge will only make both harder.  It requires more include reordering
and I'd rather keep that headache separate from m68k issues.  I agree
that eventual splitup of sched.h makes sense.  However, I think that
going for minimally intrusive variant of merge and then dealing with
sched.h would be easier for everyone.

Re: Linux 2.6.12-rc3

[Geert Uytterhoeven]

On Thu, 21 Apr 2005, Al Viro wrote:
> As far as I can see that's the minimally intrusive header changes needed
> to avoid problems - better than variant with splitting sched.h as in m68k CVS.

We can discuss about that. IIRC, HCH is also in favor of splitting off struct
task_struct from sched.h.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: Linux 2.6.12-rc3

[Geert Uytterhoeven]

On Thu, 21 Apr 2005, Al Viro wrote:
> On Thu, Apr 21, 2005 at 11:10:15AM +0200, Geert Uytterhoeven wrote:
> > On Thu, 21 Apr 2005, Jan Dittmer wrote:
> > > Linus Torvalds wrote:
> > > > Geert Uytterhoeven:
> > > >     [PATCH] M68k: Update defconfigs for 2.6.11
> > > >     [PATCH] M68k: Update defconfigs for 2.6.12-rc2
> > > 
> > > Why do I still get this error when trying to cross-compile for m68k?
> > 
> > Because to build m68k kernels, you (still :-( have to use the Linux/m68k CVS
> > repository, cfr. http://linux-m68k-cvs.ubb.ca/.
> > 
> > BTW, my patch queue is at
> > http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-2.6.x-merging/.
> > The main offender is POSTPONED/156-thread_info.diff.
> 
> I think I have a sane splitup of that stuff.  If you have time to review - yell

Thanks a lot! Very well done!!

I did some (eyeball) review and the compiler liked it as well, so everything
seems OK.

Unfortunately due to various personal reasons I won't have time to test it on
real hardware anytime soon. But if anyone does, I'll take it for sure.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: Linux 2.6.12-rc3

[Anton Altaparmakov]

Hi Andrew,

On Sun, 2005-04-24 at 03:26 -0700, Andrew Morton wrote:
> - Which subsystem maintainers will have public git trees?

Ntfs is not quite a subsystem, but if it would be possible for me to
have an account on kernel.org, I would be very happy to place .git trees
replacing the ntfs and ntfs-devel bk repositories there.  Otherwise I
have nowhere to host such beasts.

Best regards,

        Anton
-- 
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer / IRC: #ntfs on irc.freenode.net
WWW: http://linux-ntfs.sf.net/ & http://www-stu.christs.cam.ac.uk/~aia21/

Re: Linux 2.6.12-rc3

[Marcel Holtmann]

Hi Andrew,

> - Which subsystem maintainers will have public git trees?

if someone gives me an account on kernel.org, I am happy to put the tree
for the Bluetooth subsystem there.

Regards

Marcel

Re: Linux 2.6.12-rc3

[David S. Miller]

On Sun, 24 Apr 2005 03:26:22 -0700
Andrew Morton <akpm@osdl.org> wrote:

> - Which subsystem maintainers will have public git trees?

I am pretty much exclusively using GIT for networking
and sparc stuff now and I plan to provide my trees
on kernel.org

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

> > > > The main issue is if you want to use git for development and accepting
> > > > patches from others, you need to be used to not using that git tree to
> > > > send patches to Linus.  To send patches to him, do something like the
> > > > following:
> > > > 	- export the patches from your git tree
> > > > 	- pick and choose what you want to send off, cleaning up the
> > > > 	  changelog comments and merging patches that need to be.
> > > > 	- clone the latest copy of Linus's tree.
> > > > 	- apply the patches to that tree.
> > > > 	- make the tree public
> > > > 	- generate an email with the diffs and send that off to lkml and
> > > > 	  Linus.
> > > > 
> > > > Because of all of this, I've found that it is easier to use quilt for
> > > > day-to-day development and acceptance of patches.  Then use git to build
> > > > up trees for Linus to pull from.
> > > > 
> > > > But you might find your workflow is different :)
> > > 
> > > How does Andrew fit into this picture, btw? I thought all patches ought
> > > to go through him... Is Andrew willing to pull from git trees? Or is
> > > it "create one version for akpm, and when he ACKs it, create another
> > > for Linus"?
> > 
> > Yeah, getting Andrew into the picture is a bit different.
> 
> Andrew has some work to do before he can regain momentum:
> 
> - Which subsystem maintainers will have public git trees?

I'd like to use git. It sucks for actuall development, but seems to be
very usefull for taking nice and clean patches from people...

> - Which maintainers will continue to use bk?
> 
> - Can Andrew legally use the bk client?

I guess you need to Cc Larry on this one....
								Pavel
-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!
> > Greg KH <greg@kroah.com> wrote:
> > > In the patches/ subdir below that one, is a mirror of my quilt patches
> > > directory, series file and all.  That way people can still see the
> > > individual patches if they want to.
> > > 
> > > Does this help some?  It's all still under flux as to how this all
> > > works, try something and go from there :)
> > 
> > Yes, it would be nice to have gregkh's patches in -mm as individual patches.
> 
> It would?  Ok, that's easy to change.
> 
> > Of course, whatever gets done, I'd selfishly prefer that most (or even all)
> > subsystem maintainers work the same way and adopt the same work practices.
> > 
> > I guess it's too early to think about that, but if one maintainer (hint)
> > were to develop and document a good methodology and toolset, others might
> > quickly follow.
> 
> Heh, ok, I can take a hint, I'll work on this this week.  I already have
> the "export a series of patches from a git tree that are not in another
> git tree" working, so it shouldn't be tough to get the rest in an
> "automated" manner.

I started to do something like that, but got to dead end (shared
object directories...). Maybe this is usefull to someone, and maybe
not...

								Pavel

	Kernel hacker's guide to git
	~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      2005 Pavel Machek <pavel@suse.cz>

You can get git at http://pasky.or.cz/~pasky/dev/git/ . Compile it,
and place it somewhere in $PATH. Then you can get kernel by running

mkdir clean-git; cd clean-git
git init rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

... Run git log to get idea of what happened in tree you are
tracking. Do git pull linus to pickup latest changes from Linus. You
can do git diff to see what changes you done in your local tree. git
cancel will kill any such changes.

You can commit changes by doing git commit... If you want to get diff
of your changes against mainline, do

git diff -r origin: 

. If you want to get the same diff but separated patch-by-patch, do

git patch origin:

. (Does something unexpected after first merge).

To update your tree against name "foo", do:

        git track linus
        git pull

or

        git merge linus


How to set up your trees so that you can cooperate with linus
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

What I did:

Created clean-git. Initialized straight from Linus (as above). Then I
created my "dirty" working tree:

git fork pavel /data/l/linux-git

and created "nice" tree, good for pulling

git fork good /data/l/linux-good

. I do my work in linux-git. If someone sends me nice patch I should
pass up, I apply it to linux-good with nice message and do

git merge good

in my working tree.


Publishing your trees
~~~~~~~~~~~~~~~~~~~~~

on remote server: (as an optimization...)

cd ~/WWW/git
rsync -zavP rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git .
mv linux-2.6.git good.git

then on localhost: 

cd /data/l/linux-good
rsync -zavP -essh --delete .git pavel@atrey.karlin.mff.cuni.cz:~/WWW/git/good.git

[Oops, bad. cogito -created forks use symlinks in a way which is quite "interesting".]



-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Greg KH]

On Sun, Apr 24, 2005 at 03:26:22AM -0700, Andrew Morton wrote:
> Greg KH <greg@kroah.com> wrote:
> > In the patches/ subdir below that one, is a mirror of my quilt patches
> > directory, series file and all.  That way people can still see the
> > individual patches if they want to.
> > 
> > Does this help some?  It's all still under flux as to how this all
> > works, try something and go from there :)
> 
> Yes, it would be nice to have gregkh's patches in -mm as individual patches.

It would?  Ok, that's easy to change.

> Of course, whatever gets done, I'd selfishly prefer that most (or even all)
> subsystem maintainers work the same way and adopt the same work practices.
> 
> I guess it's too early to think about that, but if one maintainer (hint)
> were to develop and document a good methodology and toolset, others might
> quickly follow.

Heh, ok, I can take a hint, I'll work on this this week.  I already have
the "export a series of patches from a git tree that are not in another
git tree" working, so it shouldn't be tough to get the rest in an
"automated" manner.

thanks,

greg k-h

Re: Linux 2.6.12-rc3

[Sam Ravnborg]

Hi Andrew.

> Andrew has some work to do before he can regain momentum:
> 
> - Which subsystem maintainers will have public git trees?
Planning to have it - when I feel cogito has stabilized a bit.

> - Which maintainers will continue to use bk?
I always liked bk, but will not upgrade to a commercial license.
So bk-kbuild and bk-kconfig will soon dismiss.
 
> Of course, whatever gets done, I'd selfishly prefer that most (or even all)
> subsystem maintainers work the same way and adopt the same work practices.

It will to some respect depend on the nature of the patches that one
want to have included. Working with a set a patches that change often
will call for a quilt based solution. Working with a fairly stable set
of patches will most likely call for a cogito/git solution.

I will await and see what Greg KH or others come up with.

	Sam

Re: Linux 2.6.12-rc3

[Linus Torvalds]

On Sun, 24 Apr 2005, Andrew Morton wrote:
> 
> - How do I do a bk `gcapatch' is there is no Linus bk tree to base it off?

"gcapatch" should be trivial if I have understood it correctly, and git
can already do it. I've never used it, though, and in a mixed git/bk
environment you probably want to use bk to do these things and just import
things from git, if only because bk will be better at merging things
automatically.

Also, exporting from git->bk looks like it should be very easy and 
automatable efficiently. "SMOP".

		Linus

Re: Linux 2.6.12-rc3

[Bodo Eggert <harvested.in.lkml@posting.7eggert.dyndns.org>]

Greg KH <greg@kroah.com> wrote:

> Feel free to make it better, I have never claimed to be a bash
> programmer :)

Just some basic comments:

> #!/bin/bash

set -e

> DIR=$1
> 
> mkdir $DIR
> cd $DIR
[...]

General rule: _*Allways*_ use quotes for variable expansion.

Reason:

$ md foo\ bar
$ DIR=Foo\ bar
$ cd $DIR
bash: cd: foo: No such file or directory

-- 
Top 100 things you don't want the sysadmin to say:
70. Hmm, maybe if I do this...

Re: Linux 2.6.12-rc3

[Andrew Morton]

Greg KH <greg@kroah.com> wrote:
>
> On Sun, Apr 24, 2005 at 12:29:46AM +0200, Pavel Machek wrote:
> > Hi!
> > 
> > > > > A word of warning: in many ways it's easier to work with patches. In
> > > > > particular, if you want to have me merge from your tree, I require a
> > > > > certain amount of cleanliness in the trees I'm pulling from. All of the
> > > > > people who used to use BK to sync are already used to that, but for people
> > > > > who didn't historically use BK this is going to be a learning experience.
> > > > > 
> > > > 
> > > > Is there a summary available of the major issues here so that we who are
> > > > new to this can get up to speed fairly quickly?
> > > 
> > > The main issue is if you want to use git for development and accepting
> > > patches from others, you need to be used to not using that git tree to
> > > send patches to Linus.  To send patches to him, do something like the
> > > following:
> > > 	- export the patches from your git tree
> > > 	- pick and choose what you want to send off, cleaning up the
> > > 	  changelog comments and merging patches that need to be.
> > > 	- clone the latest copy of Linus's tree.
> > > 	- apply the patches to that tree.
> > > 	- make the tree public
> > > 	- generate an email with the diffs and send that off to lkml and
> > > 	  Linus.
> > > 
> > > Because of all of this, I've found that it is easier to use quilt for
> > > day-to-day development and acceptance of patches.  Then use git to build
> > > up trees for Linus to pull from.
> > > 
> > > But you might find your workflow is different :)
> > 
> > How does Andrew fit into this picture, btw? I thought all patches ought
> > to go through him... Is Andrew willing to pull from git trees? Or is
> > it "create one version for akpm, and when he ACKs it, create another
> > for Linus"?
> 
> Yeah, getting Andrew into the picture is a bit different.

Andrew has some work to do before he can regain momentum:

- Which subsystem maintainers will have public git trees?

- Which maintainers will continue to use bk?

- Can Andrew legally use the bk client?

- Can Andrew legally use a bk client which won't go phut at cset 65535?

- How do I do a bk `gcapatch' is there is no Linus bk tree to base it off?

- If none of the above, which maintainers will put up-to-date raw patches
  in places where Andrew can get at them?

I don't know how all this will pan out.  I guess the next -mm won't have
many subsystem trees and I'll gradually add them as things get sorted out.

>  Previously,
> with bk, I could just have him pull from my trees, and generate a patch
> from that.  And actually, with git that would work just as well, so if
> you make your git working trees public, he can pull from them and you're
> fine.

yup.

> But with quilt it's different.  That's why I make up a big patch which
> is the sum of my individual patches and put them on a public site.
> Right now you can see this at:
> 	kernel.org/pub/linux/kernel/people/gregkh-2.6/
> The patches in that directory are the "rolled up" ones.  The script
> there is what I use to build these patches, if you want to do something
> like it.

I could aggregate a subsystem maintainer's quilt series into -mm of
course.  That would be nicer than a huge rollup for both code reviewing and
for the old bsearch-to-find-the-regression process.

Of course, quilt-based patches can be checked into an SCM and publically
exported.   Lots of people do that.

> In the patches/ subdir below that one, is a mirror of my quilt patches
> directory, series file and all.  That way people can still see the
> individual patches if they want to.
> 
> Does this help some?  It's all still under flux as to how this all
> works, try something and go from there :)

Yes, it would be nice to have gregkh's patches in -mm as individual patches.

Of course, whatever gets done, I'd selfishly prefer that most (or even all)
subsystem maintainers work the same way and adopt the same work practices.

I guess it's too early to think about that, but if one maintainer (hint)
were to develop and document a good methodology and toolset, others might
quickly follow.

Re: Linux 2.6.12-rc3

[Dmitry Torokhov]

On Sunday 24 April 2005 02:21, Pavel Machek wrote:
> Without cherypicking, I just can't pull from linux-git into
> linux-good. Ever. linux-git contains some changes that just can not go
> anywhere. (Like for example czech-ucw-defkeymap.map)

I was using quilt on top of BK and I think it will be good idea to do the
same with git... When I think that my patches are ready for other people
to see I cherry-pick and commit them into $SCM and push into externally-
visible tree.

-- 
Dmitry

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

On Ne 24-04-05 01:23:03, Petr Baudis wrote:
> Dear diary, on Sat, Apr 23, 2005 at 01:18:39AM CEST, I got a letter
> where Pavel Machek <pavel@ucw.cz> told me that...
> > git patch origin:
> > 
> > will list my patches, plus any merges I done... Is there any
> > reasonable way to get only "my" changes? When I do not have to resolve
> > anything during merge, it should be usable... but that is starting to
> > look ugly.
> 
> I told you the semantics is peculiar.
> 
> We could add a flag to rev-tree to always follow only the first parent;
> that would be useful even for a flag for git log to "flatten" the
> history, if you aren't interested in what was going on in the trees you
> just merged.
> 
> Another flag to avoid showing patches for merges might be possible, but
> actually a little scary since you don't have consistency assured that
> way; your post-merge patches might generate rejects when applied on top
> of the pre-merge patches, or your pre-merge patches might not apply
> cleanly on the tree you merged with.
> 
> So if you want to ignore merges, it sounds that you are probably
> actually doing something wrong. We might still let you do it
> assuming

Right. Actually right thing might be to "only show human-made part of
each merge" or something like that. Ignoring merges altogether is not
quite right. OTOH really only small part of merge is going to
matter...
								Pavel
-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

On Ne 24-04-05 01:06:48, Petr Baudis wrote:
> Dear diary, on Sun, Apr 24, 2005 at 01:00:23AM CEST, I got a letter
> where Pavel Machek <pavel@ucw.cz> told me that...
> > I created three trees here (with git fork): one ("clean-git") to track
> > your changes, second ("linux-git") to do my development on and third
> > ("linux-good") for good, nice, cleaned-up changes, for you to merge.
> > 
> > ...unfortunately pasky's git just symlinked object/ directories...
> 
> You can't do any better than that, since you would have to transfer
> stuff around by pulling them otherwise; so you would need smart git
> pull, but then Linus can use the smart git pull himself anyway. ;-)

Actually, no.

Without cherypicking, I just can't pull from linux-git into
linux-good. Ever. linux-git contains some changes that just can not go
anywhere. (Like for example czech-ucw-defkeymap.map)

So it should be okay to just copy object directories instead of
linking them. Or perhaps cp -al is good idea here. (It also removes
trap where I rm -rf-ed tree I did fork from....)

Heh, filesystem with auto-file-hardlinking would be nice there ;-).
 
								Pavel
-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Greg KH]

On Sun, Apr 24, 2005 at 01:00:23AM +0200, Pavel Machek wrote:
> Hi!
> 
> > > Could we add some kind off "This-changeset-obsoletes: <sha1>" header?
> > > That would  allow me to send patches by hand and still make the SCM do the
> > > right thing during merge.
> > 
> > That doesn't really scale, plus I don't want to rely on that kind of hack
> > since it's simply not reliable (the patch may have gotten edited on the
> > way, so maybe the stuff I apply is 90% from your patch, but 10%
> > different).
> 
> (Well, at that point I probably want to drop that 10% anyway :-).
> 
> > Also, it doesn't actually handle the generic case, which is that the other
> > end used something else than git to maintain his patches (which in the end
> > has the exact same issues).
> 
> Actually this one should not be a problem. "This-changeset-obsoletes:"
> would probably be in changelog part, and remote end would just
> propagate it.
> 
> > > Alternatively I should just get public rsync-able space somewhere...
> > > Would kernel.org be willing to add people/pavel?
> > 
> > Now, that's actually something people are working on ("git.kernel.org"),
> > so I don't think that would be a problem. People _are_ trying to set up
> > things like a bkbits.net at least for the kernel. I know OSDL and OSL
> > (http://osuosl.org/) are interested, and I think the current kernel.org
> > works too.
> > 
> > A word of warning: in many ways it's easier to work with patches. In
> > particular, if you want to have me merge from your tree, I require a
> > certain amount of cleanliness in the trees I'm pulling from. All of the
> > people who used to use BK to sync are already used to that, but for people
> > who didn't historically use BK this is going to be a learning experience.
> > 
> > The reason patches are easier is that you can start out from a messy tree, 
> > and then whittle down the patch to just the part you want to send me, so 
> > it doesn't actually matter how messy your original tree is, you can always 
> > make the end result look nice. 
> 
> I created three trees here (with git fork): one ("clean-git") to track
> your changes, second ("linux-git") to do my development on and third
> ("linux-good") for good, nice, cleaned-up changes, for you to merge.
> 
> ...unfortunately pasky's git just symlinked object/ directories...
> 
> ...that means that if you pull from me using rsync, you'll get all my
> "development" files, too. Not accessible in any normal way, but still
> there.
> 
> That means that git fork can't be used for "good tree for
> Linus"... not until we have something better than rsync :-(.

I'm not really using the git-pasky part of git yet for development
(except for 'git log -c')  You can just "clone" the tree yourself with a
stupid little script like I do below.  It still uses hard-links so
common git objects are only in one place on the disk.

Feel free to make it better, I have never claimed to be a bash
programmer :)

thanks,

greg k-h

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

#!/bin/bash

DIR=$1

mkdir $DIR
cd $DIR
mkdir .git
cp ~/linux/kernel.org/people/torvalds/linux-2.6.git/HEAD .git/
cp -rl ~/linux/kernel.org/people/torvalds/linux-2.6.git/objects/ .git/objects/

HEAD=`cat .git/HEAD`
echo "HEAD=$HEAD"
echo ""

cat-file commit $HEAD
TREE_HEAD=`cat-file commit $HEAD | head -n 1 | cut -f 2 -d " "`
echo "TREE_HEAD=$TREE_HEAD"

echo "read-tree $TREE_HEAD"
read-tree $TREE_HEAD

echo "checkout-cache -a"
checkout-cache -a

echo "update-cache --refresh"
update-cache --refresh

Re: Linux 2.6.12-rc3

[Greg KH]

On Sun, Apr 24, 2005 at 12:29:46AM +0200, Pavel Machek wrote:
> Hi!
> 
> > > > A word of warning: in many ways it's easier to work with patches. In
> > > > particular, if you want to have me merge from your tree, I require a
> > > > certain amount of cleanliness in the trees I'm pulling from. All of the
> > > > people who used to use BK to sync are already used to that, but for people
> > > > who didn't historically use BK this is going to be a learning experience.
> > > > 
> > > 
> > > Is there a summary available of the major issues here so that we who are
> > > new to this can get up to speed fairly quickly?
> > 
> > The main issue is if you want to use git for development and accepting
> > patches from others, you need to be used to not using that git tree to
> > send patches to Linus.  To send patches to him, do something like the
> > following:
> > 	- export the patches from your git tree
> > 	- pick and choose what you want to send off, cleaning up the
> > 	  changelog comments and merging patches that need to be.
> > 	- clone the latest copy of Linus's tree.
> > 	- apply the patches to that tree.
> > 	- make the tree public
> > 	- generate an email with the diffs and send that off to lkml and
> > 	  Linus.
> > 
> > Because of all of this, I've found that it is easier to use quilt for
> > day-to-day development and acceptance of patches.  Then use git to build
> > up trees for Linus to pull from.
> > 
> > But you might find your workflow is different :)
> 
> How does Andrew fit into this picture, btw? I thought all patches ought
> to go through him... Is Andrew willing to pull from git trees? Or is
> it "create one version for akpm, and when he ACKs it, create another
> for Linus"?

Yeah, getting Andrew into the picture is a bit different.  Previously,
with bk, I could just have him pull from my trees, and generate a patch
from that.  And actually, with git that would work just as well, so if
you make your git working trees public, he can pull from them and you're
fine.

But with quilt it's different.  That's why I make up a big patch which
is the sum of my individual patches and put them on a public site.
Right now you can see this at:
	kernel.org/pub/linux/kernel/people/gregkh-2.6/
The patches in that directory are the "rolled up" ones.  The script
there is what I use to build these patches, if you want to do something
like it.

In the patches/ subdir below that one, is a mirror of my quilt patches
directory, series file and all.  That way people can still see the
individual patches if they want to.

Does this help some?  It's all still under flux as to how this all
works, try something and go from there :)

thanks,

greg k-h

Re: Linux 2.6.12-rc3

[Petr Baudis]

Dear diary, on Sat, Apr 23, 2005 at 01:18:39AM CEST, I got a letter
where Pavel Machek <pavel@ucw.cz> told me that...
> git patch origin:
> 
> will list my patches, plus any merges I done... Is there any
> reasonable way to get only "my" changes? When I do not have to resolve
> anything during merge, it should be usable... but that is starting to
> look ugly.

I told you the semantics is peculiar.

We could add a flag to rev-tree to always follow only the first parent;
that would be useful even for a flag for git log to "flatten" the
history, if you aren't interested in what was going on in the trees you
just merged.

Another flag to avoid showing patches for merges might be possible, but
actually a little scary since you don't have consistency assured that
way; your post-merge patches might generate rejects when applied on top
of the pre-merge patches, or your pre-merge patches might not apply
cleanly on the tree you merged with.

So if you want to ignore merges, it sounds that you are probably
actually doing something wrong. We might still let you do it assuming
that you know what are you doing and you will test the patches for
applying to whatever you want to apply them on, but with a big
exclamation mark.

Patches welcome, if anyone wants to do it before I get to it. ;-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor

Re: Linux 2.6.12-rc3

[Petr Baudis]

Dear diary, on Sun, Apr 24, 2005 at 01:00:23AM CEST, I got a letter
where Pavel Machek <pavel@ucw.cz> told me that...
> I created three trees here (with git fork): one ("clean-git") to track
> your changes, second ("linux-git") to do my development on and third
> ("linux-good") for good, nice, cleaned-up changes, for you to merge.
> 
> ...unfortunately pasky's git just symlinked object/ directories...

You can't do any better than that, since you would have to transfer
stuff around by pulling them otherwise; so you would need smart git
pull, but then Linus can use the smart git pull himself anyway. ;-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

> > Could we add some kind off "This-changeset-obsoletes: <sha1>" header?
> > That would  allow me to send patches by hand and still make the SCM do the
> > right thing during merge.
> 
> That doesn't really scale, plus I don't want to rely on that kind of hack
> since it's simply not reliable (the patch may have gotten edited on the
> way, so maybe the stuff I apply is 90% from your patch, but 10%
> different).

(Well, at that point I probably want to drop that 10% anyway :-).

> Also, it doesn't actually handle the generic case, which is that the other
> end used something else than git to maintain his patches (which in the end
> has the exact same issues).

Actually this one should not be a problem. "This-changeset-obsoletes:"
would probably be in changelog part, and remote end would just
propagate it.

> > Alternatively I should just get public rsync-able space somewhere...
> > Would kernel.org be willing to add people/pavel?
> 
> Now, that's actually something people are working on ("git.kernel.org"),
> so I don't think that would be a problem. People _are_ trying to set up
> things like a bkbits.net at least for the kernel. I know OSDL and OSL
> (http://osuosl.org/) are interested, and I think the current kernel.org
> works too.
> 
> A word of warning: in many ways it's easier to work with patches. In
> particular, if you want to have me merge from your tree, I require a
> certain amount of cleanliness in the trees I'm pulling from. All of the
> people who used to use BK to sync are already used to that, but for people
> who didn't historically use BK this is going to be a learning experience.
> 
> The reason patches are easier is that you can start out from a messy tree, 
> and then whittle down the patch to just the part you want to send me, so 
> it doesn't actually matter how messy your original tree is, you can always 
> make the end result look nice. 

I created three trees here (with git fork): one ("clean-git") to track
your changes, second ("linux-git") to do my development on and third
("linux-good") for good, nice, cleaned-up changes, for you to merge.

...unfortunately pasky's git just symlinked object/ directories...

...that means that if you pull from me using rsync, you'll get all my
"development" files, too. Not accessible in any normal way, but still
there.

That means that git fork can't be used for "good tree for
Linus"... not until we have something better than rsync :-(.

								Pavel

-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

> > > A word of warning: in many ways it's easier to work with patches. In
> > > particular, if you want to have me merge from your tree, I require a
> > > certain amount of cleanliness in the trees I'm pulling from. All of the
> > > people who used to use BK to sync are already used to that, but for people
> > > who didn't historically use BK this is going to be a learning experience.
> > > 
> > 
> > Is there a summary available of the major issues here so that we who are
> > new to this can get up to speed fairly quickly?
> 
> The main issue is if you want to use git for development and accepting
> patches from others, you need to be used to not using that git tree to
> send patches to Linus.  To send patches to him, do something like the
> following:
> 	- export the patches from your git tree
> 	- pick and choose what you want to send off, cleaning up the
> 	  changelog comments and merging patches that need to be.
> 	- clone the latest copy of Linus's tree.
> 	- apply the patches to that tree.
> 	- make the tree public
> 	- generate an email with the diffs and send that off to lkml and
> 	  Linus.
> 
> Because of all of this, I've found that it is easier to use quilt for
> day-to-day development and acceptance of patches.  Then use git to build
> up trees for Linus to pull from.
> 
> But you might find your workflow is different :)

How does Andrew fit into this picture, btw? I thought all patches ought
to go through him... Is Andrew willing to pull from git trees? Or is
it "create one version for akpm, and when he ACKs it, create another
for Linus"?

								Pavel
-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Greg KH]

On Sat, Apr 23, 2005 at 06:27:33PM +0200, Pierre Ossman wrote:
> Linus Torvalds wrote:
> > 
> > A word of warning: in many ways it's easier to work with patches. In
> > particular, if you want to have me merge from your tree, I require a
> > certain amount of cleanliness in the trees I'm pulling from. All of the
> > people who used to use BK to sync are already used to that, but for people
> > who didn't historically use BK this is going to be a learning experience.
> > 
> 
> Is there a summary available of the major issues here so that we who are
> new to this can get up to speed fairly quickly?

The main issue is if you want to use git for development and accepting
patches from others, you need to be used to not using that git tree to
send patches to Linus.  To send patches to him, do something like the
following:
	- export the patches from your git tree
	- pick and choose what you want to send off, cleaning up the
	  changelog comments and merging patches that need to be.
	- clone the latest copy of Linus's tree.
	- apply the patches to that tree.
	- make the tree public
	- generate an email with the diffs and send that off to lkml and
	  Linus.

Because of all of this, I've found that it is easier to use quilt for
day-to-day development and acceptance of patches.  Then use git to build
up trees for Linus to pull from.

But you might find your workflow is different :)

Hope this helps,

greg k-h

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

> > > > Well, not sure.
> > > > 
> > > > I did 
> > > > 
> > > > git track linus
> > > > git cancel
> > > > 
> > > > but Makefile still contains -rc2. (Is "git cancel" right way to check
> > > > out the tree?)
> > > 
> > > No. git cancel does what it says - cancels your local changes to the
> > > working tree. git track will only set that next time you pull from
> > > linus, the changes will be automatically merged. (Note that this will
> > > change with the big UI change.)
> > 
> > Is there way to say "forget those changes in my repository, I want
> > just plain vanilla" without rm -rf?
> 
> git cancel will give you "plain last commit". If you need plain vanilla,
> the "hard way" now is to just do
> 
> 	commit-id >.git/HEAD
> 
> but your current HEAD will be lost forever. Or do
> 
> 	git fork vanilla ~/vanilla linus
> 
> and you will have the vanilla tree tracking linus in ~/vanilla.

Yep, symlinked in nice way. Good trap; it cought me ;-). (I of course
deleted the original directory).

> I'm not yet sure if we should have some Cogito interface for doing this
> and what its semantics should be.

Perhaps "git init" is right command for this? Running it in non-empty
directory for faster restart after bad problem....
								Pavel
-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Pierre Ossman]

Linus Torvalds wrote:
> 
> A word of warning: in many ways it's easier to work with patches. In
> particular, if you want to have me merge from your tree, I require a
> certain amount of cleanliness in the trees I'm pulling from. All of the
> people who used to use BK to sync are already used to that, but for people
> who didn't historically use BK this is going to be a learning experience.
> 

Is there a summary available of the major issues here so that we who are
new to this can get up to speed fairly quickly?

Rgds
Pierre

Re: Linux 2.6.12-rc3

[Linus Torvalds]

On Sat, 23 Apr 2005, Pavel Machek wrote:
> 
> Could we add some kind off "This-changeset-obsoletes: <sha1>" header?
> That would  allow me to send patches by hand and still make the SCM do the
> right thing during merge.

That doesn't really scale, plus I don't want to rely on that kind of hack
since it's simply not reliable (the patch may have gotten edited on the
way, so maybe the stuff I apply is 90% from your patch, but 10%
different).

Also, it doesn't actually handle the generic case, which is that the other
end used something else than git to maintain his patches (which in the end
has the exact same issues).

So I think you'd just need to have some separate logic that says "if this
patch looks like it has been applied to 'base', ignore it". The most
trivial such logic is to just see if the patch even applies cleanly any
more (which is a test you'd have to do _anyway_). That, together with a
list of "known applied" patches, and you should be able to automate it
pretty well.

The fact is, you pretty much end up using something like quilt. That works
really well, as Andrew has proven.

> Alternatively I should just get public rsync-able space somewhere...
> Would kernel.org be willing to add people/pavel?

Now, that's actually something people are working on ("git.kernel.org"),
so I don't think that would be a problem. People _are_ trying to set up
things like a bkbits.net at least for the kernel. I know OSDL and OSL
(http://osuosl.org/) are interested, and I think the current kernel.org
works too.

A word of warning: in many ways it's easier to work with patches. In
particular, if you want to have me merge from your tree, I require a
certain amount of cleanliness in the trees I'm pulling from. All of the
people who used to use BK to sync are already used to that, but for people
who didn't historically use BK this is going to be a learning experience.

The reason patches are easier is that you can start out from a messy tree, 
and then whittle down the patch to just the part you want to send me, so 
it doesn't actually matter how messy your original tree is, you can always 
make the end result look nice. 

One of the things a distributed SCM brings with it is that you can't edit
history after the fact, which means that if you use git and you've got a
messy tree, you can't just "clean it up". You either have to keep your
tree clean all the time, or you have to generate a new clean tree (usually
by exporting patches from your messy one) and throw the messy ones away
periodically.

("throw-away" git trees are actually very very useful).

git is actually even _more_ strict than BK in this respect, since the git
model means that everything is based on SHA1 hashes, and you can't edit
_anything_. With BK, some people were used to edit the checkin comments
after the fact, and you could do that kind of limited cleanup before you
asked me to merge. With git, that's all hashed cryptographically and is
part of the "name" of the result, so if you want to change the checkin
comments, you literally have to throw the old one (and every later checkin
that has it as its parents) away, and re-generate the whole chain.

This is very much by design. This is how git (and I) can trust the end 
result. It is how git can know that if we have a common parent, all the 
history before that common parent is guaranteed to be the same for both 
you and me, and git can thus ignore it. But as mentioned, it does mean 
that git history is set in stone, and the only way to "fix" things is 
literally to re-create it all.

				Linus

Re: Linux 2.6.12-rc3

[Ed Tomlinson]

On Friday 22 April 2005 20:21, Linus Torvalds wrote:
> 
> On Sat, 23 Apr 2005, Pavel Machek wrote:
> > 
> > Unfortunately first merge will make it practically unusable :-(. 
> 
> No, quite the reverse. If I merge from you, and you use my commit ID as 
> the "base" point, it will work again.
> 
> But yes, if you actually send the result as _patches_ to me, then the 
> commit objects I create will be totally separate from the commit objects 
> you had in your tree, and "git-export" will continue to export your old 
> stale entries since they won't show up as already being in my tree.
> 
> The point being, that there is a big difference between a proper merge 
> (with history etc merged) and just sending me the patches in your tree.

Using git patch, the output has the commit id.  Could this be used during
a merge of patches to record info that the source git could use to recognize
the changes as ones it originated (after a pull from the remote git which has
the merged patches)?

Ed Tomlinson

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

> On Sat, 23 Apr 2005, Pavel Machek wrote:
> > 
> > Unfortunately first merge will make it practically unusable :-(. 
> 
> No, quite the reverse. If I merge from you, and you use my commit ID as 
> the "base" point, it will work again.

I meant "every time I merge from you, new commit with message 'merge from linus' and
big ugly diff is attached.

> But yes, if you actually send the result as _patches_ to me, then the 
> commit objects I create will be totally separate from the commit objects 
> you had in your tree, and "git-export" will continue to export your old 
> stale entries since they won't show up as already being in my tree.
> 
> The point being, that there is a big difference between a proper merge 
> (with history etc merged) and just sending me the patches in your tree.

Could we add some kind off "This-changeset-obsoletes: <sha1>" header?
That would  allow me to send patches by hand and still make the SCM do the
right thing during merge.

Alternatively I should just get public rsync-able space somewhere...
Would kernel.org be willing to add people/pavel?

				Pavel
-- 
64 bytes from 195.113.31.123: icmp_seq=28 ttl=51 time=448769.1 ms         

Re: Linux 2.6.12-rc3

[Linus Torvalds]

On Sat, 23 Apr 2005, Pavel Machek wrote:
> 
> Unfortunately first merge will make it practically unusable :-(. 

No, quite the reverse. If I merge from you, and you use my commit ID as 
the "base" point, it will work again.

But yes, if you actually send the result as _patches_ to me, then the 
commit objects I create will be totally separate from the commit objects 
you had in your tree, and "git-export" will continue to export your old 
stale entries since they won't show up as already being in my tree.

The point being, that there is a big difference between a proper merge 
(with history etc merged) and just sending me the patches in your tree.

		Linus

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

> > Nice, so I now have my own -git tree, with two changes in it...
> > 
> > Is there way to say "git diff -r origin:" but dump it patch-by-patch
> > with some usable headers?
> > 
> > [Looking at git export]
> 
> Either Linus' demo git-export (NOT the same as git export!), or git
> patch. In the latest tree, it was extended to accept a range of two
> commits to process too.
> 
> Note that the range semantics is rather peculiar at the least. ;-)

Nice, it seems to work.

Unfortunately first merge will make it practically unusable :-(. 

git diff -r origin:

will only list differences between my tree and Linus'.

git patch origin:

will list my patches, plus any merges I done... Is there any
reasonable way to get only "my" changes? When I do not have to resolve
anything during merge, it should be usable... but that is starting to
look ugly.


								Pavel


-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Roman Zippel]

Al Viro wrote:

> 	thread_info, part 1:

Patches look fine. Some of the helper stuff could be moved to
asm-generic, but that can still be done later. The headers really need
some serious cleanup in this area, the dependencies are damned fragile.
I8 still have a completely untested patch to convert the thread flags to
bitmasks, but I hadn't much time for m68k hacking lately...

bye, Roman

Re: Linux 2.6.12-rc3

[H. Peter Anvin]

Followup to:  <20050421112022.GB2160@elf.ucw.cz>
By author:    Pavel Machek <pavel@suse.cz>
In newsgroup: linux.dev.kernel
> 
> You should put this into .git/remotes
> 
> linus	rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> 

Make that
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Right now they're the same thing, but it's not guaranteed to stay that way.

      -hpa

Re: Linux 2.6.12-rc3

[Greg KH]

On Thu, Apr 21, 2005 at 03:33:42PM +0200, Andreas Steinmetz wrote:
> Compile error on x86_64:
> 
>   CC [M]  drivers/usb/image/microtek.o
> drivers/usb/image/microtek.c: In function `mts_scsi_abort':
> drivers/usb/image/microtek.c:338: error: `FAILURE' undeclared (first use
> in this function)

Patch to fix this was posted on lkml and is in my queue to send to Linus
in a bit.

thanks,

greg k-h

Re: Linux 2.6.12-rc3

[Petr Baudis]

Dear diary, on Fri, Apr 22, 2005 at 01:22:01AM CEST, I got a letter
where Pavel Machek <pavel@ucw.cz> told me that...
> Hi!

Hi,

> > > > You should put this into .git/remotes
> > > > 
> > > > linus	rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> > 
> > (git addremote is preferred for that :-)
> 
> Nice, so I now have my own -git tree, with two changes in it...
> 
> Is there way to say "git diff -r origin:" but dump it patch-by-patch
> with some usable headers?
> 
> [Looking at git export]

Either Linus' demo git-export (NOT the same as git export!), or git
patch. In the latest tree, it was extended to accept a range of two
commits to process too.

Note that the range semantics is rather peculiar at the least. ;-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor

Re: Linux 2.6.12-rc3

[Linus Torvalds]

On Fri, 22 Apr 2005, Pavel Machek wrote:
> 
> Is there way to say "git diff -r origin:" but dump it patch-by-patch
> with some usable headers?

In my git version there is a command called "git-export" for exactly this. 
I don't know if Pasky included that in his trees, but if not, you can just 
get my git tree (which should be compatible with Pasky's scripts, but mine 
just has the "core" stuff).

Using "git-export" you can export your whole git tree if you want to, but 
more commonly you'd say

	git-export $(cat .git/HEAD) $(cat .git/BASE)

where you'd have saved the previous head that you exported in the BASE
thing (or, if you pull my tree, and want to export your changes back to 
me, you'd initialize BASE to the original HEAD in my tree).

The output format of "git-export" is not the prettiest in the world, but 
I've never actually _used_ that command, I just wrote it as a 
demonstration thing.

			Linus

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

> > > You should put this into .git/remotes
> > > 
> > > linus	rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> 
> (git addremote is preferred for that :-)

Nice, so I now have my own -git tree, with two changes in it...

Is there way to say "git diff -r origin:" but dump it patch-by-patch
with some usable headers?

[Looking at git export]
								Pavel

Index: Documentation/git.txt
===================================================================
--- /dev/null  (tree:9120479b4c721855b378db8907e1259f2e583f2b)
+++ 007d34e2ed3d5fc54cbb4c16880145ade93affef/Documentation/git.txt  (mode:100644 sha1:939d378ddaac5390c879520c139e66d9649ec4c4)
@@ -0,0 +1,19 @@
+	Kernel hacker's guide to git
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      2005 Pavel Machek <pavel@suse.cz>
+
+You can get git at http://pasky.or.cz/~pasky/dev/git/ . Compile it,
+and place it somewhere in $PATH. Then you can get kernel by running
+
+git init rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+
+... Run git log to get idea of what happened in tree you are
+tracking. Do git pull linus to pickup latest changes from Linus. You
+can do git diff to see what changes you done in your local tree. git
+cancel will kill any such changes.
+
+You can commit changes by doing git commit... If you want to get diff
+of your changes against mainline, do
+
+git diff -r origin: 
+

-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Petr Baudis]

Dear diary, on Thu, Apr 21, 2005 at 11:38:11PM CEST, I got a letter
where Pavel Machek <pavel@ucw.cz> told me that...
> Hi!
> 
> It seems that someone should write "Kernel hacker's guide to
> git"... Documentation/git.txt seems like good place. I guess I'll do
> it.

I've also started writing some tutorial-like guide to Cogito on my
notebook, but I have time for that only during lectures. :^)

> > I'm not yet sure if we should have some Cogito interface for doing this
> > and what its semantics should be.
> 
> What is Cogito, BTW?

New name for git-pasky. Everyone will surely rejoice as the usage will
change significantly. But better let's clean it up now.

(For more details, check git@ archives for git-pasky-0.6 announcement.)

> > > I see quite a lot of problems with fsck-tree. Is that normal?
> > > (I ran out of disk space few times during different operations...)
> > 
> > Actually, in case your tree is older than about two days, I hope you did
> > the convert-cache magic or fetched a fresh tree?
> 
> No, I did not anything like that. I guess it is rm -rf time, then...

That's the root of all your problems then.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

It seems that someone should write "Kernel hacker's guide to
git"... Documentation/git.txt seems like good place. I guess I'll do
it.

> > just plain vanilla" without rm -rf?
> 
> git cancel will give you "plain last commit". If you need plain vanilla,
> the "hard way" now is to just do
> 
> 	commit-id >.git/HEAD
> 
> but your current HEAD will be lost forever. Or do
> 
> 	git fork vanilla ~/vanilla linus
> 
> and you will have the vanilla tree tracking linus in ~/vanilla.

Ok, thanks.

> I'm not yet sure if we should have some Cogito interface for doing this
> and what its semantics should be.

What is Cogito, BTW?

> > I see quite a lot of problems with fsck-tree. Is that normal?
> > (I ran out of disk space few times during different operations...)
> 
> Actually, in case your tree is older than about two days, I hope you did
> the convert-cache magic or fetched a fresh tree?

No, I did not anything like that. I guess it is rm -rf time, then...

									Pavel
-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Benoit Boissinot]

On 4/21/05, Linus Torvalds <torvalds@osdl.org> wrote:
> 
> ----
> Changes since 2.6.12-rc2:
> 
> Benjamin Herrenschmidt:
...
>     [PATCH] ppc32: Fix cpufreq problems

this depends on two patches in -mm:

add-suspend-method-to-cpufreq-core.patch
  Add suspend method to cpufreq core

add-suspend-method-to-cpufreq-core-warning-fix.patch
  add-suspend-method-to-cpufreq-core-warning-fix

without those patches defconfig is broken on ppc32

regards,

Benoit

Re: Linux 2.6.12-rc3

[Petr Baudis]

Dear diary, on Thu, Apr 21, 2005 at 09:00:09PM CEST, I got a letter
where Pavel Machek <pavel@ucw.cz> told me that...
> Hi!

Hi,

> > > Well, not sure.
> > > 
> > > I did 
> > > 
> > > git track linus
> > > git cancel
> > > 
> > > but Makefile still contains -rc2. (Is "git cancel" right way to check
> > > out the tree?)
> > 
> > No. git cancel does what it says - cancels your local changes to the
> > working tree. git track will only set that next time you pull from
> > linus, the changes will be automatically merged. (Note that this will
> > change with the big UI change.)
> 
> Is there way to say "forget those changes in my repository, I want
> just plain vanilla" without rm -rf?

git cancel will give you "plain last commit". If you need plain vanilla,
the "hard way" now is to just do

	commit-id >.git/HEAD

but your current HEAD will be lost forever. Or do

	git fork vanilla ~/vanilla linus

and you will have the vanilla tree tracking linus in ~/vanilla.

I'm not yet sure if we should have some Cogito interface for doing this
and what its semantics should be.

> I see quite a lot of problems with fsck-tree. Is that normal?
> (I ran out of disk space few times during different operations...)

Actually, in case your tree is older than about two days, I hope you did
the convert-cache magic or fetched a fresh tree?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

> > > You should put this into .git/remotes
> > > 
> > > linus	rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> 
> (git addremote is preferred for that :-)

Oops :-).

> > Well, not sure.
> > 
> > I did 
> > 
> > git track linus
> > git cancel
> > 
> > but Makefile still contains -rc2. (Is "git cancel" right way to check
> > out the tree?)
> 
> No. git cancel does what it says - cancels your local changes to the
> working tree. git track will only set that next time you pull from
> linus, the changes will be automatically merged. (Note that this will
> change with the big UI change.)

Is there way to say "forget those changes in my repository, I want
just plain vanilla" without rm -rf?
I see quite a lot of problems with fsck-tree. Is that normal?
(I ran out of disk space few times during different operations...)


-- 
64 bytes from 195.113.31.123: icmp_seq=28 ttl=51 time=448769.1 ms         

Re: Linux 2.6.12-rc3

[Al Viro]

On Thu, Apr 21, 2005 at 06:57:23PM +0100, Al Viro wrote:
> 	thread_info part 3: heads.

headers, even...

Re: Linux 2.6.12-rc3

[Al Viro]

	m68k thread_info - part 4

The rest:
	a) added embedded thread_info [m68k processor.h]
	b) added missing symbols in asm-offsets.c
	c) task_thread_info() and freinds in asm-m68k/thread_info.h
	d) made m68k thread_info.h included by m68k processor.h, not the
other way round.

At that point thread_info mess is resolved - m68k builds and the rest of
the stuff to merge consists of normal driver patches.

IMO that's the least intrusive way to merge that sucker...

Comments?

diff -urN RC12-rc3-includes/arch/m68k/kernel/asm-offsets.c RC12-rc3-m68k/arch/m68k/kernel/asm-offsets.c
--- RC12-rc3-includes/arch/m68k/kernel/asm-offsets.c	Thu Feb 26 02:23:09 2004
+++ RC12-rc3-m68k/arch/m68k/kernel/asm-offsets.c	Wed Apr 20 22:51:18 2005
@@ -31,6 +31,7 @@
 	DEFINE(TASK_SIGPENDING, offsetof(struct task_struct, thread.work.sigpending));
 	DEFINE(TASK_NOTIFY_RESUME, offsetof(struct task_struct, thread.work.notify_resume));
 	DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));
+	DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info));
 	DEFINE(TASK_MM, offsetof(struct task_struct, mm));
 	DEFINE(TASK_ACTIVE_MM, offsetof(struct task_struct, active_mm));
 
@@ -44,6 +45,10 @@
 	DEFINE(THREAD_FPREG, offsetof(struct thread_struct, fp));
 	DEFINE(THREAD_FPCNTL, offsetof(struct thread_struct, fpcntl));
 	DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate));
+
+	/* offsets into the thread_info struct */
+	DEFINE(TINFO_PREEMPT, offsetof(struct thread_info, preempt_count));
+	DEFINE(HARDIRQ_SHIFT, HARDIRQ_SHIFT);
 
 	/* offsets into the pt_regs */
 	DEFINE(PT_D0, offsetof(struct pt_regs, d0));
diff -urN RC12-rc3-includes/include/asm-m68k/processor.h RC12-rc3-m68k/include/asm-m68k/processor.h
--- RC12-rc3-includes/include/asm-m68k/processor.h	Wed Apr 20 21:25:51 2005
+++ RC12-rc3-m68k/include/asm-m68k/processor.h	Wed Apr 20 22:51:19 2005
@@ -14,6 +14,7 @@
 #define current_text_addr() ({ __label__ _l; _l: &&_l;})
 
 #include <linux/config.h>
+#include <linux/thread_info.h>
 #include <asm/segment.h>
 #include <asm/fpu.h>
 #include <asm/ptrace.h>
@@ -79,6 +80,7 @@
 	unsigned long  fpcntl[3];	/* fp control regs */
 	unsigned char  fpstate[FPSTATESIZE];  /* floating point state */
 	struct task_work work;
+	struct thread_info info;
 };
 
 #define INIT_THREAD  {							\
diff -urN RC12-rc3-includes/include/asm-m68k/thread_info.h RC12-rc3-m68k/include/asm-m68k/thread_info.h
--- RC12-rc3-includes/include/asm-m68k/thread_info.h	Wed Apr 20 21:25:51 2005
+++ RC12-rc3-m68k/include/asm-m68k/thread_info.h	Wed Apr 20 22:51:19 2005
@@ -2,7 +2,6 @@
 #define _ASM_M68K_THREAD_INFO_H
 
 #include <asm/types.h>
-#include <asm/processor.h>
 #include <asm/page.h>
 
 struct thread_info {
@@ -36,10 +35,11 @@
 #endif /* PAGE_SHIFT == 13 */
 
 //#define init_thread_info	(init_task.thread.info)
-#define init_stack		(init_thread_union.stack)
-
-#define current_thread_info()	(current->thread_info)
+#define init_thread_info	(init_thread_union.thread_info)
+#define init_stack	(init_thread_union.stack)
 
+#define task_thread_info(tsk)   (&(tsk)->thread.info)
+#define current_thread_info()	task_thread_info(current)
 
 #define __HAVE_THREAD_FUNCTIONS
 
@@ -51,6 +51,10 @@
 #define TIF_MEMDIE		5
 
 extern int thread_flag_fixme(void);
+
+#define setup_thread_info(p, ti) do (ti)->task = p; while(0)
+
+#define end_of_stack(p) ((unsigned long *)(p)->thread_info + 1)
 
 /*
  * flag set/clear/test wrappers

Re: Linux 2.6.12-rc3

[Al Viro]

	thread_info part 3: heads.

a) in smp_lock.h #include of sched.h and spinlock.h moved under
#ifdef CONFIG_LOCK_KERNEL.
b) interrupt.h now explicitly pulls sched.h (not via smp_lock.h from
hardirq.h as it used to)
c) in two more places we need changes to compensate for (a) - one place in
arch/sparc needs string.h now and hardirq.h needs forward declaration of
task_struct.

d) thread_info-related helpers in sched.h and thread_info.h put under
ifndef __HAVE_THREAD_FUNCTIONS.  Obviously safe.

That ends changes in generic parts of tree.  And now we can get m68k in
there - that will be localized to asm-m68k and arch/m68k.

As far as I can see that's the minimally intrusive header changes needed
to avoid problems - better than variant with splitting sched.h as in m68k CVS.

diff -urN RC12-rc3-other_helpers/arch/sparc/lib/bitext.c RC12-rc3-includes/arch/sparc/lib/bitext.c
--- RC12-rc3-other_helpers/arch/sparc/lib/bitext.c	Fri Mar 11 15:54:46 2005
+++ RC12-rc3-includes/arch/sparc/lib/bitext.c	Wed Apr 20 22:51:17 2005
@@ -10,6 +10,7 @@
  */
 
 #include <linux/smp_lock.h>
+#include <linux/string.h>
 #include <linux/bitops.h>
 
 #include <asm/bitext.h>
diff -urN RC12-rc3-other_helpers/include/linux/hardirq.h RC12-rc3-includes/include/linux/hardirq.h
--- RC12-rc3-other_helpers/include/linux/hardirq.h	Fri Mar 11 15:54:57 2005
+++ RC12-rc3-includes/include/linux/hardirq.h	Wed Apr 20 22:51:17 2005
@@ -85,6 +85,8 @@
 #define nmi_enter()		irq_enter()
 #define nmi_exit()		sub_preempt_count(HARDIRQ_OFFSET)
 
+struct task_struct;
+
 #ifndef CONFIG_VIRT_CPU_ACCOUNTING
 static inline void account_user_vtime(struct task_struct *tsk)
 {
diff -urN RC12-rc3-other_helpers/include/linux/interrupt.h RC12-rc3-includes/include/linux/interrupt.h
--- RC12-rc3-other_helpers/include/linux/interrupt.h	Fri Mar 11 15:54:57 2005
+++ RC12-rc3-includes/include/linux/interrupt.h	Wed Apr 20 22:51:17 2005
@@ -12,6 +12,7 @@
 #include <asm/atomic.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
+#include <linux/sched.h>
 
 /*
  * For 2.4.x compatibility, 2.4.x can use
diff -urN RC12-rc3-other_helpers/include/linux/sched.h RC12-rc3-includes/include/linux/sched.h
--- RC12-rc3-other_helpers/include/linux/sched.h	Wed Apr 20 22:51:15 2005
+++ RC12-rc3-includes/include/linux/sched.h	Wed Apr 20 22:51:17 2005
@@ -1102,6 +1102,8 @@
 	spin_unlock(&p->alloc_lock);
 }
 
+#ifndef __HAVE_THREAD_FUNCTIONS
+
 #define task_thread_info(task) (task)->thread_info
 
 static inline void setup_thread_info(struct task_struct *p, struct thread_info *ti)
@@ -1141,6 +1143,8 @@
 {
 	return test_ti_thread_flag(task_thread_info(tsk), flag);
 }
+
+#endif
 
 static inline void set_tsk_need_resched(struct task_struct *tsk)
 {
diff -urN RC12-rc3-other_helpers/include/linux/smp_lock.h RC12-rc3-includes/include/linux/smp_lock.h
--- RC12-rc3-other_helpers/include/linux/smp_lock.h	Fri Mar 11 15:54:57 2005
+++ RC12-rc3-includes/include/linux/smp_lock.h	Wed Apr 20 22:51:17 2005
@@ -2,10 +2,9 @@
 #define __LINUX_SMPLOCK_H
 
 #include <linux/config.h>
+#ifdef CONFIG_LOCK_KERNEL
 #include <linux/sched.h>
 #include <linux/spinlock.h>
-
-#ifdef CONFIG_LOCK_KERNEL
 
 #define kernel_locked()		(current->lock_depth >= 0)
 
diff -urN RC12-rc3-other_helpers/include/linux/thread_info.h RC12-rc3-includes/include/linux/thread_info.h
--- RC12-rc3-other_helpers/include/linux/thread_info.h	Wed Feb  4 11:48:57 2004
+++ RC12-rc3-includes/include/linux/thread_info.h	Wed Apr 20 22:51:17 2005
@@ -22,6 +22,7 @@
 
 #ifdef __KERNEL__
 
+#ifndef __HAVE_THREAD_FUNCTIONS
 /*
  * flag set/clear/test wrappers
  * - pass TIF_xxxx constants to these functions
@@ -87,6 +88,7 @@
 	clear_thread_flag(TIF_NEED_RESCHED);
 }
 
+#endif
 #endif
 
 #endif /* _LINUX_THREAD_INFO_H */

Re: Linux 2.6.12-rc3

[Al Viro]

	thread_info part 2:

encapsulates the rest of arch-dependent operations with thread_info access.
Two new helpers - setup_thread_info() and end_of_stack().  For normal
case the former consists of copying thread_info of parent to new thread_info
and the latter returns pointer immediately past the end of thread_info.

Again, normal platforms are obviously safe.  Note that end_of_stack() is
need since unlike the default case, m68k has only a single pointer in
stack - not the entire thread_info.  So DEBUG_STACK_USAGE needs to be
a bit different there.

diff -urN RC12-rc3-task_thread_info/include/linux/sched.h RC12-rc3-other_helpers/include/linux/sched.h
--- RC12-rc3-task_thread_info/include/linux/sched.h	Wed Apr 20 22:51:13 2005
+++ RC12-rc3-other_helpers/include/linux/sched.h	Wed Apr 20 22:51:15 2005
@@ -1104,6 +1104,16 @@
 
 #define task_thread_info(task) (task)->thread_info
 
+static inline void setup_thread_info(struct task_struct *p, struct thread_info *ti)
+{
+	*ti = *p->thread_info;
+}
+
+static inline unsigned long *end_of_stack(struct task_struct *p)
+{
+	return (unsigned long *)(p->thread_info + 1);
+}
+
 /* set thread flags in other task's structures
  * - see asm/thread_info.h for TIF_xxxx flags available
  */
diff -urN RC12-rc3-task_thread_info/kernel/fork.c RC12-rc3-other_helpers/kernel/fork.c
--- RC12-rc3-task_thread_info/kernel/fork.c	Wed Apr 20 22:51:13 2005
+++ RC12-rc3-other_helpers/kernel/fork.c	Wed Apr 20 22:51:15 2005
@@ -169,8 +169,8 @@
 		return NULL;
 	}
 
-	*ti = *orig->thread_info;
 	*tsk = *orig;
+	setup_thread_info(tsk, ti);
 	tsk->thread_info = ti;
 	ti->task = tsk;
 
diff -urN RC12-rc3-task_thread_info/kernel/sched.c RC12-rc3-other_helpers/kernel/sched.c
--- RC12-rc3-task_thread_info/kernel/sched.c	Wed Apr 20 22:51:13 2005
+++ RC12-rc3-other_helpers/kernel/sched.c	Wed Apr 20 22:51:15 2005
@@ -3945,10 +3945,10 @@
 #endif
 #ifdef CONFIG_DEBUG_STACK_USAGE
 	{
-		unsigned long * n = (unsigned long *) (p->thread_info+1);
+		unsigned long * n = end_of_stack(p);
 		while (!*n)
 			n++;
-		free = (unsigned long) n - (unsigned long)(p->thread_info+1);
+		free = (unsigned long) n - (unsigned long) end_of_stack(p);
 	}
 #endif
 	printk("%5lu %5d %6d ", free, p->pid, p->parent->pid);

Re: Linux 2.6.12-rc3

[Al Viro]

	thread_info, part 1:

new helper - task_thread_info(task).  On platforms that have thread_info
allocated separately (i.e. in default case) it simply returns task->thread_info.
m68k wants (and for good reasons) to embed its thread_info into task_struct.
So it will (in later patch) have task_thread_info() of its own.

For now we just add a macro for generic case and convert existing users in
core kernel to its user.  Obviously safe - all normal architectures get
the same preprocessor output they used to get.

diff -urN RC12-rc3-delta23/include/linux/sched.h RC12-rc3-task_thread_info/include/linux/sched.h
--- RC12-rc3-delta23/include/linux/sched.h	Wed Apr 20 21:25:54 2005
+++ RC12-rc3-task_thread_info/include/linux/sched.h	Wed Apr 20 22:51:13 2005
@@ -1102,32 +1102,34 @@
 	spin_unlock(&p->alloc_lock);
 }
 
+#define task_thread_info(task) (task)->thread_info
+
 /* set thread flags in other task's structures
  * - see asm/thread_info.h for TIF_xxxx flags available
  */
 static inline void set_tsk_thread_flag(struct task_struct *tsk, int flag)
 {
-	set_ti_thread_flag(tsk->thread_info,flag);
+	set_ti_thread_flag(task_thread_info(tsk), flag);
 }
 
 static inline void clear_tsk_thread_flag(struct task_struct *tsk, int flag)
 {
-	clear_ti_thread_flag(tsk->thread_info,flag);
+	clear_ti_thread_flag(task_thread_info(tsk), flag);
 }
 
 static inline int test_and_set_tsk_thread_flag(struct task_struct *tsk, int flag)
 {
-	return test_and_set_ti_thread_flag(tsk->thread_info,flag);
+	return test_and_set_ti_thread_flag(task_thread_info(tsk), flag);
 }
 
 static inline int test_and_clear_tsk_thread_flag(struct task_struct *tsk, int flag)
 {
-	return test_and_clear_ti_thread_flag(tsk->thread_info,flag);
+	return test_and_clear_ti_thread_flag(task_thread_info(tsk), flag);
 }
 
 static inline int test_tsk_thread_flag(struct task_struct *tsk, int flag)
 {
-	return test_ti_thread_flag(tsk->thread_info,flag);
+	return test_ti_thread_flag(task_thread_info(tsk), flag);
 }
 
 static inline void set_tsk_need_resched(struct task_struct *tsk)
@@ -1198,12 +1200,12 @@
 
 static inline unsigned int task_cpu(const struct task_struct *p)
 {
-	return p->thread_info->cpu;
+	return task_thread_info(p)->cpu;
 }
 
 static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
 {
-	p->thread_info->cpu = cpu;
+	task_thread_info(p)->cpu = cpu;
 }
 
 #else
diff -urN RC12-rc3-delta23/kernel/exit.c RC12-rc3-task_thread_info/kernel/exit.c
--- RC12-rc3-delta23/kernel/exit.c	Wed Apr 20 21:25:54 2005
+++ RC12-rc3-task_thread_info/kernel/exit.c	Wed Apr 20 22:51:13 2005
@@ -827,7 +827,7 @@
 	if (group_dead && tsk->signal->leader)
 		disassociate_ctty(1);
 
-	module_put(tsk->thread_info->exec_domain->module);
+	module_put(task_thread_info(tsk)->exec_domain->module);
 	if (tsk->binfmt)
 		module_put(tsk->binfmt->module);
 
diff -urN RC12-rc3-delta23/kernel/fork.c RC12-rc3-task_thread_info/kernel/fork.c
--- RC12-rc3-delta23/kernel/fork.c	Wed Apr 20 21:25:54 2005
+++ RC12-rc3-task_thread_info/kernel/fork.c	Wed Apr 20 22:51:13 2005
@@ -893,7 +893,7 @@
 	if (nr_threads >= max_threads)
 		goto bad_fork_cleanup_count;
 
-	if (!try_module_get(p->thread_info->exec_domain->module))
+	if (!try_module_get(task_thread_info(p)->exec_domain->module))
 		goto bad_fork_cleanup_count;
 
 	if (p->binfmt && !try_module_get(p->binfmt->module))
@@ -1138,7 +1138,7 @@
 	if (p->binfmt)
 		module_put(p->binfmt->module);
 bad_fork_cleanup_put_domain:
-	module_put(p->thread_info->exec_domain->module);
+	module_put(task_thread_info(p)->exec_domain->module);
 bad_fork_cleanup_count:
 	put_group_info(p->group_info);
 	atomic_dec(&p->user->processes);
diff -urN RC12-rc3-delta23/kernel/sched.c RC12-rc3-task_thread_info/kernel/sched.c
--- RC12-rc3-delta23/kernel/sched.c	Wed Apr 20 21:25:55 2005
+++ RC12-rc3-task_thread_info/kernel/sched.c	Wed Apr 20 22:51:13 2005
@@ -1151,7 +1151,7 @@
 	 * but it also can be p->switch_lock.) So we compensate with a count
 	 * of 1. Also, we want to start with kernel preemption disabled.
 	 */
-	p->thread_info->preempt_count = 1;
+	task_thread_info(p)->preempt_count = 1;
 #endif
 	/*
 	 * Share the timeslice between parent and child, thus the
@@ -4018,9 +4018,9 @@
 
 	/* Set the preempt count _outside_ the spinlocks! */
 #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
-	idle->thread_info->preempt_count = (idle->lock_depth >= 0);
+	task_thread_info(idle)->preempt_count = (idle->lock_depth >= 0);
 #else
-	idle->thread_info->preempt_count = 0;
+	task_thread_info(idle)->preempt_count = 0;
 #endif
 }
 

Re: Linux 2.6.12-rc3

[Petr Baudis]

Dear diary, on Thu, Apr 21, 2005 at 02:03:27PM CEST, I got a letter
where Pavel Machek <pavel@ucw.cz> told me that...
> > You should put this into .git/remotes
> > 
> > linus	rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

(git addremote is preferred for that :-)

> > Then
> > 
> > RSYNC_FLAGS=-zavP git pull linus

-v is passed to rsync by default. I'll gladly add other reasonable rsync
flags (I don't call printing each considered file reasonable; fsck or
wget-like progressbar would be ideal).

> Well, not sure.
> 
> I did 
> 
> git track linus
> git cancel
> 
> but Makefile still contains -rc2. (Is "git cancel" right way to check
> out the tree?)

No. git cancel does what it says - cancels your local changes to the
working tree. git track will only set that next time you pull from
linus, the changes will be automatically merged. (Note that this will
change with the big UI change.)

Either do

	git track linus
	git pull

or

	git merge linus

to get Linus' changes if you didn't pull yet.

> and git diff -r linus: still contains some changes. [I did some
> experimental pull of scsi changes long time ago, is it that problem?]

If you don't have your HEAD on Linus' branch, it will do a tree merge
instead of fast-forward; that is, it will not just move your HEAD on
to match Linus' HEAD, but it will make a regular merge and then ask you
to do a merge commit.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor

Re: Linux 2.6.12-rc3

[Al Viro]

On Thu, Apr 21, 2005 at 11:10:15AM +0200, Geert Uytterhoeven wrote:
> On Thu, 21 Apr 2005, Jan Dittmer wrote:
> > Linus Torvalds wrote:
> > > Geert Uytterhoeven:
> > >     [PATCH] M68k: Update defconfigs for 2.6.11
> > >     [PATCH] M68k: Update defconfigs for 2.6.12-rc2
> > 
> > Why do I still get this error when trying to cross-compile for m68k?
> 
> Because to build m68k kernels, you (still :-( have to use the Linux/m68k CVS
> repository, cfr. http://linux-m68k-cvs.ubb.ca/.
> 
> BTW, my patch queue is at
> http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-2.6.x-merging/.
> The main offender is POSTPONED/156-thread_info.diff.

I think I have a sane splitup of that stuff.  If you have time to review - yell

Re: Linux 2.6.12-rc3

[Randy.Dunlap]

On Thu, 21 Apr 2005 14:19:10 +0200 Ralf Hildebrandt wrote:

| > It's available both as a patch (against 2.6.11) and as a tar-ball, and 
| Where IS the tarball? Not on www.kernel.org, that's for sure.

in http://www.kernel.org/pub/linux/kernel/v2.6/testing/

---
~Randy

Re: Linux 2.6.12-rc3

[Andreas Steinmetz]

Compile error on x86_64:

  CC [M]  drivers/usb/image/microtek.o
drivers/usb/image/microtek.c: In function `mts_scsi_abort':
drivers/usb/image/microtek.c:338: error: `FAILURE' undeclared (first use
in this function)
drivers/usb/image/microtek.c:338: error: (Each undeclared identifier is
reported only once
drivers/usb/image/microtek.c:338: error: for each function it appears in.)
make[3]: *** [drivers/usb/image/microtek.o] Error 1
make[2]: *** [drivers/usb/image] Error 2
make[1]: *** [drivers/usb] Error 2
make: *** [drivers] Error 2

-- 
Andreas Steinmetz                       SPAMmers use robotrap@domdv.de

Re: Linux 2.6.12-rc3

[Ralf Hildebrandt]

> It's available both as a patch (against 2.6.11) and as a tar-ball, and 
Where IS the tarball? Not on www.kernel.org, that's for sure.

-- 
Ralf Hildebrandt (i.A. des IT-Zentrum)          Ralf.Hildebrandt@charite.de
Charite - Universitätsmedizin Berlin            Tel.  +49 (0)30-450 570-155
Gemeinsame Einrichtung von FU- und HU-Berlin    Fax.  +49 (0)30-450 570-962
IT-Zentrum Standort CBF                 send no mail to spamtrap@charite.de

Re: Linux 2.6.12-rc3

[Martin Schlemmer]

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

On Thu, 2005-04-21 at 13:20 +0200, Pavel Machek wrote:
> Hi!
> 
> > And for the crazy people, the git archive on kernel.org is up and running 
> > under /pub/scm/linux/kernel/git/torvalds/linux-2.6.git. For the 
> > adventurous of you, the name of the 2.6.12-rc3 release is a very nice and 
> > readable:
> > 
> > 	a2755a80f40e5794ddc20e00f781af9d6320fafb
> > 
> > and eventually I'll try to make sure that I actually accompany all 
> > releases with the SHA1 git name of the release signed with a digital 
> > signature. 
> 
> As far as I can see... (working with pasky's version of git....)
> 
> You should put this into .git/remotes
> 
> linus	rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> 
> Then
> 
> RSYNC_FLAGS=-zavP git pull linus
> 
> should do the right thing.
> 

From 0.5 or 0.6 you just have to do:

git init rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

> [pasky, would it be possible to make some kind of progress indication
> default for long pulls?]
> 

Latest seems to do the rsync verbose.


-- 
Martin Schlemmer


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

> > And for the crazy people, the git archive on kernel.org is up and running 
> > under /pub/scm/linux/kernel/git/torvalds/linux-2.6.git. For the 
> > adventurous of you, the name of the 2.6.12-rc3 release is a very nice and 
> > readable:
> > 
> > 	a2755a80f40e5794ddc20e00f781af9d6320fafb
> > 
> > and eventually I'll try to make sure that I actually accompany all 
> > releases with the SHA1 git name of the release signed with a digital 
> > signature. 
> 
> As far as I can see... (working with pasky's version of git....)
> 
> You should put this into .git/remotes
> 
> linus	rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> 
> Then
> 
> RSYNC_FLAGS=-zavP git pull linus
> 
> should do the right thing.

Well, not sure.

I did 

git track linus
git cancel

but Makefile still contains -rc2. (Is "git cancel" right way to check
out the tree?)

and git diff -r linus: still contains some changes. [I did some
experimental pull of scsi changes long time ago, is it that problem?]

								Pavel
-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Pavel Machek]

Hi!

> And for the crazy people, the git archive on kernel.org is up and running 
> under /pub/scm/linux/kernel/git/torvalds/linux-2.6.git. For the 
> adventurous of you, the name of the 2.6.12-rc3 release is a very nice and 
> readable:
> 
> 	a2755a80f40e5794ddc20e00f781af9d6320fafb
> 
> and eventually I'll try to make sure that I actually accompany all 
> releases with the SHA1 git name of the release signed with a digital 
> signature. 

As far as I can see... (working with pasky's version of git....)

You should put this into .git/remotes

linus	rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Then

RSYNC_FLAGS=-zavP git pull linus

should do the right thing.

[pasky, would it be possible to make some kind of progress indication
default for long pulls?]

> One of the tools I don't have set up yet is the old "shortlog" script, so 
> I did this really hacky conversion. You don't want to know, but let's say 
> that I'm re-aquainting myself with 'sed' after a long time ;). But if some 
> lines look like they got hacked up in the middle, rest assured that that's 
> exactly what happened, and the long log should have the rest ...

-- 
Boycott Kodak -- for their patent abuse against Java.

Re: Linux 2.6.12-rc3

[Geert Uytterhoeven]

On Thu, 21 Apr 2005, Jan Dittmer wrote:
> Linus Torvalds wrote:
> > Geert Uytterhoeven:
> >     [PATCH] M68k: Update defconfigs for 2.6.11
> >     [PATCH] M68k: Update defconfigs for 2.6.12-rc2
> 
> Why do I still get this error when trying to cross-compile for m68k?

Because to build m68k kernels, you (still :-( have to use the Linux/m68k CVS
repository, cfr. http://linux-m68k-cvs.ubb.ca/.

BTW, my patch queue is at
http://linux-m68k-cvs.ubb.ca/~geert/linux-m68k-2.6.x-merging/.
The main offender is POSTPONED/156-thread_info.diff.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: Linux 2.6.12-rc3

[Jan Dittmer]

Linus Torvalds wrote:
> Geert Uytterhoeven:
>     [PATCH] M68k: Update defconfigs for 2.6.11
>     [PATCH] M68k: Update defconfigs for 2.6.12-rc2

Why do I still get this error when trying to cross-compile for m68k?

toolchain:

Reading specs from /usr/local/m68k-uclinux-tools/lib/gcc/m68k-uclinux/3.4.0/specs
Configured with: /usr/local/src/uclinux-tools/gcc-3.4.0/configure --target=m68k-uclinux --prefix=/usr/local/m68k-uclinux-tools
--enable-languages=c,c++ --enable-multilib --enable-target-optspace --with-gnu-ld --disable-nls --disable-__cxa_atexit --disable-c99 --disable-clocale
--disable-c-mbchar --disable-long-long --enable-threads=posix --enable-cxx-flags=-D_ISOC99_SOURCE -D_BSD_SOURCE
Thread model: posix
gcc version 3.4.0
GNU ld version 2.14.90.0.8 20040114

(I tried an alternative toolchain with gcc 3.3.3 as well)

$ make mrproper
$ make ARCH=m68k CROSS_COMPILE=m68k-elf- mrproper
$ make ARCH=m68k CROSS_COMPILE=m68k-elf- defconfig
$ make ARCH=m68k CROSS_COMPILE=m68k-elf-
  CHK     include/linux/version.h
  UPD     include/linux/version.h
  SYMLINK include/asm -> include/asm-m68k
  SPLIT   include/linux/autoconf.h -> include/config/*
  HOSTCC  scripts/kallsyms
  HOSTCC  scripts/conmakehash
  CC      arch/m68k/kernel/asm-offsets.s
In file included from include/linux/spinlock.h:12,
                 from include/linux/capability.h:45,
                 from include/linux/sched.h:7,
                 from arch/m68k/kernel/asm-offsets.c:12:
include/linux/thread_info.h:30: error: parse error before '{' token
include/linux/thread_info.h:35: error: parse error before '{' token
include/linux/thread_info.h: In function `test_and_set_thread_flag':
include/linux/thread_info.h:42: error: `current' undeclared (first use in this function)
include/linux/thread_info.h:42: error: (Each undeclared identifier is reported only once
include/linux/thread_info.h:42: error: for each function it appears in.)
include/linux/thread_info.h: In function `test_and_clear_thread_flag':
include/linux/thread_info.h:47: error: `current' undeclared (first use in this function)
include/linux/thread_info.h: At top level:
include/linux/thread_info.h:50: error: parse error before '{' token
include/linux/thread_info.h:50: warning: type defaults to `int' in declaration of `___res'
include/linux/thread_info.h:50: warning: data definition has no type or storage class
include/linux/thread_info.h:50: error: parse error before '}' token
include/linux/thread_info.h: In function `set_ti_thread_flag':
include/linux/thread_info.h:57: error: structure has no member named `flags'
include/linux/thread_info.h:57: error: structure has no member named `flags'
include/linux/thread_info.h: In function `clear_ti_thread_flag':
include/linux/thread_info.h:62: error: structure has no member named `flags'
include/linux/thread_info.h:62: error: structure has no member named `flags'
include/linux/thread_info.h: In function `test_and_set_ti_thread_flag':
include/linux/thread_info.h:67: error: structure has no member named `flags'
include/linux/thread_info.h:67: error: structure has no member named `flags'
include/linux/thread_info.h: In function `test_and_clear_ti_thread_flag':
include/linux/thread_info.h:72: error: structure has no member named `flags'
include/linux/thread_info.h:72: error: structure has no member named `flags'
include/linux/thread_info.h: In function `test_ti_thread_flag':
include/linux/thread_info.h:77: error: structure has no member named `flags'
In file included from include/linux/spinlock.h:12,
                 from include/linux/capability.h:45,
                 from include/linux/sched.h:7,
                 from arch/m68k/kernel/asm-offsets.c:12:
include/linux/thread_info.h:80:41: macro "set_need_resched" passed 1 arguments, but takes just 0
include/linux/thread_info.h: At top level:
include/linux/thread_info.h:81: error: syntax error before '{' token
include/linux/thread_info.h:85:43: macro "clear_need_resched" passed 1 arguments, but takes just 0
include/linux/thread_info.h:86: error: syntax error before '{' token
In file included from arch/m68k/kernel/asm-offsets.c:12:
include/linux/sched.h:1108: error: parse error before '{' token
include/linux/sched.h:1113: error: parse error before '{' token
include/linux/sched.h:1118: error: parse error before '{' token
include/linux/sched.h:1118: warning: type defaults to `int' in declaration of `___res'
include/linux/sched.h:1118: warning: data definition has no type or storage class
include/linux/sched.h:1118: error: parse error before '}' token
include/linux/sched.h:1118: warning: type defaults to `int' in declaration of `__res'
include/linux/sched.h:1118: warning: data definition has no type or storage class
include/linux/sched.h:1118: error: parse error before '}' token
include/linux/sched.h:1128: error: parse error before '{' token
include/linux/sched.h:1128: warning: type defaults to `int' in declaration of `___res'
include/linux/sched.h:1128: warning: data definition has no type or storage class
include/linux/sched.h:1128: error: parse error before '}' token
make[1]: *** [arch/m68k/kernel/asm-offsets.s] Error 1
make: *** [arch/m68k/kernel/asm-offsets.s] Error 2
Thu, 21 Apr 2005 09:05:23 +0200

Thanks,

Jan

Re: Linux 2.6.12-rc3

[Jan Dittmer]

> aherrman@de.ibm.com:
>     [PATCH] zfcp: convert to compat_ioctl

This does not seem to compile anymore with defconfig:

  CC      drivers/s390/scsi/zfcp_aux.o
/usr/src/ctest/rc/kernel/drivers/s390/scsi/zfcp_aux.c:63: warning: initialization from incompatible pointer type
/usr/src/ctest/rc/kernel/drivers/s390/scsi/zfcp_aux.c:366: error: conflicting types for `zfcp_cfdc_dev_ioctl'
/usr/src/ctest/rc/kernel/drivers/s390/scsi/zfcp_aux.c:55: error: previous declaration of `zfcp_cfdc_dev_ioctl'
make[3]: *** [drivers/s390/scsi/zfcp_aux.o] Error 1
make[2]: *** [drivers/s390/scsi] Error 2
make[1]: *** [drivers/s390] Error 2
make: *** [_all] Error 2

Jan

Re: Linux 2.6.12-rc3

[Martin Schlemmer]

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

On Wed, 2005-04-20 at 17:59 -0700, Linus Torvalds wrote:

> And for the crazy people, the git archive on kernel.org is up and running 
> under /pub/scm/linux/kernel/git/torvalds/linux-2.6.git. For the 
> adventurous of you, the name of the 2.6.12-rc3 release is a very nice and 
> readable:
> 
> 	a2755a80f40e5794ddc20e00f781af9d6320fafb
> 
> and eventually I'll try to make sure that I actually accompany all 
> releases with the SHA1 git name of the release signed with a digital 
> signature. 
> 

Small nit - how about using 'git tag' to tag the releases?  Then it will
not be a problem to find a release later on ...


Thanks,

-- 
Martin Schlemmer


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: Linux 2.6.12-rc3

[Barry K. Nathan]

Linux 2.6.12-rc3 is still missing the following compile fixes:

[PATCH] fix ultrastor.c compile error
http://marc.theaimsgroup.com/?l=linux-scsi&m=111391774018717&w=2

[PATCH] fix aic7xxx_osm.c compile failure (gcc 2.95.x only)
http://marc.theaimsgroup.com/?l=linux-scsi&m=111391769011616&w=2

[linux-usb-devel] Re: [PATCH] fix microtek.c compile failure
http://marc.theaimsgroup.com/?l=linux-usb-devel&m=111391865311903&w=2

Another LKML poster (who I added to CC on this message) already hit the
aic7xxx compile failure with 2.6.12-rc3...

-Barry K. Nathan <barryn@pobox.com>

Re: Linux 2.6.12-rc3

[Alejandro Bonilla]

Patrick McFarland wrote:

>On Wednesday 20 April 2005 09:09 pm, Alejandro Bonilla wrote:
>  
>
>>Why is kb not used anymore? What happened?
>>    
>>
>
>Linus decided that keyboards are out, and voice activation is in. Remember to 
>use a high quality microphone!
>
>  
>
Ohh _G_  Is that Why!? I thought it was cause there were some problems 
with 2 guys and a non-free Software? James gave me what I needed to 
know. ;-) Thanks.

And I really hope that Linus can find a way to do things better for him 
and everyone else. Hopefully someone can create an SCM as nice and good 
as I read BK was...

Sorry for invoking this old topic.

- Alejandro

Re: Linux 2.6.12-rc3

[Patrick McFarland]

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

On Wednesday 20 April 2005 09:09 pm, Alejandro Bonilla wrote:
> Why is kb not used anymore? What happened?

Linus decided that keyboards are out, and voice activation is in. Remember to 
use a high quality microphone!

-- 
Patrick "Diablo-D3" McFarland || pmcfarland@downeast.net
"Computer games don't affect kids; I mean if Pac-Man affected us as kids, we'd 
all be running around in darkened rooms, munching magic pills and listening to
repetitive electronic music." -- Kristian Wilson, Nintendo, Inc, 1989

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

Re: Linux 2.6.12-rc3

[James Purser]

Have a look through the mail archives and try "Bitkeeper and Linux" in
google, lets just say its been interesting.
-- 
James Purser
http://ksit.dynalias.com

Re: Linux 2.6.12-rc3

[Alejandro Bonilla]

Linus Torvalds wrote:

>Ok,
> you know what the subject line means by now, but this release is a bit 
>different from the usual ones, for obvious reasons. It's the first in a 
>_long_ time that I've done without using BK, and it's the first one ever 
>that has been built up completely with "git".
>
>It's available both as a patch (against 2.6.11) and as a tar-ball, and 
>for non-BK users the biggest difference is probably that the ChangeLog 
>format has changed a bit. And it will probably continue to evolve, since I 
>don't have my "release-script" tools set up for the new setup, so this 
>release was done largely manually with some ad-hoc scripting to get the 
>ChangeLog information etc out of git.
>
>For BK users, I hope we can get a BK tree that tracks this set up soon, 
>and it should hopefully not be too disruptive either.
>
>  
>
Excuse me for being so uninformed, poor reader and so on...

Why is kb not used anymore? What happened?

Thanks for the time,

- Alejandro

Linux 2.6.12-rc3

[Linus Torvalds]

Ok,
 you know what the subject line means by now, but this release is a bit 
different from the usual ones, for obvious reasons. It's the first in a 
_long_ time that I've done without using BK, and it's the first one ever 
that has been built up completely with "git".

It's available both as a patch (against 2.6.11) and as a tar-ball, and 
for non-BK users the biggest difference is probably that the ChangeLog 
format has changed a bit. And it will probably continue to evolve, since I 
don't have my "release-script" tools set up for the new setup, so this 
release was done largely manually with some ad-hoc scripting to get the 
ChangeLog information etc out of git.

For BK users, I hope we can get a BK tree that tracks this set up soon, 
and it should hopefully not be too disruptive either.

And for the crazy people, the git archive on kernel.org is up and running 
under /pub/scm/linux/kernel/git/torvalds/linux-2.6.git. For the 
adventurous of you, the name of the 2.6.12-rc3 release is a very nice and 
readable:

	a2755a80f40e5794ddc20e00f781af9d6320fafb

and eventually I'll try to make sure that I actually accompany all 
releases with the SHA1 git name of the release signed with a digital 
signature. 

One of the tools I don't have set up yet is the old "shortlog" script, so 
I did this really hacky conversion. You don't want to know, but let's say 
that I'm re-aquainting myself with 'sed' after a long time ;). But if some 
lines look like they got hacked up in the middle, rest assured that that's 
exactly what happened, and the long log should have the rest ...

			Linus

----
Changes since 2.6.12-rc2:

Adrian Bunk:
    [PATCH] MAINTAINERS: remove obsolete ACP/MWAVE MODEM entry
    [PATCH] let SOUND_AD1889 depend on PCI

Alan Stern:
    [PATCH] USB: USB API documentation modification

Alexander Nyberg:
    [PATCH] swsusp: SMP fix

Andi Kleen:
    [PATCH] x86-64/i386: Revert cpuinfo siblings behaviour back to 2.6.10
    [PATCH] x86-64: Fix BUG()
    [PATCH] x86_64: Add acpi_skip_timer_override option
    [PATCH] x86_64: Always use CPUID 80000008 to figure out MTRR address space size
    [PATCH] x86_64: Call do_notify_resume unconditionally in entry.S
    [PATCH] x86_64: Correct wrong comment in local.h
    [PATCH] x86_64: Don't assume future AMD CPUs have K8 compatible performance counters
    [PATCH] x86_64: Dump stack and prevent recursion on early fault
    [PATCH] x86_64: Final support for AMD dual core
    [PATCH] x86_64: Fix a small missing schedule race
    [PATCH] x86_64: Fix interaction of single stepping with debuggers
    [PATCH] x86_64: Handle programs that set TF in user space using popf while single stepping
    [PATCH] x86_64: Keep only a single debug notifier chain
    [PATCH] x86_64: Make IRDA devices are not really ISA devices not depend on CONFIG_ISA
    [PATCH] x86_64: Make kernel math errors a die() now
    [PATCH] x86_64: Minor microoptimization in syscall entry slow path
    [PATCH] x86_64: Port over e820 gap detection from i386
    [PATCH] x86_64: Regularize exception stack handling
    [PATCH] x86_64: Remove duplicated syscall entry.
    [PATCH] x86_64: Remove excessive stack allocation in MCE code with large NR_CPUS
    [PATCH] x86_64: Remove unused macro in preempt support
    [PATCH] x86_64: Rename the extended cpuid level field
    [PATCH] x86_64: Rewrite exception stack backtracing
    [PATCH] x86_64: Some fixes for single step handling
    [PATCH] x86_64: Support constantly ticking TSCs
    [PATCH] x86_64: Switch SMP bootup over to new CPU hotplug state machine
    [PATCH] x86_64: Use a VMA for the 32bit vsyscall
    [PATCH] x86_64: Use a common function to find code segment bases
    [PATCH] x86_64: Use the e820 hole to map the IOMMU/AGP aperture
    [PATCH] x86_64: Use the extended RIP MSR for machine check reporting if available.
    [PATCH] x86_64: add support for Intel dual-core detection and displaying
    [PATCH] x86_64: clean up ptrace single-stepping
    [PATCH] x86_64: disable interrupts during SMP bogomips checking

Andrea Arcangeli:
    [PATCH] oom-killer disable for iscsi/lvm2/multipath userland critical sections

Andrew Morton:
    [PATCH] Fix acl Oops
    [PATCH] USB: usb_cdc build fix
    [PATCH] USB: usbnet printk warning fix
    [PATCH] arm: add comment about dma_supported()
    [PATCH] arm: add comment about max_low_pfn/max_pfn
    [PATCH] arm: fix SIGBUS handling
    [PATCH] arm: fix help text for ixdp465
    [PATCH] end_buffer_write_sync() avoid pointless assignments
    [PATCH] fix Bug 4395: modprobe bttv freezes the computer
    [PATCH] jbd dirty buffer leak fix
    [PATCH] vmscan: pageout(): remove unneeded test
    [PATCH] x86_64 show_stack(): call touch_nmi_watchdog

Anton Blanchard:
    [PATCH] ppc64: remove -fno-omit-frame-pointer

Arnaldo Carvalho de Melo:
    [PATCH] net: don't call kmem_cache_create with a spinlock held
    [SOCK]: on failure free the sock from the right place

Artem B. Bityuckiy:
    [PATCH] crypto: call zlib end functions on deflate exit path

Benjamin Herrenschmidt:
    [PATCH] fbdev MAINTAINERS update
    [PATCH] pmac: Improve sleep code of tumbler driver
    [PATCH] pmac: sound support for latest laptops
    [PATCH] ppc32: Fix AGP and sleep again
    [PATCH] ppc32: Fix cpufreq problems
    [PATCH] ppc32: MV643XX ethernet is an option for Pegasos
    [PATCH] ppc64: Detect altivec via firmware on unknown CPUs
    [PATCH] ppc64: Fix semantics of __ioremap
    [PATCH] ppc64: Improve mapping of vDSO
    [PATCH] ppc64: remove bogus f50 hack in prom.c
    [PATCH] ppc64: very basic desktop g5 sound support

Benoit Boissinot:
    [PATCH] cpuset: remove function attribute const
    [PATCH] ppc32: fix compilation error in arch/ppc/kernel/time.c
    [PATCH] ppc32: fix compilation error in arch/ppc/syslib/open_pic_defs.h
    [PATCH] ppc32: fix compilation error in include/asm-m68k/setup.h
    [PATCH] ppc32: fix compilation error in include/asm/prom.h

Bernard Blackham:
    [PATCH] ext2 corruption - regression between 2.6.9 and 2.6.10

Bert Wesarg:
    [PATCH] fix module_param_string() calls
    [PATCH] kernel/param.c: don't use .max when .num is NULL in param_array_set()

Bharath Ramesh:
    [PATCH] AYSNC IO using singals other than SIGIO

Chris Wedgwood:
    [PATCH] x86: fix acpi compile without CONFIG_ACPI_BUS

Christoph Hellwig:
    [PATCH] fix up newly added jsm driver
    [PATCH] kill #ifndef HAVE_ARCH_GET_SIGNAL_TO_DELIVER in signal.c
    [PATCH] officially deprecate register_ioctl32_conversion

Christoph Lameter:
    [PATCH] mmtimer build fix

Christopher Li:
    [PATCH] USB: bug fix in usbdevfs

Colin Leroy:
    [PATCH] CREDITS update

Coywolf Qi Hunt:
    [PATCH] reparent_to_init cleanup

Daniel McNeil:
    [PATCH] Direct IO async short read fix

Dave Airlie:
    [PATCH] r128_state.c: break missing in switch statement

Dave Hansen:
    [PATCH] undo do_readv_writev() behavior change

David Brownell:
    [PATCH] USB: OHCI on Compaq Aramada 7400
    [PATCH] USB: hcd suspend uses pm_message_t
    [PATCH] USB: revert "fix" to usb_set_interface()
    [PATCH] USB: usbnet and zaurus zl-5600
    [PATCH] revert fs/char_dev.c CONFIG_BASE_FULL change
    [PATCH] usb gadget: ethernet/rndis updates
    [PATCH] usb resume fixes
    [PATCH] usb suspend updates (interface suspend)

David Howells:
    [PATCH] Add 32-bit compatibility for NFSv4 mount

David S. Miller:
    [PATCH] Fix get_compat_sigevent()
    [PATCH] Fix linux/atalk.h header
    [PATCH] sparc64: Do not flush dcache for ZERO_PAGE.
    [PATCH] sparc64: Fix stat
    [PATCH] sparc64: Reduce ptrace cache flushing
    [PATCH] sparc64: use message queue compat syscalls
    [PATCH] sparc: Fix PTRACE_CONT bogosity
    [RTNETLINK]: Add comma to final entry in link_rtnetlink_table

Eugene Surovegin:
    [PATCH] ppc32: ppc4xx_pic - add acknowledge when enabling level-sensitive IRQ

Flavio Leitner:
    [PATCH] pl2303 - status line
    [PATCH] pl2303 - unplug device.

Geert Uytterhoeven:
    [PATCH] M68k: Update defconfigs for 2.6.11
    [PATCH] M68k: Update defconfigs for 2.6.12-rc2

Giovambattista Pulcini:
    [PATCH] ppc32: Fix a problem with NTP on !(chrp||gemini)

Greg KH:
    [PATCH] USB: fix up some sparse warnings about static functions that aren't static.

Hal Rosenstock:
    [PATCH] IB: Remove incorrect comments
    [PATCH] IB: remove unneeded includes
    [PATCH] IPoIB: set skb->mac.raw on receive

Herbert Xu:
    [ATALK]: Add missing dev_hold() to atrtr_create().
    [IPSEC]: COW skb header in UDP decap
    [IPV6]: IPV6_CHECKSUM socket option can corrupt kernel memory
    [IPV6]: Replace bogus instances of inet->recverr
    [NET]: Shave sizeof(ptr) bytes off dst_entry
    [PATCH] Fix dst_destroy() race

Horms:
    [PATCH] Maintainers list update: linux-net -> netdev

Hugh Dickins:
    [PATCH] freepgt: arch FIRST_USER_ADDRESS 0
    [PATCH] freepgt: arm FIRST_USER_ADDRESS PAGE_SIZE
    [PATCH] freepgt: arm26 FIRST_USER_ADDRESS PAGE_SIZE
    [PATCH] freepgt: free_pgtables from FIRST_USER_ADDRESS
    [PATCH] freepgt: free_pgtables use vma list
    [PATCH] freepgt: hugetlb area is clean
    [PATCH] freepgt: hugetlb_free_pgd_range
    [PATCH] freepgt: mpnt to vma cleanup
    [PATCH] freepgt: remove FIRST_USER_ADDRESS hack
    [PATCH] freepgt: remove MM_VM_SIZE(mm)
    [PATCH] freepgt: remove arch pgd_addr_end
    [PATCH] freepgt: sys_mincore ignore FIRST_USER_PGD_NR

Ingo Molnar:
    [PATCH] sched: fix signed comparisons of long long

James Bottomley:
    [PATCH] add Big Endian variants of ioread/iowrite
    [PATCH] re-export cancel_rearming_delayed_workqueue
    fully merge up to scsi-misc-2.6
    merge by hand (scsi_device.h)

James Morris:
    [PATCH] SELinux: add support for NETLINK_KOBJECT_UEVENT
    [PATCH] SELinux: fix bug in Netlink message type detection

Jan Kara:
    [PATCH] quota: fix possible oops on quotaoff

Jason Davis:
    [PATCH] x86_64 genapic update

Jason Gaston:
    [PATCH] ahci: AHCI mode SATA patch for Intel ESB2
    [PATCH] ata_piix: IDE mode SATA patch for Intel ESB2
    [PATCH] i2c-i801: I2C patch for Intel ESB2
    [PATCH] intel8x0: AC'97 audio patch for Intel ESB2
    [PATCH] irq and pci_ids: patch for Intel ESB2
    [PATCH] piix: IDE PATA patch for Intel ESB2

Jean Delvare:
    [PATCH] I2C: Fix incorrect sysfs file permissions in it87 and via686a drivers
    [PATCH] I2C: via686a cleanups

Jean Tourrilhes:
    [PATCH] irda_device() oops fix

Jeff Moyer:
    [PATCH] filemap_getpage can block when MAP_NONBLOCK specified

Jens Axboe:
    [PATCH] fix NMI lockup with CFQ scheduler
    [PATCH] possible use-after-free of bio

Jesper Juhl:
    [PATCH] USB: kfree cleanup for drivers/usb/* - no need to check for NULL
    [PATCH] usb: kfree() cleanups in drivers/usb/core/devio.c

Jurij Smakov:
    [PATCH] sparc64: Fix copy_sigingo_to_user32()

Kay Sievers:
    [PATCH] sysfs: add sysfs_chmod_file()

Ken Chen:
    [PATCH] use cheaper elv_queue_empty when unplug a device

Kumar Gala:
    [PATCH] ppc32: Allow adjust of pfn offset in pte
    [PATCH] ppc32: Fix pte_update for 64-bit PTEs
    [PATCH] ppc32: Support 36-bit physical addressing on e500
    [PATCH] ppc32: make usage of CONFIG_PTE_64BIT & CONFIG_PHYS_64BIT consistent

Larry Battraw:
    [PATCH] USB: visor Tapwave Zodiac support patch

Leigh Brown:
    [PATCH] ppc32: Make the Powerstack II Pro4000 boot again

Lennert Buytenhek:
    [PATCH] pci enumeration on ixp2000: overflow in kernel/resource.c

Libor Michalek:
    [PATCH] IB: Trivial FMR printk cleanup

Linus Torvalds:
    Fix up some file mode differences due to the new git world order.
    Linux v2.6.12-rc3
    Linux-2.6.12-rc2
    Merge SCSI tree from James Bottomley.
    Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/
    Merge with Greg's USB tree at kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
    Merge with kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6.git/
    Merge with kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
    Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git
    Merge with master.kernel.org:/home/rmk/linux-2.6-rmk.git - ARM changes

Magnus Damm:
    [PATCH] opl3sa2: MODULE_PARM_DESC

Martin Hicks:
    [PATCH] meminfo: add Cached underflow check

Matt Mackall:
    [PATCH] update maintainer for /dev/random

Michael S. Tsirkin:
    [PATCH] IB/mthca: add SYNC_TPT firmware command
    [PATCH] IB/mthca: add fast memory region implementation
    [PATCH] IB/mthca: add mthca_table_find() function
    [PATCH] IB/mthca: add mthca_write64_raw() for writing to MTT table directly
    [PATCH] IB/mthca: allow unaligned memory regions
    [PATCH] IB/mthca: encapsulate MTT buddy allocator
    [PATCH] IB/mthca: fill in opcode field for send completions
    [PATCH] IB/mthca: fix MR allocation error path
    [PATCH] IB/mthca: split MR key munging routines

Michal Ostrowski:
    [PATCH] debugfs: fix !debugfs prototypes

Neil Brown:
    [PATCH] Avoid deadlock in sync_page_io by using GFP_NOIO
    [PATCH] md: close a small race in md thread deregistration
    [PATCH] md: remove a number of misleading calls to MD_BUG
    [PATCH] nfsd4: callback create rpc client returns
    [PATCH] nfsd4: fix struct file leak
    [PATCH] nfsd: clear signals before exiting the nfsd() thread

Nishanth Aravamudan:
    [PATCH] USB: usb/digi_acceleport: correct wait-queue state

Niu YaWei:
    [PATCH] quota: possible bug in quota format v2 support

Olof Johansson:
    [PATCH] ppc64: no prefetch for NULL pointers

Paolo 'Blaisorblade' Giarrusso:
    [PATCH] uml: fix compilation for __CHOOSE_MODE addition

Paul E. McKenney:
    [PATCH] Fix comment in list.h that refers to nonexistent API

Paul Mackerras:
    [PATCH] ppc32: fix bogosity in process-freezing code
    [PATCH] ppc32: fix single-stepping of emulated instructions
    [PATCH] ppc32: improve timebase sync for SMP
    [PATCH] ppc32: oops on kernel altivec assist exceptions
    [PATCH] ppc64: fix export of wrong symbol

Pavel Machek:
    [PATCH] Fix u32 vs. pm_message_t in drivers/char
    [PATCH] Fix u32 vs. pm_message_t in x86-64
    [PATCH] USB: fix up remaining pm_message_t usages
    [PATCH] fix few remaining u32 vs. pm_message_t problems
    [PATCH] fix pm_message_t vs. u32 in alsa
    [PATCH] fix u32 vs. pm_message_t in PCI, PCIE
    [PATCH] fix u32 vs. pm_message_t in driver/video
    [PATCH] fix u32 vs. pm_message_t in drivers/
    [PATCH] fix u32 vs. pm_message_t in drivers/macintosh
    [PATCH] fix u32 vs. pm_message_t in drivers/media
    [PATCH] fix u32 vs. pm_message_t in drivers/message
    [PATCH] fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi
    [PATCH] fix u32 vs. pm_message_t in pcmcia
    [PATCH] fix u32 vs. pm_message_t in rest of the tree
    [PATCH] pm_message_t: more fixes in common and i386
    [PATCH] power/video.txt: update documentation with more systems
    [PATCH] u32 vs. pm_message_t fixes for drivers/net
    [PATCH] u32 vs. pm_message_t in ppc and radeon

Peter Favrholdt:
    [PATCH] USB: pl2303 new vendor/model ids

Phil Dibowitz:
    [PATCH] Fix GO_SLOW delay

Randy.Dunlap:
    [PATCH] Add dontdiff file

Robert Schwebel:
    [PATCH] export platform_add_devices

Roland Dreier:
    [PATCH] IB/mthca: add support for new MT25204 HCA
    [PATCH] IB/mthca: allocate correct number of doorbell pages
    [PATCH] IB/mthca: allow address handle creation in interrupt context
    [PATCH] IB/mthca: clean up mthca_dereg_mr()
    [PATCH] IB/mthca: encapsulate mem-free check into mthca_is_memfree()
    [PATCH] IB/mthca: fill in more device query fields
    [PATCH] IB/mthca: fix MTT allocation in mem-free mode
    [PATCH] IB/mthca: fix calculation of RDB shift
    [PATCH] IB/mthca: fix format of CQ number for CQ events
    [PATCH] IB/mthca: fix posting sends with immediate data
    [PATCH] IB/mthca: implement RDMA/atomic operations for mem-free mode
    [PATCH] IB/mthca: map MPT/MTT context in mem-free mode
    [PATCH] IB/mthca: map context for RDMA responder in mem-free mode
    [PATCH] IB/mthca: only free doorbell records in mem-free mode
    [PATCH] IB/mthca: print assigned IRQ when interrupt test fails
    [PATCH] IB/mthca: release mutex on doorbell alloc error path
    [PATCH] IB/mthca: tweaks to mthca_cmd.c
    [PATCH] IB/mthca: update receive queue initialization for new HCAs
    [PATCH] IB: Fix FMR pool crash
    [PATCH] IB: Fix user MAD registrations with class 0
    [PATCH] IPoIB: convert to debugfs
    [PATCH] IPoIB: document conversion to debugfs
    [PATCH] IPoIB: fix static rate calculation
    [PATCH] debugfs: Reduce <linux/debugfs.h> dependencies
    [PATCH] drivers/infiniband/hw/mthca/mthca_main.c: remove an unused label

Roland McGrath:
    [PATCH] i386 vDSO: add PT_NOTE segment
    [PATCH] i386: Use loaddebug macro consistently
    [PATCH] x86-64: i386 vDSO: add PT_NOTE segment

Russell King:
    [PATCH] ARM: Add missing new file for bitops patch
    [PATCH] ARM: bitops
    [PATCH] ARM: fix debug macros
    [PATCH] ARM: footbridge rtc init
    [PATCH] ARM: h3600_irda_set_speed arguments
    [PATCH] ARM: showregs
    [PATCH] arm: fix floppy disk dependencies
    [PATCH] serial: fix comments in 8250.c

Sean Hefty:
    [PATCH] IB: Keep MAD work completion valid

Siddha, Suresh B:
    [PATCH] x86, x86_64: dual core proc-cpuinfo and sibling-map fix
    [PATCH] x86_64-always-use-cpuid-80000008-to-figure-out-mtrr fix

Stas Sergeev:
    [PATCH] fix crash in entry.S restore_all

Stephen Hemminger:
    [NET]: skbuff: remove old NET_CALLER macro

Stephen Smalley:
    [PATCH] SELinux: fix deadlock on dcache lock

Steven Cole:
    [PATCH] 2.6.12-rc1-mm3 Fix ver_linux script for no udev utils.

Thomas Graf:
    [RTNETLINK]: Protocol family wildcard dumping for routing rules

Thomas Winischhofer:
    [PATCH] USB: new SIS device id

Tom Rini:
    [PATCH] ppc32: Fix building 32bit kernel for 64bit machines
    [PATCH] ppc32: Fix mpc8xx watchdog

Viktor A. Danilov:
    [PATCH] USB: fix AIPTEK input doesn`t register `device` & `driver` section in sysfs (/sys/class/input/event#)

YOSHIFUJI Hideaki:
    [IPV6]: Fix a branch prediction

Yoichi Yuasa:
    [PATCH] mips: remove #include <linux/audit.h> two times
    [PATCH] mips: remove obsolete VR41xx RTC function from vr41xx.h
    [PATCH] mips: update VR41xx CPU-PCI bridge support

Yoshinori Sato:
    [PATCH] h8300 header update

aherrman@de.ibm.com:
    [PATCH] zfcp: convert to compat_ioctl

andrew.vasquez@qlogic.com:
    [PATCH] qla2xxx: add remote port codes...
    [PATCH] qla2xxx: cleanup DMA mappings...
    [PATCH] qla2xxx: remove /proc interface
    [PATCH] qla2xxx: remove internal queuing...
    [PATCH] qla2xxx: remove lun discovery codes...
    [PATCH] qla2xxx: remove sale revision notes file
    [PATCH] qla2xxx: update version to 8.00.02b5-k

bunk@stusta.de:
    [PATCH] drivers/scsi/gdth.c: cleanups

dougg@torque.net:
    [PATCH] sg.c: update

ecashin@coraid.com:
    [PATCH] aoe 1/12: remove too-low cap on minor number
    [PATCH] aoe 11/12: add support for disk statistics
    [PATCH] aoe 12/12: send outgoing packets in order
    [PATCH] aoe 2/12: allow multiple aoe devices with same MAC
    [PATCH] aoe 3/12: update driver version to 6
    [PATCH] aoe 4/12: handle distros that have a udev rules
    [PATCH] aoe 5/12: don't try to free null bufpool
    [PATCH] aoe 6/12: Alexey Dobriyan sparse cleanup
    [PATCH] aoe 8/12: document env var for specifying number
    [PATCH] aoe 9/12: add note about the need for deadlock-free sk_buff allocation

felix@derklecks.de:
    [PATCH] USB Storage unusual_dev.h 07c4:a10b Datafab Systems, Inc.

gregkh@suse.de:
    [PATCH] USB: add new visor id for Treo 650
    [PATCH] kref: add link to original documentation to the kref documentation.

hch@lst.de:
    [PATCH] consolidate timeout defintions in scsi.h
    [PATCH] consolidate timeout defintions in scsi.h
    [PATCH] kill old EH constants
    [PATCH] kill old EH constants
    [PATCH] remove old scsi data direction macros
    [PATCH] remove outdated print_* functions
    [PATCH] remove outdated print_* functions

htejun@gmail.com:
    [PATCH] scsi: remove meaningless scsi_cmnd->serial_number_at_timeout field
    [PATCH] scsi: remove meaningless scsi_cmnd->serial_number_at_timeout field
    [PATCH] scsi: remove unused scsi_cmnd->internal_timeout field
    [PATCH] scsi: remove unused scsi_cmnd->internal_timeout field
    [PATCH] scsi: remove volatile from scsi data
    [PATCH] scsi: scsi_send_eh_cmnd() cleanup

jejb@titanic.il.steeleye.com:
    [PATCH] finally fix 53c700 to use the generic iomem infrastructure
    [PATCH] Convert i2o to compat_ioctl
    [PATCH] Convert i2o to compat_ioctl
    aic7xxx: add support for the SPI transport class
    aic7xxx: convert to SPI transport class Domain Validation
    lpfc: add Emulex FC driver version 8.0.28
    qla2xxx: fix compiler warning in qla_attr.c
    scsi: add DID_REQUEUE to the error handling
    scsi: add DID_REQUEUE to the error handling
    updates for CFQ oops fix
    zfcp: add point-2-point support
    zfcp: add point-2-point support

johnpol@2ka.mipt.ru:
    [PATCH] w1: real fix for big endian machines.
    [PATCH] w1_smem: w1 ID is only 8 bytes long.

kay.sievers@vrfy.org:
    [PATCH] add TIMEOUT to firmware_class hotplug event
    [PATCH] kobject/hotplug split - block core
    [PATCH] kobject/hotplug split - class core
    [PATCH] kobject/hotplug split - devices core
    [PATCH] kobject/hotplug split - kobject add/remove
    [PATCH] kobject/hotplug split - net bridge
    [PATCH] kobject/hotplug split - usb cris

maximilian attems:
    [PATCH] efi: eliminate bad section references
    [PATCH] hd: eliminate bad section references
    [PATCH] pnpbios: eliminate bad section references

minyard@acm.org:
    [PATCH] kref: add documentation