diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-25 21:46:17 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-25 21:46:17 +1000 |
commit | c04ffab38b20fe4fd3c64912328674d46d4d35e6 (patch) | |
tree | a182205f4213fd075bf60bb6683fea9acf7088cc | |
parent | 11a0f15e4a44ed40d9659fc2b98bbf551585636b (diff) |
Add linux-next specific files for 20080825next-20080825
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | Next/Trees | 117 | ||||
-rw-r--r-- | Next/merge.log | 4644 | ||||
-rw-r--r-- | Next/quilt-import.log | 118 | ||||
-rw-r--r-- | localversion-next | 1 |
4 files changed, 4880 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4caff4296ec1 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,117 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#merge +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-2.6.26 +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k quilt http://www.kernel.org/pub/linux/kernel/people/geert/linux-m68k-patches-2.6/ +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#powerpc-next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#powerpc-next +s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-timers-next +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-x86-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#mm +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#stable +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6.git#test +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/~dedekind/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/test.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next +ubifs git git://git.infradead.org/~dedekind/ubifs-2.6.git#linux-next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#reg-for-linus +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +creds git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next-creds +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-oprofile-next +fastboot git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-fastboot-next +sparseirq git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sparseirq-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..c0230e0a146f --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4644 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 6a55617 Linux v2.6.27-rc4 +Merging origin/master +$ git merge origin/master +Updating 6a55617..83097ac +Fast forward + Documentation/filesystems/ext4.txt | 6 + + Documentation/ja_JP/HOWTO | 67 ++- + Documentation/ja_JP/SubmitChecklist | 111 ++++ + Documentation/kernel-parameters.txt | 3 + + arch/arm/mach-integrator/impd1.c | 2 +- + arch/arm/mach-ixp4xx/fsg-setup.c | 4 +- + arch/arm/mach-pxa/clock.c | 25 + + arch/arm/mach-pxa/clock.h | 5 + + arch/arm/mach-pxa/eseries.c | 170 ++++-- + arch/arm/mach-pxa/include/mach/irqs.h | 1 + + arch/arm/mach-pxa/lubbock.c | 2 + + arch/arm/mach-pxa/pxa25x.c | 10 +- + arch/arm/mach-pxa/pxa300.c | 2 + + arch/arm/plat-omap/clock.c | 1 - + arch/cris/arch-v32/kernel/fasttimer.c | 2 - + arch/mn10300/kernel/mn10300-serial.c | 1 - + arch/powerpc/sysdev/bestcomm/gen_bd.c | 1 - + arch/s390/defconfig | 54 ++- + arch/s390/include/asm/bitops.h | 6 +- + arch/s390/kernel/process.c | 4 +- + arch/s390/kernel/smp.c | 2 - + arch/x86/kernel/amd_iommu.c | 2 +- + arch/x86/kernel/cpu/addon_cpuid_features.c | 17 +- + arch/x86/kernel/cpu/cyrix.c | 18 - + arch/x86/kernel/cpu/mtrr/generic.c | 20 +- + arch/x86/kernel/cpu/mtrr/main.c | 5 +- + arch/x86/kernel/genx2apic_uv_x.c | 8 +- + arch/x86/kernel/numaq_32.c | 2 +- + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/pci-calgary_64.c | 14 +- + arch/x86/kernel/setup.c | 16 +- + arch/x86/kernel/smpboot.c | 3 + + arch/x86/kernel/tlb_uv.c | 3 +- + arch/x86/kernel/tsc_sync.c | 6 +- + arch/x86/mach-rdc321x/platform.c | 1 - + arch/x86/mm/init_64.c | 36 +- + arch/x86/mm/ioremap.c | 8 +- + arch/x86/mm/mmio-mod.c | 4 +- + arch/x86/mm/pageattr.c | 6 +- + arch/x86/mm/pat.c | 50 +- + arch/x86/oprofile/nmi_int.c | 39 +- + block/genhd.c | 36 +- + crypto/authenc.c | 10 +- + drivers/ata/ahci.c | 8 +- + drivers/ata/ata_piix.c | 8 + + drivers/ata/libata-core.c | 60 +- + drivers/ata/libata-eh.c | 30 +- + drivers/ata/pata_acpi.c | 2 +- + drivers/ata/pata_atiixp.c | 2 +- + drivers/ata/pata_cs5530.c | 6 +- + drivers/ata/pata_it821x.c | 2 +- + drivers/ata/pata_oldpiix.c | 2 +- + drivers/ata/pata_sc1200.c | 6 +- + drivers/ata/pata_via.c | 59 +-- + drivers/ata/sata_mv.c | 37 +- + drivers/atm/adummy.c | 1 - + drivers/base/class.c | 11 + + drivers/base/core.c | 31 +- + drivers/base/driver.c | 3 - + drivers/base/power/main.c | 19 +- + drivers/base/power/power.h | 9 +- + drivers/char/xilinx_hwicap/buffer_icap.h | 1 - + drivers/char/xilinx_hwicap/fifo_icap.h | 1 - + drivers/char/xilinx_hwicap/xilinx_hwicap.h | 1 - + drivers/edac/edac_core.h | 1 - + drivers/i2c/busses/i2c-at91.c | 1 - + drivers/infiniband/hw/ehca/ehca_tools.h | 1 - + drivers/infiniband/hw/ipath/ipath_fs.c | 1 - + drivers/infiniband/hw/ipath/ipath_iba7220.c | 2 +- + drivers/infiniband/hw/ipath/ipath_ud.c | 8 +- + drivers/infiniband/hw/nes/nes.h | 1 - + drivers/infiniband/ulp/ipoib/ipoib_main.c | 19 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 10 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 1 - + drivers/input/keyboard/bf54x-keys.c | 1 - + drivers/input/touchscreen/mainstone-wm97xx.c | 1 - + drivers/mfd/asic3.c | 1 - + drivers/misc/acer-wmi.c | 5 + + drivers/misc/eeprom_93cx6.c | 1 - + drivers/mtd/maps/amd76xrom.c | 1 - + drivers/mtd/maps/ck804xrom.c | 1 - + drivers/mtd/maps/esb2rom.c | 1 - + drivers/mtd/nand/au1550nd.c | 1 - + drivers/net/myri10ge/myri10ge.c | 1 - + drivers/net/netxen/netxen_nic.h | 1 - + drivers/net/netxen/netxen_nic_ethtool.c | 1 - + drivers/net/netxen/netxen_nic_hdr.h | 2 - + drivers/net/tokenring/lanstreamer.c | 1 - + drivers/net/tokenring/lanstreamer.h | 2 - + drivers/net/wireless/b43legacy/main.c | 1 - + drivers/net/wireless/iwlwifi/iwl-3945-led.c | 1 - + drivers/net/wireless/iwlwifi/iwl-led.c | 1 - + drivers/net/wireless/iwlwifi/iwl-rfkill.c | 1 - + drivers/rtc/rtc-max6902.c | 2 - + drivers/rtc/rtc-r9701.c | 1 - + drivers/s390/block/dasd.c | 5 +- + drivers/s390/block/dasd_eckd.h | 2 +- + drivers/s390/block/dasd_eer.c | 3 +- + drivers/s390/block/dcssblk.c | 4 + + drivers/s390/char/tape_char.c | 2 +- + drivers/s390/char/tape_std.c | 2 +- + drivers/s390/cio/ccwgroup.c | 20 +- + drivers/s390/cio/css.c | 1 - + drivers/s390/cio/device.c | 40 +- + drivers/s390/cio/device.h | 2 +- + drivers/s390/cio/device_fsm.c | 31 +- + drivers/s390/cio/qdio_debug.h | 6 +- + drivers/s390/cio/qdio_main.c | 74 +-- + drivers/s390/cio/qdio_setup.c | 6 +- + drivers/s390/cio/qdio_thinint.c | 6 +- + drivers/s390/net/ctcm_mpc.c | 1 - + drivers/scsi/dpt/dpti_i2o.h | 1 - + drivers/scsi/ips.c | 1 - + drivers/scsi/ips.h | 1 - + drivers/scsi/lpfc/lpfc_debugfs.c | 1 - + drivers/scsi/nsp32.c | 1 - + drivers/scsi/nsp32.h | 1 - + drivers/scsi/pcmcia/nsp_cs.c | 1 - + drivers/scsi/qla2xxx/qla_mid.c | 1 - + drivers/uio/Kconfig | 13 + + drivers/uio/Makefile | 1 + + drivers/uio/uio_pdrv.c | 4 +- + drivers/uio/uio_pdrv_genirq.c | 188 ++++++ + drivers/usb/atm/ueagle-atm.c | 1 - + drivers/usb/class/cdc-acm.c | 5 +- + drivers/usb/core/driver.c | 96 ++-- + drivers/usb/core/hcd.c | 9 - + drivers/usb/core/hcd.h | 4 - + drivers/usb/core/hub.c | 9 - + drivers/usb/core/urb.c | 9 +- + drivers/usb/core/usb.c | 73 ++- + drivers/usb/core/usb.h | 3 + + drivers/usb/gadget/amd5536udc.c | 1 - + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/gadget/s3c2410_udc.c | 1 - + drivers/usb/host/isp1760-hcd.c | 2 +- + drivers/usb/host/ohci-at91.c | 1 - + drivers/usb/host/ohci-au1xxx.c | 1 - + drivers/usb/host/ohci-ep93xx.c | 1 - + drivers/usb/host/ohci-hub.c | 53 +- + drivers/usb/host/ohci-lh7a404.c | 1 - + drivers/usb/host/ohci-omap.c | 1 - + drivers/usb/host/ohci-pci.c | 1 - + drivers/usb/host/ohci-pnx4008.c | 1 - + drivers/usb/host/ohci-pnx8550.c | 1 - + drivers/usb/host/ohci-ppc-of.c | 1 - + drivers/usb/host/ohci-ppc-soc.c | 1 - + drivers/usb/host/ohci-ps3.c | 1 - + drivers/usb/host/ohci-pxa27x.c | 1 - + drivers/usb/host/ohci-s3c2410.c | 1 - + drivers/usb/host/ohci-sa1111.c | 1 - + drivers/usb/host/ohci-sh.c | 1 - + drivers/usb/host/ohci-sm501.c | 1 - + drivers/usb/host/ohci-ssb.c | 1 - + drivers/usb/host/u132-hcd.c | 11 - + drivers/usb/misc/iowarrior.c | 1 - + drivers/usb/misc/sisusbvga/sisusb.c | 1 + + drivers/usb/musb/Kconfig | 13 +- + drivers/usb/musb/Makefile | 21 +- + drivers/usb/musb/musb_core.c | 38 +- + drivers/usb/musb/musb_core.h | 19 - + drivers/usb/musb/musb_debug.h | 4 - + drivers/usb/musb/musb_gadget_ep0.c | 2 + + drivers/usb/musb/musb_procfs.c | 830 ------------------------ + drivers/usb/serial/garmin_gps.c | 2 - + drivers/usb/serial/option.c | 2 + + drivers/video/arkfb.c | 1 - + drivers/video/s3fb.c | 1 - + drivers/video/vermilion/vermilion.h | 1 - + drivers/video/vt8623fb.c | 1 - + drivers/video/xilinxfb.c | 1 - + fs/ext4/balloc.c | 3 + + fs/ext4/dir.c | 20 +- + fs/ext4/ext4.h | 4 + + fs/ext4/ext4_extents.h | 4 +- + fs/ext4/ext4_jbd2.h | 8 + + fs/ext4/extents.c | 113 ++-- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 478 +++++++++----- + fs/ext4/mballoc.c | 53 ++- + fs/ext4/migrate.c | 3 +- + fs/ext4/resize.c | 3 +- + fs/ext4/super.c | 1 + + fs/jffs2/jffs2_fs_i.h | 1 - + fs/xfs/xfs_dmapi.h | 1 - + include/asm-x86/genapic_32.h | 1 + + include/asm-x86/genapic_64.h | 1 + + include/asm-x86/irq_vectors.h | 1 + + include/asm-x86/uv/uv_bau.h | 5 - + include/asm-x86/xen/hypervisor.h | 1 - + include/linux/device.h | 5 +- + include/linux/fs_uart_pd.h | 1 - + include/linux/libata.h | 24 + + include/linux/tick.h | 5 +- + include/linux/usb.h | 3 + + include/net/pkt_sched.h | 1 + + include/net/sch_generic.h | 5 + + kernel/nsproxy.c | 1 - + kernel/power/swap.c | 1 - + kernel/rcupdate.c | 1 + + kernel/sched_features.h | 2 +- + kernel/time/tick-sched.c | 6 +- + kernel/user_namespace.c | 1 - + kernel/utsname.c | 1 - + kernel/utsname_sysctl.c | 1 - + lib/kobject.c | 3 +- + net/ipv4/icmp.c | 22 +- + net/ipv6/addrconf.c | 1 + + net/ipv6/icmp.c | 23 +- + net/sched/sch_api.c | 48 ++- + net/sched/sch_cbq.c | 4 + + net/sched/sch_generic.c | 5 +- + net/sctp/endpointola.c | 4 +- + net/sctp/socket.c | 85 ++- + scripts/mod/file2alias.c | 16 +- + sound/mips/au1x00.c | 1 - + sound/pci/hda/hda_intel.c | 9 + + sound/pci/hda/patch_realtek.c | 6 +- + sound/soc/at91/eti_b1_wm8731.c | 1 - + sound/soc/codecs/wm8753.c | 1 - + sound/soc/codecs/wm9712.c | 1 - + 221 files changed, 1909 insertions(+), 1892 deletions(-) + create mode 100644 Documentation/ja_JP/SubmitChecklist + create mode 100644 drivers/uio/uio_pdrv_genirq.c + delete mode 100644 drivers/usb/musb/musb_procfs.c +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Merge made by recursive. + arch/sparc/Makefile | 8 ++++++-- + arch/sparc/boot/Makefile | 6 ++++++ + arch/sparc64/Kconfig | 1 + + 3 files changed, 13 insertions(+), 2 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + drivers/pci/hotplug/pciehp.h | 1 - + drivers/pci/hotplug/pciehp_core.c | 21 ++++++++++++++------- + drivers/pci/hotplug/pciehp_hpc.c | 11 +---------- + drivers/pci/hotplug/shpchp_core.c | 34 +++++++++++++++------------------- + drivers/pci/search.c | 2 ++ + 5 files changed, 32 insertions(+), 37 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. +Merging quilt/usb.current +$ git merge quilt/usb.current +Auto-merged drivers/usb/core/usb.c +CONFLICT (content): Merge conflict in drivers/usb/core/usb.c +Auto-merged drivers/usb/musb/musb_core.c +CONFLICT (content): Merge conflict in drivers/usb/musb/musb_core.c +Resolved 'drivers/usb/core/usb.c' using previous resolution. +Resolved 'drivers/usb/musb/musb_core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 4b64916: Merge branch 'quilt/usb.current' +$ git diff -M --stat --summary HEAD^.. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) +Merging md-current/for-2.6.26 +$ git merge md-current/for-2.6.26 +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merged MAINTAINERS +Auto-merged arch/arm/mach-pxa/include/mach/irqs.h +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/include/mach/irqs.h +Removed drivers/video/am200epd.c +Resolved 'arch/arm/mach-pxa/include/mach/irqs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 2332b51: Merge commit 'arm/devel' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 + + arch/arm/Kconfig | 23 +- + arch/arm/configs/afeb9260_defconfig | 1259 +++++++++++++++++++++++++ + arch/arm/include/asm/bug.h | 2 +- + arch/arm/include/asm/cacheflush.h | 90 -- + arch/arm/include/asm/cachetype.h | 96 ++ + arch/arm/include/asm/cputype.h | 64 ++ + arch/arm/include/asm/futex.h | 124 +++- + arch/arm/include/asm/kprobes.h | 1 - + arch/arm/include/asm/mmu_context.h | 1 + + arch/arm/include/asm/system.h | 58 -- + arch/arm/kernel/kprobes-decode.c | 4 +- + arch/arm/kernel/kprobes.c | 5 +- + arch/arm/kernel/setup.c | 46 +- + arch/arm/kernel/traps.c | 12 - + arch/arm/mach-at91/Kconfig | 9 + + arch/arm/mach-at91/Makefile | 1 + + arch/arm/mach-at91/board-afeb-9260v1.c | 194 ++++ + arch/arm/mach-iop32x/iq31244.c | 4 +- + arch/arm/mach-ixp4xx/common-pci.c | 7 +- + arch/arm/mach-ixp4xx/include/mach/cpu.h | 9 +- + arch/arm/mach-omap2/Makefile | 3 +- + arch/arm/mach-omap2/clock.c | 46 +- + arch/arm/mach-omap2/clock.h | 1 + + arch/arm/mach-omap2/clock24xx.h | 238 ++++- + arch/arm/mach-omap2/clock34xx.c | 31 +- + arch/arm/mach-omap2/clock34xx.h | 248 ++++- + arch/arm/mach-omap2/clockdomain.c | 623 ++++++++++++ + arch/arm/mach-omap2/clockdomains.h | 305 ++++++ + arch/arm/mach-omap2/cm-regbits-24xx.h | 24 +- + arch/arm/mach-omap2/cm-regbits-34xx.h | 42 +- + arch/arm/mach-omap2/id.c | 1 + + arch/arm/mach-omap2/io.c | 9 + + arch/arm/mach-omap2/powerdomain.c | 1113 ++++++++++++++++++++++ + arch/arm/mach-omap2/powerdomains.h | 187 ++++ + arch/arm/mach-omap2/powerdomains24xx.h | 200 ++++ + arch/arm/mach-omap2/powerdomains34xx.h | 327 +++++++ + arch/arm/mach-omap2/prcm-common.h | 3 +- + arch/arm/mach-omap2/prm-regbits-24xx.h | 12 +- + arch/arm/mach-omap2/prm-regbits-34xx.h | 11 +- + arch/arm/mach-omap2/prm.h | 3 +- + arch/arm/mach-pxa/Kconfig | 58 ++- + arch/arm/mach-pxa/Makefile | 2 + + arch/arm/mach-pxa/am200epd.c | 374 ++++++++ + arch/arm/mach-pxa/devices.h | 1 + + arch/arm/mach-pxa/gumstix.c | 100 ++- + arch/arm/mach-pxa/include/mach/hardware.h | 2 + + arch/arm/mach-pxa/include/mach/i2c.h | 6 +- + arch/arm/mach-pxa/include/mach/irqs.h | 8 +- + arch/arm/mach-pxa/include/mach/mfp-pxa320.h | 8 +- + arch/arm/mach-pxa/include/mach/mioa701.h | 67 ++ + arch/arm/mach-pxa/include/mach/trizeps4.h | 84 ++- + arch/arm/mach-pxa/mioa701.c | 905 ++++++++++++++++++ + arch/arm/mach-pxa/mioa701_bootresume.S | 36 + + arch/arm/mach-pxa/pxa27x.c | 2 +- + arch/arm/mach-pxa/pxa3xx.c | 45 + + arch/arm/mach-pxa/trizeps4.c | 549 +++++++----- + arch/arm/mach-pxa/zylonite_pxa300.c | 6 + + arch/arm/mach-pxa/zylonite_pxa320.c | 6 + + arch/arm/mach-sa1100/cpu-sa1100.c | 4 +- + arch/arm/mach-sa1100/cpu-sa1110.c | 1 + + arch/arm/mach-sa1100/include/mach/SA-1100.h | 8 +- + arch/arm/mm/copypage-v6.c | 1 + + arch/arm/mm/fault-armv.c | 1 + + arch/arm/mm/flush.c | 1 + + arch/arm/mm/ioremap.c | 1 + + arch/arm/mm/mmap.c | 5 +- + arch/arm/mm/mmu.c | 1 + + arch/arm/oprofile/Makefile | 1 + + arch/arm/oprofile/common.c | 4 + + arch/arm/oprofile/op_arm_model.h | 1 + + arch/arm/oprofile/op_model_v7.c | 411 ++++++++ + arch/arm/oprofile/op_model_v7.h | 103 ++ + arch/arm/oprofile/op_model_xscale.c | 2 +- + arch/arm/plat-omap/Kconfig | 24 + + arch/arm/plat-omap/include/mach/clock.h | 3 + + arch/arm/plat-omap/include/mach/clockdomain.h | 106 +++ + arch/arm/plat-omap/include/mach/irqs.h | 2 + + arch/arm/plat-omap/include/mach/powerdomain.h | 166 ++++ + drivers/i2c/busses/i2c-pxa.c | 19 +- + drivers/input/touchscreen/Kconfig | 1 + + drivers/input/touchscreen/ucb1400_ts.c | 382 +++----- + drivers/mfd/Kconfig | 9 + + drivers/mfd/Makefile | 1 + + drivers/mfd/ucb1400_core.c | 106 +++ + drivers/pcmcia/Makefile | 3 +- + drivers/pcmcia/pxa2xx_palmld.c | 151 +++ + drivers/video/Kconfig | 31 +- + drivers/video/Makefile | 1 - + drivers/video/am200epd.c | 295 ------ + drivers/video/metronomefb.c | 288 +++--- + drivers/watchdog/ixp4xx_wdt.c | 4 +- + include/linux/ucb1400.h | 161 ++++ + include/video/metronomefb.h | 31 +- + 94 files changed, 8670 insertions(+), 1360 deletions(-) + create mode 100644 arch/arm/configs/afeb9260_defconfig + create mode 100644 arch/arm/include/asm/cachetype.h + create mode 100644 arch/arm/include/asm/cputype.h + create mode 100644 arch/arm/mach-at91/board-afeb-9260v1.c + create mode 100644 arch/arm/mach-omap2/clockdomain.c + create mode 100644 arch/arm/mach-omap2/clockdomains.h + create mode 100644 arch/arm/mach-omap2/powerdomain.c + create mode 100644 arch/arm/mach-omap2/powerdomains.h + create mode 100644 arch/arm/mach-omap2/powerdomains24xx.h + create mode 100644 arch/arm/mach-omap2/powerdomains34xx.h + create mode 100644 arch/arm/mach-pxa/am200epd.c + create mode 100644 arch/arm/mach-pxa/include/mach/mioa701.h + create mode 100644 arch/arm/mach-pxa/mioa701.c + create mode 100644 arch/arm/mach-pxa/mioa701_bootresume.S + create mode 100644 arch/arm/oprofile/op_model_v7.c + create mode 100644 arch/arm/oprofile/op_model_v7.h + create mode 100644 arch/arm/plat-omap/include/mach/clockdomain.h + create mode 100644 arch/arm/plat-omap/include/mach/powerdomain.h + create mode 100644 drivers/mfd/ucb1400_core.c + create mode 100644 drivers/pcmcia/pxa2xx_palmld.c + delete mode 100644 drivers/video/am200epd.c + create mode 100644 include/linux/ucb1400.h +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/arch-v10/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v10/boot/rescue/Makefile | 2 +- + .../arch-v10/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/arch-v32/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v32/boot/rescue/Makefile | 2 +- + .../arch-v32/boot/rescue/{rescue.ld => rescue.lds} | 0 + 8 files changed, 4 insertions(+), 4 deletions(-) + rename arch/cris/arch-v10/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v10/boot/rescue/{rescue.ld => rescue.lds} (100%) + rename arch/cris/arch-v32/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v32/boot/rescue/{rescue.ld => rescue.lds} (100%) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging quilt/m68k +$ git merge quilt/m68k +Merge made by recursive. + arch/m68k/atari/time.c | 35 ++++++++++++++++++----------------- + arch/m68k/bvme6000/config.c | 15 +-------------- + arch/m68k/bvme6000/rtc.c | 30 +++++++++++++++--------------- + arch/m68k/kernel/traps.c | 9 +++------ + arch/m68k/mvme16x/rtc.c | 26 +++++++++++++------------- + arch/m68k/q40/config.c | 12 +----------- + arch/m68k/sun3x/time.c | 28 ++++++++++++++-------------- + 7 files changed, 65 insertions(+), 90 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Merge made by recursive. + Documentation/kernel-parameters.txt | 4 + + arch/mips/kernel/ptrace32.c | 43 +--- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/signal32.c | 12 + + arch/mips/pci/pci-tx4938.c | 2 +- + arch/mips/pmc-sierra/msp71xx/Makefile | 1 + + arch/mips/pmc-sierra/msp71xx/gpio.c | 218 +++++++++++++++ + arch/mips/pmc-sierra/msp71xx/gpio_extended.c | 148 ++++++++++ + arch/mips/rb532/devices.c | 6 +- + arch/mips/rb532/gpio.c | 10 +- + arch/mips/rb532/prom.c | 12 - + arch/mips/txx9/Kconfig | 9 +- + arch/mips/txx9/generic/Makefile | 1 + + arch/mips/txx9/generic/irq_tx4927.c | 11 + + arch/mips/txx9/generic/irq_tx4938.c | 11 + + arch/mips/txx9/generic/setup.c | 309 +++++++++++++++++++- + arch/mips/txx9/generic/setup_tx3927.c | 37 ++- + arch/mips/txx9/generic/setup_tx4927.c | 66 +++++ + arch/mips/txx9/generic/setup_tx4938.c | 66 +++++ + arch/mips/txx9/{rbtx4938 => generic}/spi_eeprom.c | 28 +- + arch/mips/txx9/jmr3927/prom.c | 1 - + arch/mips/txx9/jmr3927/setup.c | 20 +- + arch/mips/txx9/rbtx4927/irq.c | 5 + + arch/mips/txx9/rbtx4927/prom.c | 1 - + arch/mips/txx9/rbtx4927/setup.c | 24 ++- + arch/mips/txx9/rbtx4938/Makefile | 2 +- + arch/mips/txx9/rbtx4938/prom.c | 3 - + arch/mips/txx9/rbtx4938/setup.c | 62 ++++- + include/asm-mips/mach-rc32434/prom.h | 4 - + include/asm-mips/mach-rc32434/rb.h | 3 +- + include/asm-mips/mach-rc32434/rc32434.h | 12 - + include/asm-mips/pmc-sierra/msp71xx/gpio.h | 46 +++ + include/asm-mips/ptrace.h | 3 + + include/asm-mips/txx9/boards.h | 10 + + include/asm-mips/txx9/generic.h | 7 +- + include/asm-mips/txx9/rbtx4927.h | 2 + + include/asm-mips/txx9/smsc_fdc37m81x.h | 1 + + include/asm-mips/txx9/spi.h | 19 ++- + include/asm-mips/txx9/tx3927.h | 2 + + include/asm-mips/txx9/tx4927.h | 14 + + include/asm-mips/txx9/tx4938.h | 2 + + 42 files changed, 1083 insertions(+), 158 deletions(-) + create mode 100644 arch/mips/pmc-sierra/msp71xx/gpio.c + create mode 100644 arch/mips/pmc-sierra/msp71xx/gpio_extended.c + rename arch/mips/txx9/{rbtx4938 => generic}/spi_eeprom.c (79%) + create mode 100644 include/asm-mips/pmc-sierra/msp71xx/gpio.h + create mode 100644 include/asm-mips/txx9/boards.h +Merging parisc/master +$ git merge parisc/master +Merge made by recursive. + .../asm-parisc => arch/parisc/include/asm}/Kbuild | 0 + .../asm-parisc => arch/parisc/include/asm}/a.out.h | 0 + .../asm-parisc => arch/parisc/include/asm}/agp.h | 0 + .../parisc/include/asm}/asmregs.h | 0 + .../parisc/include/asm}/assembly.h | 0 + .../parisc/include/asm}/atomic.h | 0 + .../parisc/include/asm}/auxvec.h | 0 + .../parisc/include/asm}/bitops.h | 0 + .../asm-parisc => arch/parisc/include/asm}/bug.h | 0 + .../asm-parisc => arch/parisc/include/asm}/bugs.h | 0 + .../parisc/include/asm}/byteorder.h | 0 + .../asm-parisc => arch/parisc/include/asm}/cache.h | 0 + .../parisc/include/asm}/cacheflush.h | 0 + .../parisc/include/asm}/checksum.h | 0 + .../parisc/include/asm}/compat.h | 0 + .../parisc/include/asm}/compat_rt_sigframe.h | 0 + .../parisc/include/asm}/compat_signal.h | 0 + .../parisc/include/asm}/compat_ucontext.h | 0 + .../parisc/include/asm}/cputime.h | 0 + .../parisc/include/asm}/current.h | 0 + .../asm-parisc => arch/parisc/include/asm}/delay.h | 0 + .../parisc/include/asm}/device.h | 0 + .../asm-parisc => arch/parisc/include/asm}/div64.h | 0 + .../parisc/include/asm}/dma-mapping.h | 0 + .../asm-parisc => arch/parisc/include/asm}/dma.h | 0 + .../parisc/include/asm}/eisa_bus.h | 0 + .../parisc/include/asm}/eisa_eeprom.h | 0 + .../asm-parisc => arch/parisc/include/asm}/elf.h | 0 + .../parisc/include/asm}/emergency-restart.h | 0 + .../asm-parisc => arch/parisc/include/asm}/errno.h | 0 + .../asm-parisc => arch/parisc/include/asm}/fb.h | 0 + .../asm-parisc => arch/parisc/include/asm}/fcntl.h | 0 + .../parisc/include/asm}/fixmap.h | 0 + .../parisc/include/asm}/floppy.h | 0 + .../asm-parisc => arch/parisc/include/asm}/futex.h | 0 + .../parisc/include/asm}/grfioctl.h | 0 + .../parisc/include/asm}/hardirq.h | 0 + .../parisc/include/asm}/hardware.h | 0 + .../parisc/include/asm}/hw_irq.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ide.h | 0 + .../asm-parisc => arch/parisc/include/asm}/io.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ioctl.h | 0 + .../parisc/include/asm}/ioctls.h | 0 + .../parisc/include/asm}/ipcbuf.h | 0 + .../asm-parisc => arch/parisc/include/asm}/irq.h | 0 + .../parisc/include/asm}/irq_regs.h | 0 + .../parisc/include/asm}/kdebug.h | 0 + .../parisc/include/asm}/kmap_types.h | 0 + .../asm-parisc => arch/parisc/include/asm}/led.h | 0 + .../parisc/include/asm}/linkage.h | 0 + .../asm-parisc => arch/parisc/include/asm}/local.h | 0 + .../parisc/include/asm}/machdep.h | 0 + .../parisc/include/asm}/mc146818rtc.h | 0 + .../parisc/include/asm}/mckinley.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mman.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mmu.h | 0 + .../parisc/include/asm}/mmu_context.h | 0 + .../parisc/include/asm}/mmzone.h | 0 + .../parisc/include/asm}/module.h | 0 + .../parisc/include/asm}/msgbuf.h | 0 + .../asm-parisc => arch/parisc/include/asm}/mutex.h | 0 + .../asm-parisc => arch/parisc/include/asm}/page.h | 0 + .../asm-parisc => arch/parisc/include/asm}/param.h | 0 + .../parisc/include/asm}/parisc-device.h | 0 + .../parisc/include/asm}/parport.h | 0 + .../asm-parisc => arch/parisc/include/asm}/pci.h | 0 + .../asm-parisc => arch/parisc/include/asm}/pdc.h | 5 ++ + .../parisc/include/asm}/pdc_chassis.h | 0 + .../parisc/include/asm}/pdcpat.h | 0 + .../parisc/include/asm}/percpu.h | 0 + .../asm-parisc => arch/parisc/include/asm}/perf.h | 0 + .../parisc/include/asm}/pgalloc.h | 0 + .../parisc/include/asm}/pgtable.h | 0 + .../asm-parisc => arch/parisc/include/asm}/poll.h | 0 + .../parisc/include/asm}/posix_types.h | 0 + .../parisc/include/asm}/prefetch.h | 0 + .../parisc/include/asm}/processor.h | 0 + .../asm-parisc => arch/parisc/include/asm}/psw.h | 0 + .../parisc/include/asm}/ptrace.h | 0 + .../asm-parisc => arch/parisc/include/asm}/real.h | 0 + .../parisc/include/asm}/resource.h | 0 + .../asm-parisc => arch/parisc/include/asm}/ropes.h | 2 +- + .../parisc/include/asm}/rt_sigframe.h | 0 + .../asm-parisc => arch/parisc/include/asm}/rtc.h | 0 + .../parisc/include/asm}/runway.h | 0 + .../parisc/include/asm}/scatterlist.h | 0 + .../parisc/include/asm}/sections.h | 0 + .../parisc/include/asm}/segment.h | 0 + .../parisc/include/asm}/sembuf.h | 0 + .../parisc/include/asm}/serial.h | 0 + .../asm-parisc => arch/parisc/include/asm}/setup.h | 0 + .../parisc/include/asm}/shmbuf.h | 0 + .../parisc/include/asm}/shmparam.h | 0 + .../parisc/include/asm}/sigcontext.h | 0 + .../parisc/include/asm}/siginfo.h | 0 + .../parisc/include/asm}/signal.h | 0 + .../asm-parisc => arch/parisc/include/asm}/smp.h | 0 + .../parisc/include/asm}/socket.h | 0 + .../parisc/include/asm}/sockios.h | 0 + .../parisc/include/asm}/spinlock.h | 0 + .../parisc/include/asm}/spinlock_types.h | 0 + .../asm-parisc => arch/parisc/include/asm}/stat.h | 0 + .../parisc/include/asm}/statfs.h | 0 + .../parisc/include/asm}/string.h | 0 + .../parisc/include/asm}/superio.h | 0 + .../parisc/include/asm}/system.h | 0 + .../parisc/include/asm}/termbits.h | 0 + .../parisc/include/asm}/termios.h | 0 + .../parisc/include/asm}/thread_info.h | 0 + .../asm-parisc => arch/parisc/include/asm}/timex.h | 0 + .../asm-parisc => arch/parisc/include/asm}/tlb.h | 0 + .../parisc/include/asm}/tlbflush.h | 0 + .../parisc/include/asm}/topology.h | 0 + .../asm-parisc => arch/parisc/include/asm}/traps.h | 0 + .../asm-parisc => arch/parisc/include/asm}/types.h | 0 + .../parisc/include/asm}/uaccess.h | 0 + .../parisc/include/asm}/ucontext.h | 0 + .../parisc/include/asm}/unaligned.h | 0 + .../parisc/include/asm}/unistd.h | 0 + .../parisc/include/asm}/unwind.h | 0 + .../asm-parisc => arch/parisc/include/asm}/user.h | 0 + .../asm-parisc => arch/parisc/include/asm}/vga.h | 0 + .../asm-parisc => arch/parisc/include/asm}/xor.h | 0 + arch/parisc/kernel/.gitignore | 1 + + arch/parisc/kernel/asm-offsets.c | 3 + + arch/parisc/kernel/firmware.c | 69 +++++++++++++------- + arch/parisc/kernel/head.S | 2 +- + arch/parisc/kernel/real2.S | 12 ++++ + arch/parisc/kernel/setup.c | 27 +++++++- + drivers/char/agp/parisc-agp.c | 4 +- + drivers/parisc/ccio-dma.c | 43 +++++------- + 131 files changed, 114 insertions(+), 54 deletions(-) + rename {include/asm-parisc => arch/parisc/include/asm}/Kbuild (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/a.out.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/agp.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/asmregs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/assembly.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/atomic.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/auxvec.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bitops.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bug.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/bugs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/byteorder.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cache.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cacheflush.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/checksum.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_rt_sigframe.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_signal.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/compat_ucontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/cputime.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/current.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/delay.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/device.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/div64.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/dma-mapping.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/dma.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/eisa_bus.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/eisa_eeprom.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/elf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/emergency-restart.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/errno.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fb.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fcntl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/fixmap.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/floppy.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/futex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/grfioctl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hardirq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hardware.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/hw_irq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ide.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/io.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ioctl.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ioctls.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ipcbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/irq.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/irq_regs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/kdebug.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/kmap_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/led.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/linkage.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/local.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/machdep.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mc146818rtc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mckinley.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mman.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmu.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmu_context.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mmzone.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/module.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/msgbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/mutex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/page.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/param.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/parisc-device.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/parport.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pci.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdc.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdc_chassis.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pdcpat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/percpu.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/perf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pgalloc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/pgtable.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/poll.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/posix_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/prefetch.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/processor.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/psw.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ptrace.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/real.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/resource.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ropes.h (99%) + rename {include/asm-parisc => arch/parisc/include/asm}/rt_sigframe.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/rtc.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/runway.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/scatterlist.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sections.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/segment.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sembuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/serial.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/setup.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/shmbuf.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/shmparam.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sigcontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/siginfo.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/signal.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/smp.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/socket.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/sockios.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/spinlock.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/spinlock_types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/stat.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/statfs.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/string.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/superio.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/system.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/termbits.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/termios.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/thread_info.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/timex.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/tlb.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/tlbflush.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/topology.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/traps.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/types.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/uaccess.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/ucontext.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/unaligned.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/unistd.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/unwind.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/user.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/vga.h (100%) + rename {include/asm-parisc => arch/parisc/include/asm}/xor.h (100%) + create mode 100644 arch/parisc/kernel/.gitignore +Merging powerpc/powerpc-next +$ git merge powerpc/powerpc-next +Merge made by recursive. + arch/powerpc/Kconfig.debug | 5 + + arch/powerpc/boot/dtc-src/Makefile.dtc | 18 +- + arch/powerpc/boot/dtc-src/checks.c | 305 +++---------- + arch/powerpc/boot/dtc-src/data.c | 62 ++-- + arch/powerpc/boot/dtc-src/dtc-lexer.l | 120 +++--- + arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped | 445 ++++++++++---------- + arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped | 387 ++++++++++-------- + arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped | 12 +- + arch/powerpc/boot/dtc-src/dtc-parser.y | 67 +++- + arch/powerpc/boot/dtc-src/dtc.c | 41 +- + arch/powerpc/boot/dtc-src/dtc.h | 43 +-- + arch/powerpc/boot/dtc-src/flattree.c | 232 ++++------- + arch/powerpc/boot/dtc-src/fstree.c | 8 +- + arch/powerpc/boot/dtc-src/libfdt_env.h | 23 + + arch/powerpc/boot/dtc-src/livetree.c | 9 +- + arch/powerpc/boot/dtc-src/srcpos.c | 121 +++--- + arch/powerpc/boot/dtc-src/srcpos.h | 30 +- + arch/powerpc/boot/dtc-src/treesource.c | 15 +- + arch/powerpc/boot/dtc-src/version_gen.h | 2 +- + arch/powerpc/boot/libfdt/Makefile.libfdt | 8 +- + arch/powerpc/boot/libfdt/fdt.c | 61 +++- + arch/powerpc/boot/libfdt/fdt_ro.c | 329 +++++---------- + arch/powerpc/boot/libfdt/fdt_rw.c | 200 +++++---- + arch/powerpc/boot/libfdt/fdt_strerror.c | 34 +- + arch/powerpc/boot/libfdt/fdt_sw.c | 55 ++-- + arch/powerpc/boot/libfdt/fdt_wip.c | 9 +- + arch/powerpc/boot/libfdt/libfdt.h | 383 ++++++++++++++++- + arch/powerpc/boot/libfdt/libfdt_internal.h | 24 +- + arch/powerpc/boot/libfdt_env.h | 1 + + arch/powerpc/include/asm/cputable.h | 1 + + arch/powerpc/include/asm/mpic.h | 4 +- + arch/powerpc/include/asm/msi_bitmap.h | 35 ++ + arch/powerpc/include/asm/of_device.h | 3 - + arch/powerpc/include/asm/of_platform.h | 3 - + arch/powerpc/include/asm/smp.h | 39 ++- + arch/powerpc/kernel/Makefile | 4 +- + arch/powerpc/kernel/btext.c | 34 +- + arch/powerpc/kernel/cputable.c | 24 + + arch/powerpc/kernel/entry_64.S | 53 ++- + arch/powerpc/kernel/lparcfg.c | 8 +- + arch/powerpc/kernel/setup_32.c | 11 - + arch/powerpc/kernel/sysfs.c | 117 ++++-- + arch/powerpc/mm/hash_utils_64.c | 2 + + arch/powerpc/oprofile/op_model_power4.c | 4 +- + arch/powerpc/platforms/chrp/time.c | 24 +- + arch/powerpc/platforms/iseries/mf.c | 26 +- + arch/powerpc/platforms/maple/time.c | 24 +- + arch/powerpc/platforms/powermac/time.c | 3 + + arch/powerpc/platforms/pseries/cmm.c | 4 +- + arch/powerpc/platforms/pseries/eeh_driver.c | 2 +- + arch/powerpc/sysdev/Kconfig | 6 + + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/fsl_msi.c | 109 +---- + arch/powerpc/sysdev/fsl_msi.h | 8 +- + arch/powerpc/sysdev/mpic.h | 2 - + arch/powerpc/sysdev/mpic_msi.c | 123 +----- + arch/powerpc/sysdev/mpic_pasemi_msi.c | 24 +- + arch/powerpc/sysdev/mpic_u3msi.c | 22 +- + arch/powerpc/sysdev/msi_bitmap.c | 247 +++++++++++ + drivers/hwmon/ams/ams.h | 2 +- + drivers/pci/hotplug/rpaphp_slot.c | 4 - + sound/aoa/soundbus/soundbus.h | 2 +- + 62 files changed, 2216 insertions(+), 1808 deletions(-) + create mode 100644 arch/powerpc/boot/dtc-src/libfdt_env.h + create mode 100644 arch/powerpc/include/asm/msi_bitmap.h + create mode 100644 arch/powerpc/sysdev/msi_bitmap.c +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Merge made by recursive. + arch/powerpc/boot/dts/mgcoge.dts | 174 +++++ + arch/powerpc/boot/dts/mgsuvd.dts | 163 ++++ + arch/powerpc/boot/dts/mpc836x_mds.dts | 23 +- + arch/powerpc/configs/83xx/mpc836x_mds_defconfig | 79 ++- + arch/powerpc/configs/mgcoge_defconfig | 900 +++++++++++++++++++++++ + arch/powerpc/configs/mgsuvd_defconfig | 872 ++++++++++++++++++++++ + arch/powerpc/mm/fsl_booke_mmu.c | 5 +- + arch/powerpc/platforms/82xx/Kconfig | 8 + + arch/powerpc/platforms/82xx/Makefile | 1 + + arch/powerpc/platforms/82xx/mgcoge.c | 129 ++++ + arch/powerpc/platforms/8xx/Kconfig | 6 + + arch/powerpc/platforms/8xx/Makefile | 1 + + arch/powerpc/platforms/8xx/mgsuvd.c | 92 +++ + drivers/serial/Kconfig | 36 - + 14 files changed, 2447 insertions(+), 42 deletions(-) + create mode 100644 arch/powerpc/boot/dts/mgcoge.dts + create mode 100644 arch/powerpc/boot/dts/mgsuvd.dts + create mode 100644 arch/powerpc/configs/mgcoge_defconfig + create mode 100644 arch/powerpc/configs/mgsuvd_defconfig + create mode 100644 arch/powerpc/platforms/82xx/mgcoge.c + create mode 100644 arch/powerpc/platforms/8xx/mgsuvd.c +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/qdio.h | 8 +++- + drivers/s390/cio/blacklist.c | 11 +++-- + drivers/s390/cio/device.c | 96 +++++++++++++++++++++++++++------------- + drivers/s390/cio/device.h | 1 + + drivers/s390/cio/device_fsm.c | 7 +++ + drivers/s390/cio/qdio.h | 3 + + drivers/s390/cio/qdio_main.c | 24 ++++++++-- + 7 files changed, 109 insertions(+), 41 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/include/asm/bitops-llsc.h | 144 ++++++++++++++++++++++++++++++++++++ + arch/sh/include/asm/bitops.h | 2 + + arch/sh/include/asm/cmpxchg-llsc.h | 71 ++++++++++++++++++ + arch/sh/include/asm/system.h | 2 + + 4 files changed, 219 insertions(+), 0 deletions(-) + create mode 100644 arch/sh/include/asm/bitops-llsc.h + create mode 100644 arch/sh/include/asm/cmpxchg-llsc.h +Merging sparc/master +$ git merge sparc/master +Merge made by recursive. + arch/sparc64/mm/init.c | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 40 insertions(+), 0 deletions(-) +Merging xtensa/master +$ git merge xtensa/master +Merge made by recursive. + arch/xtensa/kernel/irq.c | 2 +- + arch/xtensa/kernel/setup.c | 5 ----- + arch/xtensa/platforms/iss/network.c | 2 +- + include/asm-xtensa/rwsem.h | 4 ++++ + 4 files changed, 6 insertions(+), 7 deletions(-) +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merged Documentation/kernel-parameters.txt +Merge made by recursive. + Documentation/kernel-parameters.txt | 5 + + Documentation/kobject.txt | 4 + + arch/mips/kernel/rtlx.c | 4 +- + arch/mips/sibyte/common/sb_tbprof.c | 3 +- + arch/x86/kernel/cpuid.c | 4 +- + arch/x86/kernel/msr.c | 4 +- + arch/x86/kernel/traps_32.c | 1 + + arch/x86/kernel/traps_64.c | 1 + + block/bsg.c | 3 +- + drivers/base/core.c | 5 + + drivers/base/platform.c | 2 +- + drivers/block/aoe/aoechr.c | 6 +- + drivers/block/paride/pg.c | 5 +- + drivers/block/paride/pt.c | 10 +- + drivers/block/pktcdvd.c | 5 +- + drivers/char/bsr.c | 5 +- + drivers/char/dsp56k.c | 4 +- + drivers/char/ip2/ip2main.c | 12 +- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/istallion.c | 5 +- + drivers/char/lp.c | 4 +- + drivers/char/mem.c | 6 +- + drivers/char/misc.c | 4 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 3 +- + drivers/char/ppdev.c | 5 +- + drivers/char/raw.c | 7 +- + drivers/char/snsc.c | 4 +- + drivers/char/stallion.c | 4 +- + drivers/char/tty_io.c | 12 +- + drivers/char/vc_screen.c | 12 +- + drivers/char/viotape.c | 8 +- + drivers/char/vt.c | 14 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 3 +- + drivers/dca/dca-sysfs.c | 8 +- + drivers/firmware/iscsi_ibft.c | 18 +- + drivers/hid/hidraw.c | 5 +- + drivers/hwmon/hwmon.c | 4 +- + drivers/i2c/i2c-dev.c | 6 +- + drivers/ide/ide-probe.c | 4 +- + drivers/ide/ide-tape.c | 11 +- + drivers/ieee1394/dv1394.c | 8 +- + drivers/ieee1394/raw1394.c | 8 +- + drivers/ieee1394/video1394.c | 5 +- + drivers/infiniband/core/cm.c | 6 +- + drivers/infiniband/core/user_mad.c | 12 +- + drivers/infiniband/core/uverbs_main.c | 9 +- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- + drivers/isdn/capi/capi.c | 3 +- + drivers/leds/led-class.c | 4 +- + drivers/macintosh/adb.c | 3 +- + drivers/media/dvb/dvb-core/dvbdev.c | 2 +- + drivers/misc/phantom.c | 6 +- + drivers/mtd/mtdchar.c | 10 +- + drivers/net/phy/phy_device.c | 8 +- + drivers/net/ppp_generic.c | 4 +- + drivers/net/wan/cosa.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 6 +- + drivers/power/power_supply_core.c | 4 +- + drivers/s390/char/raw3270.c | 14 +- + drivers/s390/char/tape_class.c | 6 +- + drivers/s390/char/vmlogrdr.c | 8 +- + drivers/s390/char/vmur.c | 5 +- + drivers/scsi/ch.c | 6 +- + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/osst.c | 3 +- + drivers/scsi/sg.c | 10 +- + drivers/scsi/st.c | 11 +- + drivers/spi/spidev.c | 7 +- + drivers/uio/uio.c | 6 +- + drivers/usb/core/devio.c | 6 +- + drivers/usb/core/file.c | 6 +- + drivers/usb/core/hcd.c | 5 +- + drivers/usb/gadget/Makefile | 23 +- + drivers/usb/gadget/cdc2.c | 25 ++- + drivers/usb/gadget/ether.c | 28 ++- + drivers/usb/gadget/f_ecm.c | 108 ++++---- + drivers/usb/gadget/f_loopback.c | 34 ++- + drivers/usb/gadget/f_subset.c | 44 ++-- + drivers/usb/gadget/file_storage.c | 12 + + drivers/usb/gadget/gmidi.c | 15 + + drivers/usb/gadget/printer.c | 18 +- + drivers/usb/gadget/rndis.c | 115 ++++---- + drivers/usb/gadget/serial.c | 18 ++ + drivers/usb/gadget/u_ether.c | 4 +- + drivers/usb/gadget/zero.c | 17 + + drivers/usb/misc/phidgetkit.c | 5 +- + drivers/usb/misc/phidgetmotorcontrol.c | 5 +- + drivers/usb/misc/phidgetservo.c | 5 +- + drivers/usb/mon/mon_bin.c | 6 +- + drivers/video/console/fbcon.c | 4 +- + drivers/video/display/display-sysfs.c | 9 +- + drivers/video/fbmem.c | 5 +- + fs/coda/psdev.c | 5 +- + fs/sysfs/dir.c | 245 +++++++++++---- + fs/sysfs/file.c | 88 ++++-- + fs/sysfs/inode.c | 23 +- + fs/sysfs/mount.c | 94 ++++++- + fs/sysfs/sysfs.h | 20 +- + include/asm-generic/vmlinux.lds.h | 10 +- + include/linux/device.h | 7 +- + include/linux/dynamic_printk.h | 93 ++++++ + include/linux/init.h | 1 + + include/linux/kernel.h | 7 +- + include/linux/module.h | 4 + + include/linux/sysfs.h | 31 ++- + init/main.c | 9 + + kernel/module.c | 37 +++ + lib/Kconfig.debug | 55 ++++ + lib/Makefile | 2 + + lib/dynamic_printk.c | 418 ++++++++++++++++++++++++++ + lib/kobject.c | 85 +++++- + net/netfilter/nf_conntrack_pptp.c | 2 +- + scripts/Makefile.lib | 11 +- + scripts/basic/Makefile | 2 +- + scripts/basic/hash.c | 64 ++++ + sound/core/init.c | 6 +- + sound/core/sound.c | 5 +- + sound/oss/soundcard.c | 15 +- + sound/sound_core.c | 5 +- + 120 files changed, 1691 insertions(+), 586 deletions(-) + create mode 100644 include/linux/dynamic_printk.h + create mode 100644 lib/dynamic_printk.c + create mode 100644 scripts/basic/hash.c +Merging quilt/usb +$ git merge quilt/usb +Auto-merged drivers/usb/serial/garmin_gps.c +CONFLICT (content): Merge conflict in drivers/usb/serial/garmin_gps.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/serial/garmin_gps.c'. +Created commit 00970a0: Merge branch 'quilt/usb' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-usb-devices-usbsevseg | 43 ++ + Documentation/DocBook/gadget.tmpl | 3 + + Documentation/usb/misc_usbsevseg.txt | 46 ++ + drivers/block/ub.c | 3 - + drivers/hid/usbhid/hid-core.c | 20 +- + drivers/hid/usbhid/hid-tmff.c | 19 +- + drivers/hid/usbhid/usbkbd.c | 12 +- + drivers/hid/usbhid/usbmouse.c | 3 +- + drivers/input/joystick/iforce/iforce-ff.c | 36 +- + drivers/input/joystick/iforce/iforce-main.c | 14 +- + drivers/input/joystick/iforce/iforce-packets.c | 8 +- + drivers/input/joystick/iforce/iforce-usb.c | 2 +- + drivers/input/joystick/xpad.c | 2 +- + drivers/input/misc/ati_remote.c | 20 +- + drivers/input/misc/yealink.c | 3 +- + drivers/input/tablet/acecad.c | 3 +- + drivers/input/tablet/aiptek.c | 26 +- + drivers/input/tablet/gtco.c | 4 +- + drivers/input/tablet/kbtab.c | 3 +- + drivers/input/tablet/wacom_sys.c | 3 +- + drivers/media/dvb/cinergyT2/cinergyT2.c | 3 +- + drivers/media/radio/dsbr100.c | 16 +- + drivers/media/video/dabusb.c | 7 +- + drivers/media/video/ov511.c | 124 +++--- + drivers/media/video/ov511.h | 3 +- + drivers/media/video/pvrusb2/pvrusb2-main.c | 8 +- + drivers/media/video/se401.c | 37 +- + drivers/media/video/stv680.c | 6 +- + drivers/media/video/usbvideo/ibmcam.c | 78 ++-- + drivers/media/video/usbvideo/konicawc.c | 25 +- + drivers/media/video/usbvideo/quickcam_messenger.c | 17 +- + drivers/media/video/usbvideo/ultracam.c | 29 +- + drivers/media/video/usbvideo/usbvideo.c | 163 +++++--- + drivers/media/video/usbvision/usbvision-core.c | 3 +- + drivers/media/video/usbvision/usbvision-i2c.c | 3 +- + drivers/media/video/usbvision/usbvision-video.c | 3 +- + drivers/media/video/zr364xx.c | 50 ++- + drivers/mtd/nand/alauda.c | 4 +- + drivers/net/irda/kingsun-sir.c | 3 +- + drivers/net/irda/ks959-sir.c | 3 +- + drivers/net/irda/ksdazzle-sir.c | 3 +- + drivers/net/irda/stir4200.c | 18 +- + drivers/net/usb/catc.c | 8 +- + drivers/net/usb/hso.c | 29 +- + drivers/net/usb/kaweth.c | 27 +- + drivers/net/usb/rtl8150.c | 31 +- + drivers/usb/atm/usbatm.c | 10 +- + drivers/usb/atm/usbatm.h | 10 +- + drivers/usb/atm/xusbatm.c | 2 +- + drivers/usb/class/cdc-acm.c | 3 +- + drivers/usb/class/usblp.c | 18 +- + drivers/usb/core/devio.c | 3 +- + drivers/usb/core/inode.c | 6 +- + drivers/usb/core/message.c | 3 +- + drivers/usb/core/urb.c | 95 ++++- + drivers/usb/gadget/Kconfig | 273 ++++++----- + drivers/usb/gadget/composite.c | 64 +++ + drivers/usb/gadget/dummy_hcd.c | 33 ++- + drivers/usb/gadget/f_obex.c | 493 ++++++++++++++++++++ + drivers/usb/gadget/file_storage.c | 10 +- + drivers/usb/gadget/fsl_usb2_udc.c | 176 +++---- + drivers/usb/gadget/fsl_usb2_udc.h | 21 +- + drivers/usb/gadget/net2280.c | 40 ++- + drivers/usb/gadget/net2280.h | 1 + + drivers/usb/gadget/serial.c | 14 + + drivers/usb/gadget/u_serial.h | 1 + + drivers/usb/host/isp116x-hcd.c | 13 +- + drivers/usb/host/r8a66597-hcd.c | 54 ++- + drivers/usb/host/sl811-hcd.c | 15 +- + drivers/usb/image/mdc800.c | 15 +- + drivers/usb/misc/Kconfig | 19 + + drivers/usb/misc/Makefile | 2 + + drivers/usb/misc/adutux.c | 5 +- + drivers/usb/misc/cytherm.c | 3 +- + drivers/usb/misc/emi26.c | 4 +- + drivers/usb/misc/emi62.c | 4 +- + drivers/usb/misc/gotemp.c | 301 ++++++++++++ + drivers/usb/misc/idmouse.c | 5 +- + drivers/usb/misc/legousbtower.c | 23 +- + drivers/usb/misc/rio500.c | 11 +- + drivers/usb/misc/trancevibrator.c | 3 +- + drivers/usb/misc/usblcd.c | 13 +- + drivers/usb/misc/usbsevseg.c | 394 ++++++++++++++++ + drivers/usb/misc/uss720.c | 19 +- + drivers/usb/serial/aircable.c | 11 +- + drivers/usb/serial/belkin_sa.c | 39 +- + drivers/usb/serial/cp2101.c | 3 +- + drivers/usb/serial/cyberjack.c | 28 +- + drivers/usb/serial/cypress_m8.c | 21 +- + drivers/usb/serial/digi_acceleport.c | 68 ++- + drivers/usb/serial/empeg.c | 11 +- + drivers/usb/serial/ezusb.c | 3 +- + drivers/usb/serial/ftdi_sio.c | 90 +++-- + drivers/usb/serial/garmin_gps.c | 3 +- + drivers/usb/serial/hp4x.c | 3 +- + drivers/usb/serial/io_edgeport.c | 19 +- + drivers/usb/serial/io_ti.c | 3 +- + drivers/usb/serial/ipaq.c | 30 +- + drivers/usb/serial/ipw.c | 3 +- + drivers/usb/serial/ir-usb.c | 3 +- + drivers/usb/serial/iuu_phoenix.c | 3 +- + drivers/usb/serial/keyspan.c | 3 +- + drivers/usb/serial/keyspan_pda.c | 22 +- + drivers/usb/serial/kl5kusb105.c | 69 ++-- + drivers/usb/serial/kobil_sct.c | 4 +- + drivers/usb/serial/mct_u232.c | 42 +- + drivers/usb/serial/mos7720.c | 22 +- + drivers/usb/serial/mos7840.c | 29 +- + drivers/usb/serial/omninet.c | 22 +- + drivers/usb/serial/option.c | 3 +- + drivers/usb/serial/pl2303.c | 2 +- + drivers/usb/serial/safe_serial.c | 28 +- + drivers/usb/serial/sierra.c | 3 +- + drivers/usb/serial/spcp8x5.c | 10 +- + drivers/usb/serial/ti_usb_3410_5052.c | 3 +- + drivers/usb/serial/usb-serial.c | 26 +- + drivers/usb/serial/visor.c | 17 +- + drivers/usb/serial/whiteheat.c | 121 +++-- + include/linux/usb.h | 8 +- + include/linux/usb/cdc.h | 9 + + include/linux/usb/composite.h | 11 +- + 121 files changed, 2927 insertions(+), 1021 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-usb-devices-usbsevseg + create mode 100644 Documentation/usb/misc_usbsevseg.txt + create mode 100644 drivers/usb/gadget/f_obex.c + create mode 100644 drivers/usb/misc/gotemp.c + create mode 100644 drivers/usb/misc/usbsevseg.c +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/kernel.h +Auto-merged kernel/module.c +Auto-merged kernel/time/tick-sched.c +Auto-merged lib/Kconfig.debug +Merge made by recursive. + arch/x86/boot/boot.h | 3 - + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/vmlinux_32.lds.S | 1 + + include/asm-generic/percpu.h | 11 ++++- + include/asm-generic/sections.h | 10 ++++ + include/asm-generic/vmlinux.lds.h | 17 ++++++++ + include/asm-x86/percpu.h | 83 ++++++++++++++++++++++++++++++++++-- + include/linux/compiler.h | 30 +++++++++++++ + include/linux/kernel.h | 17 ++------ + include/linux/percpu.h | 24 ++++++++++- + kernel/lockdep.c | 4 +- + kernel/module.c | 7 ++- + kernel/notifier.c | 16 +++++++ + kernel/printk.c | 22 ++++++++-- + kernel/softlockup.c | 2 +- + kernel/time/tick-sched.c | 2 +- + kernel/timer.c | 1 + + lib/Kconfig.debug | 10 ++++ + lib/cmdline.c | 2 +- + mm/filemap.c | 15 ++++--- + 20 files changed, 235 insertions(+), 44 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Already up-to-date. +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Auto-merged arch/x86/kernel/paravirt.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/compiler.h +Auto-merged include/linux/init.h +Auto-merged include/linux/kernel.h +Auto-merged include/linux/module.h +Auto-merged init/main.c +Auto-merged kernel/module.c +CONFLICT (content): Merge conflict in kernel/module.c +Auto-merged kernel/notifier.c +Resolved 'kernel/module.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b900cae: Merge commit 'ftrace/auto-ftrace-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/tracepoints.txt | 101 ++++ + arch/alpha/include/asm/thread_info.h | 2 +- + arch/avr32/include/asm/thread_info.h | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/asm-offsets_32.c | 1 + + arch/x86/kernel/asm-offsets_64.c | 1 + + arch/x86/kernel/cpu/perfctr-watchdog.c | 11 +- + arch/x86/kernel/entry_32.S | 44 +- + arch/x86/kernel/entry_64.S | 60 +- + arch/x86/kernel/ftrace.c | 120 +++-- + arch/x86/kernel/paravirt.c | 3 + + arch/x86/kernel/paravirt_patch_32.c | 6 +- + arch/x86/kernel/paravirt_patch_64.c | 6 +- + arch/x86/kernel/traps_32.c | 3 + + arch/x86/kernel/traps_64.c | 4 + + arch/x86/kernel/vmi_32.c | 2 + + arch/x86/lguest/boot.c | 1 + + arch/x86/mm/fault.c | 4 +- + arch/x86/mm/pf_in.c | 121 +++-- + arch/x86/xen/enlighten.c | 1 + + include/asm-generic/vmlinux.lds.h | 14 +- + include/asm-x86/ftrace.h | 10 + + include/asm-x86/irqflags.h | 56 ++ + include/asm-x86/paravirt.h | 5 + + include/linux/compiler.h | 2 + + include/linux/ftrace.h | 50 ++- + include/linux/hardirq.h | 27 +- + include/linux/init.h | 2 +- + include/linux/kernel.h | 5 + + include/linux/kprobes.h | 5 +- + include/linux/linkage.h | 2 - + include/linux/module.h | 17 + + include/linux/rcupdate.h | 20 + + include/linux/stringify.h | 5 + + include/linux/tracepoint.h | 127 ++++ + include/trace/sched.h | 56 ++ + init/Kconfig | 7 + + init/main.c | 3 + + kernel/Makefile | 1 + + kernel/exit.c | 10 +- + kernel/fork.c | 3 + + kernel/kthread.c | 5 + + kernel/module.c | 81 +++- + kernel/notifier.c | 2 +- + kernel/sched.c | 17 +- + kernel/sched_clock.c | 8 + + kernel/signal.c | 3 + + kernel/trace/Kconfig | 9 + + kernel/trace/ftrace.c | 244 ++++++-- + kernel/trace/trace.c | 737 ++++++++++++++++++------ + kernel/trace/trace.h | 28 +- + kernel/trace/trace_mmiotrace.c | 12 +- + kernel/trace/trace_sched_switch.c | 120 +--- + kernel/trace/trace_sched_wakeup.c | 135 ++---- + kernel/trace/trace_selftest.c | 11 +- + kernel/tracepoint.c | 476 +++++++++++++++ + samples/Kconfig | 6 + + samples/Makefile | 2 +- + samples/tracepoints/Makefile | 6 + + samples/tracepoints/tp-samples-trace.h | 13 + + samples/tracepoints/tracepoint-probe-sample.c | 55 ++ + samples/tracepoints/tracepoint-probe-sample2.c | 42 ++ + samples/tracepoints/tracepoint-sample.c | 53 ++ + scripts/Makefile.build | 6 + + scripts/recordmcount.pl | 360 ++++++++++++ + 65 files changed, 2744 insertions(+), 608 deletions(-) + create mode 100644 Documentation/tracepoints.txt + create mode 100644 include/linux/tracepoint.h + create mode 100644 include/trace/sched.h + create mode 100644 kernel/tracepoint.c + create mode 100644 samples/tracepoints/Makefile + create mode 100644 samples/tracepoints/tp-samples-trace.h + create mode 100644 samples/tracepoints/tracepoint-probe-sample.c + create mode 100644 samples/tracepoints/tracepoint-probe-sample2.c + create mode 100644 samples/tracepoints/tracepoint-sample.c + create mode 100755 scripts/recordmcount.pl +$ git revert c2ffd56692cc4b762c175fad69b70a4ec0dfca3f +Auto-merged arch/x86/Kconfig +Finished one revert. +Created commit 50cdb08: Revert "ftrace: enable using mcount recording on x86" + 1 files changed, 0 insertions(+), 1 deletions(-) +Applying ftrace: fix locking when CONFIG_FTRACE_MCOUNT_RECORD is not set +Merging genirq/auto-genirq-next +Merge made by recursive. + include/linux/irq.h | 4 - + kernel/irq/handle.c | 2 - + kernel/irq/manage.c | 17 +++-- + kernel/irq/spurious.c | 146 ++++++++++++++++++++++++++++++------------------ + 4 files changed, 101 insertions(+), 68 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 16 ++++++++++++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merged include/linux/compiler.h +Auto-merged kernel/sched.c +Auto-merged lib/Kconfig.debug +Merge made by recursive. + Documentation/RCU/checklist.txt | 2 +- + Documentation/RCU/whatisRCU.txt | 2 - + Documentation/scheduler/sched-design-CFS.txt | 371 +++++++++++++++----------- + include/linux/compiler.h | 4 +- + include/linux/proportions.h | 2 +- + include/linux/rcuclassic.h | 31 ++- + include/linux/rculist.h | 14 - + include/linux/rcupreempt.h | 11 +- + include/linux/sched.h | 4 +- + kernel/cpuset.c | 312 +++++++++++++--------- + kernel/rcuclassic.c | 331 +++++++++++++++++------ + kernel/rcupreempt.c | 8 - + kernel/rcupreempt_trace.c | 7 +- + kernel/sched.c | 227 +++++++++-------- + kernel/sched_rt.c | 16 +- + kernel/user.c | 4 +- + lib/Kconfig.debug | 13 + + 17 files changed, 832 insertions(+), 527 deletions(-) +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/sched.c +Resolved 'kernel/fork.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 4560a43: Merge commit 'stackprotector/auto-stackprotector-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/pda.h | 3 +-- + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/asm-x86/system.h | 6 +++++- + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 132 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged kernel/timer.c +Merge made by recursive. + Documentation/00-INDEX | 2 - + Documentation/timers/00-INDEX | 10 ++ + Documentation/{ => timers}/hpet.txt | 43 +++++----- + arch/x86/kernel/hpet.c | 6 +- + drivers/char/hpet.c | 155 ++++++++++++++++++++--------------- + drivers/clocksource/acpi_pm.c | 7 +- + include/linux/clocksource.h | 14 ++- + include/linux/hpet.h | 14 +--- + include/linux/time.h | 2 + + include/linux/timex.h | 9 ++- + kernel/hrtimer.c | 11 ++- + kernel/posix-timers.c | 15 ++++ + kernel/time/clocksource.c | 3 + + kernel/time/jiffies.c | 1 + + kernel/time/ntp.c | 76 +++++++++-------- + kernel/time/timekeeping.c | 113 +++++++++++++++++-------- + kernel/timer.c | 11 ++- + 17 files changed, 300 insertions(+), 192 deletions(-) + create mode 100644 Documentation/timers/00-INDEX + rename Documentation/{ => timers}/hpet.txt (81%) +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged Documentation/00-INDEX +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/asm-offsets_64.c +Auto-merged arch/x86/kernel/cpu/common.c +Auto-merged arch/x86/kernel/cpuid.c +Auto-merged arch/x86/kernel/entry_64.S +Auto-merged arch/x86/kernel/paravirt.c +Auto-merged arch/x86/kernel/paravirt_patch_32.c +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged arch/x86/kernel/vmi_32.c +Auto-merged arch/x86/lguest/boot.c +Auto-merged arch/x86/mm/fault.c +Auto-merged arch/x86/xen/enlighten.c +Auto-merged drivers/char/agp/parisc-agp.c +Auto-merged include/asm-x86/ftrace.h +Removed include/asm-x86/mach-es7000/mach_apicdef.h +Removed include/asm-x86/mach-summit/mach_apicdef.h +Auto-merged include/asm-x86/paravirt.h +Auto-merged include/asm-x86/pda.h +CONFLICT (content): Merge conflict in include/asm-x86/pda.h +Auto-merged include/asm-x86/percpu.h +Auto-merged include/asm-x86/system.h +Auto-merged include/asm-x86/xen/hypervisor.h +Auto-merged include/linux/irq.h +Auto-merged kernel/irq/manage.c +Resolved 'include/asm-x86/pda.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 2d50ae6: Merge commit 'x86/auto-x86-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/00-INDEX | 2 - + Documentation/kernel-parameters.txt | 15 +- + Documentation/x86/00-INDEX | 4 + + Documentation/x86/{i386 => }/boot.txt | 2 +- + Documentation/{ => x86}/mtrr.txt | 4 +- + Documentation/x86/pat.txt | 54 ++- + .../x86/{i386 => }/usb-legacy-support.txt | 0 + Documentation/x86/{i386 => }/zero-page.txt | 0 + MAINTAINERS | 5 + + arch/um/sys-x86_64/syscall_table.c | 4 +- + arch/x86/Kconfig | 120 +++- + arch/x86/Kconfig.cpu | 70 ++ + arch/x86/Kconfig.debug | 13 + + arch/x86/boot/compressed/head_32.S | 5 +- + arch/x86/boot/compressed/misc.c | 12 +- + arch/x86/boot/cpucheck.c | 8 +- + arch/x86/{mach-es7000 => es7000}/Makefile | 0 + arch/x86/{mach-es7000 => es7000}/es7000.h | 18 +- + arch/x86/{mach-es7000 => es7000}/es7000plat.c | 2 +- + arch/x86/ia32/ia32_aout.c | 11 +- + arch/x86/ia32/ia32_signal.c | 72 +- + arch/x86/kernel/Makefile | 10 +- + arch/x86/kernel/acpi/boot.c | 9 +- + arch/x86/kernel/alternative.c | 44 +- + arch/x86/kernel/amd_iommu.c | 2 - + arch/x86/kernel/apic_32.c | 437 +++++++----- + arch/x86/kernel/apic_64.c | 626 ++++++++++++++--- + arch/x86/kernel/apm_32.c | 1 - + arch/x86/kernel/asm-offsets_64.c | 2 +- + arch/x86/kernel/bios_uv.c | 10 +- + arch/x86/kernel/cpu/Makefile | 21 +- + arch/x86/kernel/cpu/cmpxchg.c | 72 ++ + arch/x86/kernel/cpu/common.c | 45 ++- + arch/x86/kernel/cpu/common_64.c | 127 +++- + arch/x86/kernel/cpu/cyrix.c | 16 +- + arch/x86/kernel/cpu/feature_names.c | 7 +- + arch/x86/kernel/cpu/intel.c | 71 -- + arch/x86/kernel/cpu/intel_cacheinfo.c | 169 ++++- + arch/x86/kernel/cpu/mtrr/main.c | 2 +- + arch/x86/kernel/cpuid.c | 1 - + arch/x86/kernel/crash_dump_64.c | 7 +- + arch/x86/kernel/e820.c | 4 + + arch/x86/kernel/early_printk.c | 762 +++++++++++++++++++- + arch/x86/kernel/entry_64.S | 4 +- + arch/x86/kernel/genapic_64.c | 88 +-- + arch/x86/kernel/genapic_flat_64.c | 62 ++- + arch/x86/kernel/genx2apic_cluster.c | 164 +++++ + arch/x86/kernel/genx2apic_phys.c | 159 ++++ + arch/x86/kernel/genx2apic_uv_x.c | 70 ++- + arch/x86/kernel/i387.c | 154 ++++- + arch/x86/kernel/i8259.c | 24 + + arch/x86/kernel/io_apic_32.c | 47 +- + arch/x86/kernel/io_apic_64.c | 639 +++++++++++++++-- + arch/x86/kernel/ioport.c | 1 + + arch/x86/kernel/ipi.c | 3 +- + arch/x86/kernel/irqinit_32.c | 49 ++ + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/ldt.c | 10 +- + arch/x86/kernel/microcode.c | 634 ++++------------- + arch/x86/kernel/microcode_amd.c | 467 ++++++++++++ + arch/x86/kernel/microcode_intel.c | 489 +++++++++++++ + arch/x86/kernel/mpparse.c | 2 + + arch/x86/kernel/numaq_32.c | 7 + + arch/x86/kernel/paravirt-spinlocks.c | 37 + + arch/x86/kernel/paravirt.c | 30 +- + arch/x86/kernel/paravirt_patch_32.c | 2 +- + arch/x86/kernel/pci-calgary_64.c | 14 + + arch/x86/kernel/pci-dma.c | 148 +---- + arch/x86/kernel/pci-gart_64.c | 76 ++- + arch/x86/kernel/pci-nommu.c | 62 ++ + arch/x86/kernel/process_32.c | 2 + + arch/x86/kernel/process_64.c | 132 ++-- + arch/x86/kernel/ptrace.c | 73 ++- + arch/x86/kernel/setup.c | 18 + + arch/x86/kernel/setup_percpu.c | 9 +- + arch/x86/kernel/sigframe.h | 19 +- + arch/x86/kernel/signal_32.c | 57 +- + arch/x86/kernel/signal_64.c | 201 ++---- + arch/x86/kernel/smpboot.c | 47 +- + arch/x86/kernel/summit_32.c | 2 +- + arch/x86/kernel/sys_i386_32.c | 2 + + arch/x86/kernel/sys_x86_64.c | 44 +- + arch/x86/kernel/syscall_64.c | 4 +- + arch/x86/kernel/time_32.c | 1 + + arch/x86/kernel/tls.c | 1 + + arch/x86/kernel/traps_32.c | 1 - + arch/x86/kernel/traps_64.c | 72 +- + arch/x86/kernel/visws_quirks.c | 16 +- + arch/x86/kernel/vm86_32.c | 1 + + arch/x86/kernel/vmi_32.c | 14 +- + arch/x86/kernel/xsave.c | 316 ++++++++ + arch/x86/lguest/boot.c | 38 +- + arch/x86/lib/string_32.c | 42 +- + arch/x86/lib/strstr_32.c | 6 +- + arch/x86/lib/usercopy_32.c | 7 + + arch/x86/mach-default/setup.c | 19 +- + arch/x86/mach-generic/Makefile | 2 +- + arch/x86/mach-generic/bigsmp.c | 9 +- + arch/x86/mach-generic/es7000.c | 13 +- + arch/x86/mach-generic/numaq.c | 12 +- + arch/x86/mach-generic/summit.c | 11 +- + arch/x86/mm/discontig_32.c | 2 +- + arch/x86/mm/dump_pagetables.c | 4 +- + arch/x86/mm/fault.c | 3 +- + arch/x86/mm/init_32.c | 1 + + arch/x86/mm/init_64.c | 8 +- + arch/x86/mm/ioremap.c | 4 +- + arch/x86/mm/numa_64.c | 10 +- + arch/x86/mm/pageattr-test.c | 7 +- + arch/x86/mm/pageattr.c | 247 +++++-- + arch/x86/mm/pat.c | 4 +- + arch/x86/mm/pgtable_32.c | 3 +- + arch/x86/oprofile/op_model_p4.c | 175 +++--- + arch/x86/pci/acpi.c | 5 - + arch/x86/pci/irq.c | 67 +- + arch/x86/power/hibernate_asm_32.S | 14 +- + arch/x86/xen/Kconfig | 10 +- + arch/x86/xen/Makefile | 12 +- + arch/x86/xen/debugfs.c | 123 ++++ + arch/x86/xen/debugfs.h | 10 + + arch/x86/xen/enlighten.c | 252 ++++---- + arch/x86/xen/irq.c | 143 ++++ + arch/x86/xen/mmu.c | 268 ++++++- + arch/x86/xen/multicalls.c | 115 +++- + arch/x86/xen/smp.c | 167 ----- + arch/x86/xen/spinlock.c | 423 +++++++++++ + arch/x86/xen/time.c | 4 +- + arch/x86/xen/xen-asm_32.S | 2 +- + arch/x86/xen/xen-asm_64.S | 2 +- + arch/x86/xen/xen-ops.h | 6 + + drivers/block/xen-blkfront.c | 2 +- + drivers/char/agp/agp.h | 5 + + drivers/char/agp/alpha-agp.c | 2 + + drivers/char/agp/amd-k7-agp.c | 2 + + drivers/char/agp/amd64-agp.c | 2 + + drivers/char/agp/ati-agp.c | 2 + + drivers/char/agp/efficeon-agp.c | 2 + + drivers/char/agp/generic.c | 97 +++- + drivers/char/agp/hp-agp.c | 2 + + drivers/char/agp/i460-agp.c | 2 + + drivers/char/agp/intel-agp.c | 28 + + drivers/char/agp/nvidia-agp.c | 2 + + drivers/char/agp/parisc-agp.c | 2 + + drivers/char/agp/sis-agp.c | 2 + + drivers/char/agp/sworks-agp.c | 2 + + drivers/char/agp/uninorth-agp.c | 4 + + drivers/char/agp/via-agp.c | 4 + + drivers/char/hvc_xen.c | 6 +- + drivers/input/xen-kbdfront.c | 4 +- + drivers/net/xen-netfront.c | 6 +- + drivers/pci/Makefile | 2 + + drivers/pci/dma_remapping.h | 157 ++++ + drivers/pci/dmar.c | 397 ++++++++++- + drivers/pci/intel-iommu.c | 164 +---- + drivers/pci/intel-iommu.h | 233 +++---- + drivers/pci/intr_remapping.c | 471 ++++++++++++ + drivers/pci/intr_remapping.h | 8 + + drivers/usb/host/ehci.h | 138 +---- + drivers/video/xen-fbfront.c | 4 +- + drivers/xen/balloon.c | 176 +---- + drivers/xen/events.c | 36 +- + drivers/xen/grant-table.c | 2 +- + drivers/xen/xenbus/xenbus_probe.c | 8 +- + include/asm-x86/a.out-core.h | 6 +- + include/asm-x86/a.out.h | 6 +- + include/asm-x86/acpi.h | 6 +- + include/asm-x86/agp.h | 6 +- + include/asm-x86/alternative.h | 6 +- + include/asm-x86/amd_iommu.h | 6 +- + include/asm-x86/amd_iommu_types.h | 6 +- + include/asm-x86/apic.h | 80 ++- + include/asm-x86/apicdef.h | 9 +- + include/asm-x86/arch_hooks.h | 8 +- + include/asm-x86/asm.h | 13 +- + include/asm-x86/atomic_32.h | 6 +- + include/asm-x86/atomic_64.h | 6 +- + include/asm-x86/auxvec.h | 6 +- + .../{mach-bigsmp/mach_apic.h => bigsmp/apic.h} | 4 +- + .../mach_apicdef.h => bigsmp/apicdef.h} | 6 +- + .../{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h} | 0 + include/asm-x86/bios_ebda.h | 6 +- + include/asm-x86/bitops.h | 6 +- + include/asm-x86/boot.h | 6 +- + include/asm-x86/bootparam.h | 6 +- + include/asm-x86/bug.h | 6 +- + include/asm-x86/bugs.h | 11 +- + include/asm-x86/byteorder.h | 6 +- + include/asm-x86/cache.h | 6 +- + include/asm-x86/cacheflush.h | 9 +- + include/asm-x86/calgary.h | 6 +- + include/asm-x86/checksum_32.h | 6 +- + include/asm-x86/checksum_64.h | 6 +- + include/asm-x86/cmpxchg_32.h | 6 +- + include/asm-x86/cmpxchg_64.h | 6 +- + include/asm-x86/compat.h | 6 +- + include/asm-x86/cpu.h | 6 +- + include/asm-x86/cpufeature.h | 21 +- + include/asm-x86/current.h | 6 +- + include/asm-x86/debugreg.h | 6 +- + include/asm-x86/delay.h | 6 +- + include/asm-x86/desc.h | 21 +- + include/asm-x86/desc_defs.h | 6 +- + include/asm-x86/device.h | 6 +- + include/asm-x86/div64.h | 6 +- + include/asm-x86/dma-mapping.h | 56 +- + include/asm-x86/dma.h | 6 +- + include/asm-x86/dmi.h | 6 +- + include/asm-x86/ds.h | 6 +- + include/asm-x86/dwarf2.h | 6 +- + include/asm-x86/e820.h | 8 +- + include/asm-x86/edac.h | 6 +- + include/asm-x86/efi.h | 6 +- + include/asm-x86/elf.h | 11 +- + include/asm-x86/emergency-restart.h | 6 +- + .../{mach-es7000/mach_apic.h => es7000/apic.h} | 32 +- + include/asm-x86/es7000/apicdef.h | 13 + + .../{mach-es7000/mach_ipi.h => es7000/ipi.h} | 6 +- + .../mach_mpparse.h => es7000/mpparse.h} | 4 +- + .../mach_wakecpu.h => es7000/wakecpu.h} | 6 +- + include/asm-x86/fb.h | 6 +- + include/asm-x86/fixmap.h | 6 +- + include/asm-x86/fixmap_32.h | 6 +- + include/asm-x86/fixmap_64.h | 6 +- + include/asm-x86/floppy.h | 6 +- + include/asm-x86/ftrace.h | 6 +- + include/asm-x86/futex.h | 12 +- + include/asm-x86/gart.h | 6 +- + include/asm-x86/genapic_32.h | 6 +- + include/asm-x86/genapic_64.h | 14 +- + include/asm-x86/geode.h | 6 +- + include/asm-x86/gpio.h | 2 +- + include/asm-x86/hardirq_32.h | 6 +- + include/asm-x86/hardirq_64.h | 6 +- + include/asm-x86/highmem.h | 6 +- + include/asm-x86/hpet.h | 6 +- + include/asm-x86/hugetlb.h | 6 +- + include/asm-x86/hw_irq.h | 29 +- + include/asm-x86/hypertransport.h | 6 +- + include/asm-x86/i387.h | 91 ++- + include/asm-x86/i8253.h | 6 +- + include/asm-x86/i8259.h | 9 +- + include/asm-x86/ia32.h | 6 +- + include/asm-x86/ia32_unistd.h | 6 +- + include/asm-x86/idle.h | 6 +- + include/asm-x86/intel_arch_perfmon.h | 6 +- + include/asm-x86/io.h | 8 +- + include/asm-x86/io_32.h | 6 +- + include/asm-x86/io_64.h | 7 +- + include/asm-x86/io_apic.h | 26 +- + include/asm-x86/ioctls.h | 6 +- + include/asm-x86/iommu.h | 6 +- + include/asm-x86/ipcbuf.h | 6 +- + include/asm-x86/ipi.h | 22 +- + include/asm-x86/irq.h | 6 +- + include/asm-x86/irq_regs_32.h | 6 +- + include/asm-x86/irq_remapping.h | 8 + + include/asm-x86/irq_vectors.h | 6 +- + include/asm-x86/ist.h | 6 +- + include/asm-x86/k8.h | 6 +- + include/asm-x86/kdebug.h | 6 +- + include/asm-x86/kexec.h | 6 +- + include/asm-x86/kgdb.h | 6 +- + include/asm-x86/kmap_types.h | 6 +- + include/asm-x86/kprobes.h | 6 +- + include/asm-x86/kvm.h | 6 +- + include/asm-x86/kvm_host.h | 8 +- + include/asm-x86/kvm_para.h | 6 +- + include/asm-x86/kvm_x86_emulate.h | 6 +- + include/asm-x86/ldt.h | 6 +- + include/asm-x86/lguest.h | 6 +- + include/asm-x86/lguest_hcall.h | 6 +- + include/asm-x86/linkage.h | 6 +- + include/asm-x86/local.h | 6 +- + include/asm-x86/mach-default/apm.h | 6 +- + include/asm-x86/mach-default/mach_apic.h | 10 +- + include/asm-x86/mach-default/mach_apicdef.h | 12 +- + include/asm-x86/mach-default/mach_ipi.h | 6 +- + include/asm-x86/mach-default/mach_mpparse.h | 6 +- + include/asm-x86/mach-default/mach_mpspec.h | 6 +- + include/asm-x86/mach-default/mach_timer.h | 6 +- + include/asm-x86/mach-default/mach_traps.h | 6 +- + include/asm-x86/mach-default/mach_wakecpu.h | 6 +- + include/asm-x86/mach-es7000/mach_apicdef.h | 13 - + include/asm-x86/mach-generic/gpio.h | 6 +- + include/asm-x86/mach-generic/irq_vectors_limits.h | 6 +- + include/asm-x86/mach-generic/mach_apic.h | 6 +- + include/asm-x86/mach-generic/mach_apicdef.h | 6 +- + include/asm-x86/mach-generic/mach_ipi.h | 6 +- + include/asm-x86/mach-generic/mach_mpparse.h | 6 +- + include/asm-x86/mach-generic/mach_mpspec.h | 6 +- + include/asm-x86/mach-rdc321x/gpio.h | 6 +- + include/asm-x86/mach-summit/mach_apicdef.h | 13 - + include/asm-x86/math_emu.h | 6 +- + include/asm-x86/mc146818rtc.h | 6 +- + include/asm-x86/mca.h | 6 +- + include/asm-x86/mca_dma.h | 6 +- + include/asm-x86/mce.h | 6 +- + include/asm-x86/microcode.h | 99 +++ + include/asm-x86/mman.h | 6 +- + include/asm-x86/mmconfig.h | 6 +- + include/asm-x86/mmu.h | 6 +- + include/asm-x86/mmu_context.h | 6 +- + include/asm-x86/mmu_context_32.h | 6 +- + include/asm-x86/mmu_context_64.h | 6 +- + include/asm-x86/mmx.h | 6 +- + include/asm-x86/mmzone_32.h | 6 +- + include/asm-x86/mmzone_64.h | 6 +- + include/asm-x86/module.h | 6 +- + include/asm-x86/mpspec.h | 9 +- + include/asm-x86/mpspec_def.h | 6 +- + include/asm-x86/msgbuf.h | 6 +- + include/asm-x86/msidef.h | 10 +- + include/asm-x86/msr-index.h | 6 +- + include/asm-x86/msr.h | 29 +- + include/asm-x86/mtrr.h | 6 +- + include/asm-x86/mutex_32.h | 6 +- + include/asm-x86/mutex_64.h | 6 +- + include/asm-x86/nmi.h | 6 +- + include/asm-x86/nops.h | 6 +- + include/asm-x86/numa_32.h | 6 +- + include/asm-x86/numa_64.h | 6 +- + include/asm-x86/numaq.h | 6 +- + .../{mach-numaq/mach_apic.h => numaq/apic.h} | 6 +- + .../{mach-numaq/mach_apicdef.h => numaq/apicdef.h} | 4 +- + .../asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} | 6 +- + .../{mach-numaq/mach_mpparse.h => numaq/mpparse.h} | 6 +- + .../{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} | 6 +- + include/asm-x86/olpc.h | 6 +- + include/asm-x86/page.h | 6 +- + include/asm-x86/page_32.h | 10 +- + include/asm-x86/page_64.h | 7 +- + include/asm-x86/param.h | 6 +- + include/asm-x86/paravirt.h | 87 ++- + include/asm-x86/parport.h | 6 +- + include/asm-x86/pat.h | 6 +- + include/asm-x86/pci-direct.h | 6 +- + include/asm-x86/pci.h | 6 +- + include/asm-x86/pci_32.h | 6 +- + include/asm-x86/pci_64.h | 6 +- + include/asm-x86/pda.h | 6 +- + include/asm-x86/percpu.h | 6 +- + include/asm-x86/pgalloc.h | 6 +- + include/asm-x86/pgtable-2level-defs.h | 6 +- + include/asm-x86/pgtable-2level.h | 6 +- + include/asm-x86/pgtable-3level-defs.h | 6 +- + include/asm-x86/pgtable-3level.h | 6 +- + include/asm-x86/pgtable.h | 8 +- + include/asm-x86/pgtable_32.h | 12 +- + include/asm-x86/pgtable_64.h | 6 +- + include/asm-x86/posix_types_32.h | 6 +- + include/asm-x86/posix_types_64.h | 6 +- + include/asm-x86/prctl.h | 6 +- + include/asm-x86/processor-cyrix.h | 8 + + include/asm-x86/processor-flags.h | 7 +- + include/asm-x86/processor.h | 65 +- + include/asm-x86/proto.h | 6 +- + include/asm-x86/ptrace-abi.h | 6 +- + include/asm-x86/ptrace.h | 14 +- + include/asm-x86/pvclock-abi.h | 6 +- + include/asm-x86/pvclock.h | 6 +- + include/asm-x86/reboot.h | 6 +- + include/asm-x86/reboot_fixups.h | 6 +- + include/asm-x86/required-features.h | 14 +- + include/asm-x86/resume-trace.h | 8 +- + include/asm-x86/rio.h | 6 +- + include/asm-x86/rwlock.h | 6 +- + include/asm-x86/rwsem.h | 6 +- + include/asm-x86/scatterlist.h | 6 +- + include/asm-x86/seccomp_32.h | 6 +- + include/asm-x86/seccomp_64.h | 6 +- + include/asm-x86/segment.h | 6 +- + include/asm-x86/sembuf.h | 6 +- + include/asm-x86/serial.h | 6 +- + include/asm-x86/setup.h | 8 +- + include/asm-x86/shmbuf.h | 6 +- + include/asm-x86/shmparam.h | 6 +- + include/asm-x86/sigcontext.h | 93 +++- + include/asm-x86/sigcontext32.h | 12 +- + include/asm-x86/siginfo.h | 6 +- + include/asm-x86/signal.h | 9 +- + include/asm-x86/smp.h | 27 +- + include/asm-x86/socket.h | 6 +- + include/asm-x86/sockios.h | 6 +- + include/asm-x86/sparsemem.h | 6 +- + include/asm-x86/spinlock.h | 21 +- + include/asm-x86/spinlock_types.h | 6 +- + include/asm-x86/srat.h | 6 +- + include/asm-x86/stacktrace.h | 6 +- + include/asm-x86/stat.h | 6 +- + include/asm-x86/statfs.h | 6 +- + include/asm-x86/string_32.h | 6 +- + include/asm-x86/string_64.h | 6 +- + .../{mach-summit/mach_apic.h => summit/apic.h} | 24 +- + include/asm-x86/summit/apicdef.h | 13 + + .../{mach-summit/mach_ipi.h => summit/ipi.h} | 6 +- + .../{mach-summit => summit}/irq_vectors_limits.h | 0 + .../mach_mpparse.h => summit/mpparse.h} | 13 +- + include/asm-x86/suspend_32.h | 6 +- + include/asm-x86/suspend_64.h | 6 +- + include/asm-x86/swiotlb.h | 6 +- + include/asm-x86/sync_bitops.h | 6 +- + include/asm-x86/syscall.h | 210 ++++++ + include/asm-x86/syscalls.h | 93 +++ + include/asm-x86/system.h | 6 +- + include/asm-x86/system_64.h | 6 +- + include/asm-x86/tce.h | 6 +- + include/asm-x86/termbits.h | 6 +- + include/asm-x86/termios.h | 6 +- + include/asm-x86/therm_throt.h | 6 +- + include/asm-x86/thread_info.h | 11 +- + include/asm-x86/time.h | 8 +- + include/asm-x86/timer.h | 11 +- + include/asm-x86/timex.h | 6 +- + include/asm-x86/tlb.h | 6 +- + include/asm-x86/tlbflush.h | 6 +- + include/asm-x86/topology.h | 6 +- + include/asm-x86/trampoline.h | 6 +- + include/asm-x86/traps.h | 10 +- + include/asm-x86/tsc.h | 6 +- + include/asm-x86/types.h | 6 +- + include/asm-x86/uaccess.h | 6 +- + include/asm-x86/uaccess_32.h | 6 +- + include/asm-x86/uaccess_64.h | 6 +- + include/asm-x86/ucontext.h | 12 +- + include/asm-x86/unaligned.h | 6 +- + include/asm-x86/unistd_32.h | 6 +- + include/asm-x86/unistd_64.h | 6 +- + include/asm-x86/unwind.h | 6 +- + include/asm-x86/user32.h | 6 +- + include/asm-x86/user_32.h | 6 +- + include/asm-x86/user_64.h | 6 +- + include/asm-x86/uv/bios.h | 6 +- + include/asm-x86/uv/uv_bau.h | 6 +- + include/asm-x86/uv/uv_hub.h | 6 +- + include/asm-x86/uv/uv_mmrs.h | 6 +- + include/asm-x86/vdso.h | 6 +- + include/asm-x86/vga.h | 6 +- + include/asm-x86/vgtod.h | 6 +- + include/asm-x86/visws/cobalt.h | 6 +- + include/asm-x86/visws/lithium.h | 6 +- + include/asm-x86/visws/piix4.h | 6 +- + include/asm-x86/vm86.h | 6 +- + include/asm-x86/vmi_time.h | 6 +- + include/asm-x86/vsyscall.h | 6 +- + include/asm-x86/xcr.h | 49 ++ + include/asm-x86/xen/events.h | 6 +- + include/asm-x86/xen/grant_table.h | 6 +- + include/asm-x86/xen/hypercall.h | 6 +- + include/asm-x86/xen/hypervisor.h | 20 +- + include/asm-x86/xen/interface.h | 6 +- + include/asm-x86/xen/interface_32.h | 6 +- + include/asm-x86/xen/interface_64.h | 6 +- + include/asm-x86/xen/page.h | 6 +- + include/asm-x86/xsave.h | 118 +++ + include/linux/dmar.h | 127 +++- + include/linux/elf.h | 1 + + include/linux/irq.h | 1 + + include/linux/usb/ehci_def.h | 160 ++++ + include/xen/events.h | 2 + + kernel/dma-coherent.c | 2 + + kernel/irq/manage.c | 9 +- + mm/highmem.c | 5 +- + 462 files changed, 10878 insertions(+), 4070 deletions(-) + create mode 100644 Documentation/x86/00-INDEX + rename Documentation/x86/{i386 => }/boot.txt (99%) + rename Documentation/{ => x86}/mtrr.txt (99%) + rename Documentation/x86/{i386 => }/usb-legacy-support.txt (100%) + rename Documentation/x86/{i386 => }/zero-page.txt (100%) + rename arch/x86/{mach-es7000 => es7000}/Makefile (100%) + rename arch/x86/{mach-es7000 => es7000}/es7000.h (89%) + rename arch/x86/{mach-es7000 => es7000}/es7000plat.c (99%) + create mode 100644 arch/x86/kernel/cpu/cmpxchg.c + create mode 100644 arch/x86/kernel/genx2apic_cluster.c + create mode 100644 arch/x86/kernel/genx2apic_phys.c + create mode 100644 arch/x86/kernel/microcode_amd.c + create mode 100644 arch/x86/kernel/microcode_intel.c + create mode 100644 arch/x86/kernel/paravirt-spinlocks.c + create mode 100644 arch/x86/kernel/xsave.c + create mode 100644 arch/x86/xen/debugfs.c + create mode 100644 arch/x86/xen/debugfs.h + create mode 100644 arch/x86/xen/irq.c + create mode 100644 arch/x86/xen/spinlock.c + create mode 100644 drivers/pci/dma_remapping.h + create mode 100644 drivers/pci/intr_remapping.c + create mode 100644 drivers/pci/intr_remapping.h + rename include/asm-x86/{mach-bigsmp/mach_apic.h => bigsmp/apic.h} (98%) + rename include/asm-x86/{mach-bigsmp/mach_apicdef.h => bigsmp/apicdef.h} (74%) + rename include/asm-x86/{mach-bigsmp/mach_ipi.h => bigsmp/ipi.h} (100%) + rename include/asm-x86/{mach-es7000/mach_apic.h => es7000/apic.h} (92%) + create mode 100644 include/asm-x86/es7000/apicdef.h + rename include/asm-x86/{mach-es7000/mach_ipi.h => es7000/ipi.h} (83%) + rename include/asm-x86/{mach-es7000/mach_mpparse.h => es7000/mpparse.h} (91%) + rename include/asm-x86/{mach-es7000/mach_wakecpu.h => es7000/wakecpu.h} (95%) + create mode 100644 include/asm-x86/irq_remapping.h + delete mode 100644 include/asm-x86/mach-es7000/mach_apicdef.h + delete mode 100644 include/asm-x86/mach-summit/mach_apicdef.h + create mode 100644 include/asm-x86/microcode.h + rename include/asm-x86/{mach-numaq/mach_apic.h => numaq/apic.h} (97%) + rename include/asm-x86/{mach-numaq/mach_apicdef.h => numaq/apicdef.h} (75%) + rename include/asm-x86/{mach-numaq/mach_ipi.h => numaq/ipi.h} (83%) + rename include/asm-x86/{mach-numaq/mach_mpparse.h => numaq/mpparse.h} (50%) + rename include/asm-x86/{mach-numaq/mach_wakecpu.h => numaq/wakecpu.h} (91%) + rename include/asm-x86/{mach-summit/mach_apic.h => summit/apic.h} (94%) + create mode 100644 include/asm-x86/summit/apicdef.h + rename include/asm-x86/{mach-summit/mach_ipi.h => summit/ipi.h} (83%) + rename include/asm-x86/{mach-summit => summit}/irq_vectors_limits.h (100%) + rename include/asm-x86/{mach-summit/mach_mpparse.h => summit/mpparse.h} (96%) + create mode 100644 include/asm-x86/syscall.h + create mode 100644 include/asm-x86/syscalls.h + create mode 100644 include/asm-x86/xcr.h + create mode 100644 include/asm-x86/xsave.h + create mode 100644 include/linux/usb/ehci_def.h +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + Documentation/PCI/pci.txt | 4 ++++ + drivers/i2c/busses/i2c-amd756.c | 5 ----- + drivers/i2c/busses/i2c-viapro.c | 5 ----- + drivers/pci/pci-driver.c | 21 +++++++++++++++++---- + drivers/scsi/ipr.c | 1 - + include/linux/pci.h | 1 - + 6 files changed, 21 insertions(+), 16 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-exception-store.c | 29 +++++++++++++++++++---------- + drivers/md/dm-mpath.c | 35 +++++++++++++++++++---------------- + drivers/md/dm-mpath.h | 2 -- + drivers/md/dm-raid1.c | 4 +++- + 4 files changed, 41 insertions(+), 29 deletions(-) +Merging hid/mm +$ git merge hid/mm +Removed drivers/hid/hid-input-quirks.c +Auto-merged drivers/hid/hidraw.c +Auto-merged drivers/hid/usbhid/hid-core.c +CONFLICT (content): Merge conflict in drivers/hid/usbhid/hid-core.c +Auto-merged drivers/hid/usbhid/hid-quirks.c +CONFLICT (content): Merge conflict in drivers/hid/usbhid/hid-quirks.c +Auto-merged drivers/hid/usbhid/usbmouse.c +Auto-merged scripts/mod/file2alias.c +Resolved 'drivers/hid/usbhid/hid-core.c' using previous resolution. +Resolved 'drivers/hid/usbhid/hid-quirks.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d99bf0a: Merge commit 'hid/mm' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 7 + + drivers/hid/Kconfig | 162 ++++ + drivers/hid/Makefile | 31 +- + drivers/hid/hid-a4tech.c | 162 ++++ + drivers/hid/hid-apple.c | 480 ++++++++++++ + drivers/hid/hid-belkin.c | 105 +++ + drivers/hid/hid-cherry.c | 87 +++ + drivers/hid/hid-chicony.c | 80 ++ + drivers/hid/hid-core.c | 1158 ++++++++++++++++++++++------ + drivers/hid/hid-cypress.c | 158 ++++ + drivers/hid/hid-dell.c | 74 ++ + drivers/hid/hid-dummy.c | 60 ++ + drivers/hid/hid-ezkey.c | 95 +++ + drivers/hid/hid-gyration.c | 96 +++ + drivers/hid/hid-ids.h | 385 +++++++++ + drivers/hid/hid-input-quirks.c | 484 ------------ + drivers/hid/hid-input.c | 915 ++++++++-------------- + drivers/hid/hid-lg.c | 342 ++++++++ + drivers/hid/hid-lg.h | 18 + + drivers/hid/{usbhid => }/hid-lg2ff.c | 6 +- + drivers/hid/{usbhid => }/hid-lgff.c | 6 +- + drivers/hid/hid-microsoft.c | 219 ++++++ + drivers/hid/hid-monterey.c | 82 ++ + drivers/hid/hid-petalynx.c | 122 +++ + drivers/hid/hid-samsung.c | 100 +++ + drivers/hid/hid-sony.c | 110 +++ + drivers/hid/hid-sunplus.c | 82 ++ + drivers/hid/hidraw.c | 6 +- + drivers/hid/usbhid/Kconfig | 35 - + drivers/hid/usbhid/Makefile | 6 - + drivers/hid/usbhid/hid-core.c | 424 +++++------ + drivers/hid/usbhid/hid-ff.c | 12 - + drivers/hid/usbhid/hid-quirks.c | 932 +---------------------- + drivers/hid/usbhid/hiddev.c | 20 +- + drivers/hid/usbhid/usbhid.h | 2 +- + drivers/hid/usbhid/usbmouse.c | 5 + + include/linux/hid.h | 357 +++++++-- + include/linux/hiddev.h | 6 +- + include/linux/mod_devicetable.h | 10 + + net/bluetooth/hidp/core.c | 214 ++++-- + net/bluetooth/hidp/hidp.h | 2 + + scripts/mod/file2alias.c | 18 + + 42 files changed, 4974 insertions(+), 2701 deletions(-) + create mode 100644 drivers/hid/hid-a4tech.c + create mode 100644 drivers/hid/hid-apple.c + create mode 100644 drivers/hid/hid-belkin.c + create mode 100644 drivers/hid/hid-cherry.c + create mode 100644 drivers/hid/hid-chicony.c + create mode 100644 drivers/hid/hid-cypress.c + create mode 100644 drivers/hid/hid-dell.c + create mode 100644 drivers/hid/hid-dummy.c + create mode 100644 drivers/hid/hid-ezkey.c + create mode 100644 drivers/hid/hid-gyration.c + create mode 100644 drivers/hid/hid-ids.h + delete mode 100644 drivers/hid/hid-input-quirks.c + create mode 100644 drivers/hid/hid-lg.c + create mode 100644 drivers/hid/hid-lg.h + rename drivers/hid/{usbhid => }/hid-lg2ff.c (97%) + rename drivers/hid/{usbhid => }/hid-lgff.c (97%) + create mode 100644 drivers/hid/hid-microsoft.c + create mode 100644 drivers/hid/hid-monterey.c + create mode 100644 drivers/hid/hid-petalynx.c + create mode 100644 drivers/hid/hid-samsung.c + create mode 100644 drivers/hid/hid-sony.c + create mode 100644 drivers/hid/hid-sunplus.c +$ git am -3 ../patches//0001-HID-fix-for-warn-removal.patch +Applying HID: fix for warn() removal +$ git reset HEAD^ +drivers/hid/usbhid/hid-core.c: needs update +drivers/hid/usbhid/hid-tmff.c: needs update +$ git commit -v -a --amend +Created commit 705db10: Merge commit 'hid/mm' +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged drivers/i2c/busses/i2c-viapro.c +Merge made by recursive. + Documentation/i2c/busses/i2c-floppy | 37 +++ + Documentation/i2c/busses/i2c-i801 | 1 + + Documentation/i2c/busses/i2c-viapro | 8 +- + arch/arm/mach-omap1/board-h3.c | 4 + + arch/arm/mach-omap2/board-h4.c | 11 + + drivers/hwmon/dme1737.c | 320 +++++++++++------------ + drivers/i2c/busses/Kconfig | 34 +++- + drivers/i2c/busses/Makefile | 2 + + drivers/i2c/busses/i2c-floppy.c | 245 +++++++++++++++++ + drivers/i2c/busses/i2c-highlander.c | 498 +++++++++++++++++++++++++++++++++++ + drivers/i2c/busses/i2c-i801.c | 3 + + drivers/i2c/busses/i2c-pca-isa.c | 20 ++- + drivers/i2c/busses/i2c-viapro.c | 4 + + drivers/i2c/chips/isp1301_omap.c | 141 ++++------ + drivers/i2c/chips/tps65010.c | 12 +- + drivers/i2c/i2c-core.c | 18 +- + include/linux/i2c.h | 12 + + 17 files changed, 1100 insertions(+), 270 deletions(-) + create mode 100644 Documentation/i2c/busses/i2c-floppy + create mode 100644 drivers/i2c/busses/i2c-floppy.c + create mode 100644 drivers/i2c/busses/i2c-highlander.c +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/lm90 | 45 +++-- + drivers/hwmon/Kconfig | 8 +- + drivers/hwmon/ad7414.c | 2 +- + drivers/hwmon/lm90.c | 438 ++++++++++++++++++++++++++++++++-------------- + 4 files changed, 342 insertions(+), 151 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Renamed Documentation/mtrr.txt->Documentation/x86/mtrr.txt +Auto-merged Documentation/x86/mtrr.txt +Auto-merged Documentation/00-INDEX +Auto-merged arch/x86/Kconfig +Auto-merged block/genhd.c +Auto-merged include/linux/kernel.h +Merge made by recursive. + Documentation/00-INDEX | 2 - + Documentation/DocBook/kernel-api.tmpl | 5 ++ + Documentation/Makefile | 2 +- + Documentation/early-userspace/00-INDEX | 8 ++ + Documentation/{ => early-userspace}/initrd.txt | 6 +- + Documentation/filesystems/Makefile | 8 ++ + Documentation/filesystems/dnotify.txt | 36 +---------- + Documentation/filesystems/dnotify_test.c | 34 ++++++++++ + Documentation/filesystems/sharedsubtree.txt | 82 +---------------------- + Documentation/filesystems/smount.c | 73 +++++++++++++++++++++ + block/blk-core.c | 72 ++++++++++---------- + block/blk-exec.c | 6 +- + block/blk-integrity.c | 4 +- + block/blk-map.c | 16 ++-- + block/blk-settings.c | 8 +- + block/blk-tag.c | 8 +- + block/genhd.c | 5 +- + include/linux/kernel.h | 4 +- + scripts/kernel-doc | 6 +- + security/inode.c | 33 +++++----- + security/security.c | 8 +- + 21 files changed, 222 insertions(+), 204 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) + create mode 100644 Documentation/filesystems/Makefile + create mode 100644 Documentation/filesystems/dnotify_test.c + create mode 100644 Documentation/filesystems/smount.c +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Auto-merged drivers/media/radio/dsbr100.c +Removed drivers/media/radio/miropcm20-radio.c +Removed drivers/media/radio/miropcm20-rds-core.c +Removed drivers/media/radio/miropcm20-rds-core.h +Removed drivers/media/radio/miropcm20-rds.c +Removed drivers/media/video/dpc7146.c +Auto-merged drivers/media/video/se401.c +Auto-merged drivers/media/video/stv680.c +Removed drivers/media/video/tuner-3036.c +Auto-merged drivers/media/video/usbvision/usbvision-video.c +Auto-merged drivers/media/video/zr364xx.c +CONFLICT (content): Merge conflict in drivers/media/video/zr364xx.c +Resolved 'drivers/media/video/zr364xx.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit e84e1b3: Merge commit 'v4l-dvb/stable' +$ git diff -M --stat --summary HEAD^.. + Documentation/video4linux/CARDLIST.au0828 | 1 + + Documentation/video4linux/CARDLIST.bttv | 1 + + Documentation/video4linux/CARDLIST.cx23885 | 1 + + Documentation/video4linux/CARDLIST.tuner | 1 + + Documentation/video4linux/gspca.txt | 1 + + arch/arm/mach-pxa/include/mach/camera.h | 2 - + drivers/media/common/ir-keymaps.c | 55 ++- + drivers/media/common/tuners/tuner-simple.c | 2 + + drivers/media/common/tuners/tuner-types.c | 22 + + drivers/media/dvb/dvb-usb/Kconfig | 2 + + drivers/media/dvb/dvb-usb/cxusb.c | 495 ++++++++++++ + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 + + drivers/media/dvb/frontends/Kconfig | 7 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/au8522.c | 45 +- + drivers/media/dvb/frontends/au8522.h | 9 + + drivers/media/dvb/frontends/dib0070.h | 8 +- + drivers/media/dvb/frontends/dib7000p.c | 3 +- + drivers/media/dvb/frontends/dib7000p.h | 41 +- + drivers/media/dvb/frontends/drx397xD.c | 34 +- + drivers/media/dvb/frontends/drx397xD.h | 2 +- + drivers/media/dvb/frontends/lgs8gl5.c | 454 +++++++++++ + drivers/media/dvb/frontends/lgs8gl5.h | 45 + + drivers/media/radio/Makefile | 4 - + drivers/media/radio/dsbr100.c | 3 + + drivers/media/radio/miropcm20-radio.c | 266 ------ + drivers/media/radio/miropcm20-rds-core.c | 211 ----- + drivers/media/radio/miropcm20-rds-core.h | 19 - + drivers/media/radio/miropcm20-rds.c | 136 ---- + drivers/media/radio/radio-si470x.c | 2 + + drivers/media/video/Kconfig | 150 ++-- + drivers/media/video/Makefile | 3 +- + drivers/media/video/au0828/Kconfig | 1 + + drivers/media/video/au0828/au0828-cards.c | 7 + + drivers/media/video/au0828/au0828-cards.h | 1 + + drivers/media/video/au0828/au0828-dvb.c | 23 + + drivers/media/video/bt8xx/bttv-cards.c | 27 +- + drivers/media/video/bt8xx/bttv-driver.c | 25 +- + drivers/media/video/bt8xx/bttv-input.c | 62 ++- + drivers/media/video/bt8xx/bttv.h | 2 +- + drivers/media/video/cafe_ccic.c | 6 +- + drivers/media/video/cx2341x.c | 5 +- + drivers/media/video/cx23885/cx23885-417.c | 10 +- + drivers/media/video/cx23885/cx23885-cards.c | 46 +- + drivers/media/video/cx23885/cx23885-core.c | 2 +- + drivers/media/video/cx23885/cx23885-dvb.c | 76 +- + drivers/media/video/cx23885/cx23885-video.c | 10 +- + drivers/media/video/cx23885/cx23885.h | 1 + + drivers/media/video/cx88/cx88-blackbird.c | 8 +- + drivers/media/video/cx88/cx88-video.c | 10 +- + drivers/media/video/dpc7146.c | 408 ---------- + drivers/media/video/em28xx/em28xx-video.c | 7 +- + drivers/media/video/gspca/etoms.c | 4 +- + drivers/media/video/gspca/gspca.h | 1 - + drivers/media/video/gspca/pac207.c | 1 - + drivers/media/video/gspca/pac7311.c | 642 ++++++++------- + drivers/media/video/gspca/sonixj.c | 233 +++++- + drivers/media/video/gspca/spca561.c | 611 +++++++++------ + drivers/media/video/gspca/zc3xx.c | 31 +- + drivers/media/video/ivtv/ivtv-driver.c | 2 +- + drivers/media/video/ivtv/ivtv-driver.h | 1 + + drivers/media/video/ivtv/ivtv-fileops.c | 2 +- + drivers/media/video/ivtv/ivtv-fileops.h | 5 - + drivers/media/video/ivtv/ivtv-irq.c | 29 +- + drivers/media/video/ivtv/ivtv-queue.h | 2 +- + drivers/media/video/ivtv/ivtv-streams.c | 2 +- + drivers/media/video/ivtv/ivtv-vbi.c | 4 +- + drivers/media/video/ivtv/ivtv-version.h | 2 +- + drivers/media/video/meye.c | 7 +- + drivers/media/video/mt9m001.c | 55 +- + drivers/media/video/mt9m111.c | 973 +++++++++++++++++++++++ + drivers/media/video/mt9v022.c | 52 +- + drivers/media/video/mxb.c | 13 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 + + drivers/media/video/pxa_camera.c | 24 - + drivers/media/video/s2255drv.c | 6 + + drivers/media/video/saa5246a.c | 8 +- + drivers/media/video/saa5249.c | 8 +- + drivers/media/video/saa7134/saa6752hs.c | 318 +++++--- + drivers/media/video/saa7134/saa7134-core.c | 52 +- + drivers/media/video/saa7134/saa7134-empress.c | 25 +- + drivers/media/video/saa7134/saa7134-input.c | 140 ++++- + drivers/media/video/saa7134/saa7134-video.c | 8 +- + drivers/media/video/se401.c | 6 +- + drivers/media/video/sh_mobile_ceu_camera.c | 5 - + drivers/media/video/stk-webcam.c | 6 +- + drivers/media/video/stradis.c | 6 +- + drivers/media/video/stv680.c | 2 + + drivers/media/video/tda9840.c | 166 ++--- + drivers/media/video/tea6415c.c | 131 +--- + drivers/media/video/tea6420.c | 147 ++--- + drivers/media/video/tuner-3036.c | 214 ----- + drivers/media/video/usbvideo/vicam.c | 6 + + drivers/media/video/usbvision/usbvision-video.c | 2 + + drivers/media/video/v4l2-common.c | 183 +++-- + drivers/media/video/v4l2-dev.c | 5 +- + drivers/media/video/v4l2-ioctl.c | 4 +- + drivers/media/video/vino.c | 1 - + drivers/media/video/vivi.c | 7 +- + drivers/media/video/zoran_driver.c | 3 + + drivers/media/video/zr364xx.c | 8 +- + include/linux/i2c-id.h | 1 - + include/linux/videodev2.h | 31 +- + include/media/ir-common.h | 6 + + include/media/saa7146.h | 2 +- + include/media/sh_mobile_ceu.h | 2 - + include/media/soc_camera.h | 3 + + include/media/tuner.h | 1 + + include/media/v4l2-chip-ident.h | 5 + + include/media/v4l2-common.h | 3 + + 110 files changed, 4366 insertions(+), 2623 deletions(-) + create mode 100644 drivers/media/dvb/frontends/lgs8gl5.c + create mode 100644 drivers/media/dvb/frontends/lgs8gl5.h + delete mode 100644 drivers/media/radio/miropcm20-radio.c + delete mode 100644 drivers/media/radio/miropcm20-rds-core.c + delete mode 100644 drivers/media/radio/miropcm20-rds-core.h + delete mode 100644 drivers/media/radio/miropcm20-rds.c + delete mode 100644 drivers/media/video/dpc7146.c + create mode 100644 drivers/media/video/mt9m111.c + delete mode 100644 drivers/media/video/tuner-3036.c +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Auto-merged drivers/ide/ide-probe.c +Auto-merged drivers/ide/ide-tape.c +Merge made by recursive. + drivers/ata/libata-scsi.c | 2 +- + drivers/block/hd.c | 9 +- + drivers/ide/Kconfig | 61 +--- + drivers/ide/Makefile | 15 +- + drivers/ide/arm/icside.c | 5 +- + drivers/ide/arm/palm_bk3710.c | 8 +- + drivers/ide/h8300/ide-h8300.c | 2 +- + drivers/ide/ide-acpi.c | 18 +- + drivers/ide/ide-atapi.c | 393 ++++++++++++++--- + drivers/ide/ide-cd.c | 105 ++--- + drivers/ide/ide-disk.c | 502 +++++++++------------ + drivers/ide/ide-dma.c | 65 ++-- + drivers/ide/ide-floppy.c | 910 ++++++++------------------------------ + drivers/ide/ide-floppy.h | 56 +++ + drivers/ide/ide-floppy_ioctl.c | 243 ++++++++++ + drivers/ide/ide-generic.c | 55 +++- + drivers/ide/ide-io.c | 301 ++++++------- + drivers/ide/ide-ioctls.c | 299 +++++++++++++ + drivers/ide/ide-iops.c | 289 +++++-------- + drivers/ide/ide-lib.c | 75 ++-- + drivers/ide/ide-probe.c | 397 ++++++++--------- + drivers/ide/ide-proc.c | 310 ++++--------- + drivers/ide/ide-tape.c | 591 +++++++------------------ + drivers/ide/ide-taskfile.c | 241 ++--------- + drivers/ide/ide-timings.c | 22 +- + drivers/ide/ide.c | 350 +++++---------- + drivers/ide/legacy/ali14xx.c | 3 +- + drivers/ide/legacy/buddha.c | 1 - + drivers/ide/legacy/dtc2278.c | 1 - + drivers/ide/legacy/falconide.c | 1 - + drivers/ide/legacy/gayle.c | 1 - + drivers/ide/legacy/ht6560b.c | 10 +- + drivers/ide/legacy/ide-4drives.c | 2 +- + drivers/ide/legacy/ide-cs.c | 1 - + drivers/ide/legacy/macide.c | 1 - + drivers/ide/legacy/q40ide.c | 2 - + drivers/ide/legacy/qd65xx.c | 25 +- + drivers/ide/legacy/umc8672.c | 1 - + drivers/ide/mips/au1xxx-ide.c | 6 +- + drivers/ide/pci/aec62xx.c | 9 +- + drivers/ide/pci/alim15x3.c | 18 +- + drivers/ide/pci/amd74xx.c | 12 +- + drivers/ide/pci/atiixp.c | 5 +- + drivers/ide/pci/cmd640.c | 51 +-- + drivers/ide/pci/cmd64x.c | 7 +- + drivers/ide/pci/cs5520.c | 5 +- + drivers/ide/pci/cs5530.c | 21 +- + drivers/ide/pci/cs5535.c | 18 +- + drivers/ide/pci/cy82c693.c | 122 +----- + drivers/ide/pci/delkin_cb.c | 1 - + drivers/ide/pci/generic.c | 5 +- + drivers/ide/pci/hpt34x.c | 7 +- + drivers/ide/pci/hpt366.c | 82 ++-- + drivers/ide/pci/it8213.c | 5 +- + drivers/ide/pci/it821x.c | 98 ++-- + drivers/ide/pci/jmicron.c | 5 +- + drivers/ide/pci/ns87415.c | 26 +- + drivers/ide/pci/opti621.c | 11 +- + drivers/ide/pci/pdc202xx_new.c | 17 +- + drivers/ide/pci/pdc202xx_old.c | 17 +- + drivers/ide/pci/piix.c | 7 +- + drivers/ide/pci/rz1000.c | 1 - + drivers/ide/pci/sc1200.c | 21 +- + drivers/ide/pci/scc_pata.c | 14 +- + drivers/ide/pci/serverworks.c | 13 +- + drivers/ide/pci/sgiioc4.c | 1 - + drivers/ide/pci/siimage.c | 28 +- + drivers/ide/pci/sis5513.c | 7 +- + drivers/ide/pci/sl82c105.c | 9 +- + drivers/ide/pci/slc90e66.c | 5 +- + drivers/ide/pci/triflex.c | 14 +- + drivers/ide/pci/trm290.c | 5 +- + drivers/ide/pci/via82cxxx.c | 12 +- + drivers/ide/ppc/pmac.c | 24 +- + drivers/ide/setup-pci.c | 33 ++ + drivers/scsi/ide-scsi.c | 218 ++++------ + include/linux/ata.h | 112 +++++- + include/linux/ide.h | 842 ++++++++++++++++++++--------------- + 78 files changed, 3451 insertions(+), 3836 deletions(-) + create mode 100644 drivers/ide/ide-floppy.h + create mode 100644 drivers/ide/ide-floppy_ioctl.c + create mode 100644 drivers/ide/ide-ioctls.c +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/xfs/linux-2.6/xfs_super.c | 11 ++++++++++- + fs/xfs/xfs_mount.h | 1 + + 2 files changed, 11 insertions(+), 1 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged drivers/misc/acer-wmi.c +CONFLICT (content): Merge conflict in drivers/misc/acer-wmi.c +Auto-merged drivers/misc/eeepc-laptop.c +Recorded preimage for 'drivers/misc/acer-wmi.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/misc/acer-wmi.c'. +Created commit 315863e: Merge commit 'acpi/test' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 122 +++++-- + MAINTAINERS | 9 +- + drivers/acpi/Kconfig | 11 + + drivers/acpi/Makefile | 6 + + drivers/acpi/bus.c | 53 ++- + drivers/acpi/dispatcher/dsobject.c | 2 +- + drivers/acpi/ec.c | 2 +- + drivers/acpi/events/evgpe.c | 2 - + drivers/acpi/executer/exconfig.c | 116 ++++-- + drivers/acpi/glue.c | 40 ++ + drivers/acpi/hardware/hwsleep.c | 7 + + drivers/acpi/namespace/nsxfeval.c | 79 ++++ + drivers/acpi/namespace/nsxfname.c | 5 + + drivers/acpi/pcc_acpi.c | 779 +++++++++++++++++++++++++++++++++++ + drivers/acpi/power.c | 68 ++- + drivers/acpi/processor_core.c | 2 +- + drivers/acpi/processor_perflib.c | 2 +- + drivers/acpi/scan.c | 80 ++-- + drivers/acpi/sleep/main.c | 49 +++- + drivers/acpi/tables.c | 2 + + drivers/acpi/tables/tbinstal.c | 61 +++- + drivers/acpi/utilities/utglobal.c | 44 ++- + drivers/acpi/utilities/utobject.c | 8 +- + drivers/acpi/utilities/utxface.c | 7 +- + drivers/acpi/video.c | 35 +- + drivers/acpi/video_detect.c | 268 ++++++++++++ + drivers/acpi/wmi.c | 10 +- + drivers/misc/acer-wmi.c | 25 +- + drivers/misc/asus-laptop.c | 10 +- + drivers/misc/compal-laptop.c | 12 +- + drivers/misc/eeepc-laptop.c | 12 +- + drivers/misc/fujitsu-laptop.c | 26 +- + drivers/misc/msi-laptop.c | 16 +- + drivers/misc/sony-laptop.c | 6 +- + drivers/misc/thinkpad_acpi.c | 29 +- + drivers/pnp/Kconfig | 20 +- + drivers/pnp/Makefile | 4 - + drivers/pnp/base.h | 10 + + drivers/pnp/core.c | 29 +- + drivers/pnp/driver.c | 4 - + drivers/pnp/isapnp/Makefile | 4 - + drivers/pnp/isapnp/core.c | 12 +- + drivers/pnp/manager.c | 34 +- + drivers/pnp/pnpacpi/Makefile | 4 - + drivers/pnp/pnpacpi/core.c | 16 +- + drivers/pnp/pnpacpi/rsparser.c | 43 +- + drivers/pnp/pnpbios/Makefile | 4 - + drivers/pnp/pnpbios/core.c | 4 +- + drivers/pnp/pnpbios/rsparser.c | 18 +- + drivers/pnp/quirks.c | 6 +- + drivers/pnp/resource.c | 12 +- + drivers/pnp/support.c | 14 +- + include/acpi/acconfig.h | 2 +- + include/acpi/acdisasm.h | 4 + + include/acpi/acmacros.h | 248 +++++------ + include/acpi/acpi_bus.h | 2 + + include/acpi/acpi_drivers.h | 1 + + include/acpi/actbl1.h | 51 ++- + include/acpi/actypes.h | 3 +- + include/acpi/acutils.h | 4 +- + include/linux/acpi.h | 52 ++- + include/linux/pnp.h | 10 - + 62 files changed, 2119 insertions(+), 501 deletions(-) + create mode 100644 drivers/acpi/pcc_acpi.c + create mode 100644 drivers/acpi/video_detect.c +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/Kconfig | 30 +++++ + fs/Makefile | 3 +- + fs/lockd/svc.c | 33 +++---- + fs/nfs/callback.c | 3 +- + fs/nfsd/nfs3proc.c | 8 +- + fs/nfsd/nfs4callback.c | 3 +- + fs/nfsd/nfs4xdr.c | 171 +++++++++++++++-------------- + fs/nfsd/nfsfh.c | 30 ++++-- + fs/nfsd/nfsproc.c | 6 +- + fs/nfsd/nfssvc.c | 1 + + fs/nfsd/vfs.c | 63 +++++++----- + fs/proc/proc_misc.c | 4 + + include/linux/fs.h | 57 +++++++++-- + include/linux/nfsd/nfsd.h | 3 +- + include/linux/sunrpc/clnt.h | 4 +- + include/linux/sunrpc/svc.h | 13 ++- + include/linux/sunrpc/svc_rdma.h | 1 - + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 6 +- + net/sunrpc/rpcb_clnt.c | 65 +++++------- + net/sunrpc/svc.c | 174 +++++++++++++++++++++++++----- + net/sunrpc/svc_xprt.c | 39 ++++++- + net/sunrpc/svcsock.c | 13 +++ + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 8 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 +- + 25 files changed, 502 insertions(+), 242 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/fw-card.c | 56 +++------- + drivers/firewire/fw-device.c | 37 +----- + drivers/firewire/fw-sbp2.c | 116 ++++++++------------ + drivers/firewire/fw-transaction.c | 48 ++++++++- + drivers/firewire/fw-transaction.h | 9 +- + drivers/ieee1394/csr1212.c | 2 +- + drivers/ieee1394/eth1394.c | 2 +- + drivers/ieee1394/sbp2.c | 218 +++++++++++++++--------------------- + drivers/ieee1394/sbp2.h | 33 ++---- + 9 files changed, 218 insertions(+), 303 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/x86/xen/time.c +Auto-merged include/asm-x86/kvm.h +CONFLICT (content): Merge conflict in include/asm-x86/kvm.h +Auto-merged include/asm-x86/kvm_host.h +Auto-merged include/asm-x86/pvclock.h +Resolved 'include/asm-x86/kvm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 599254e: Merge commit 'kvm/master' +$ git diff -M --stat --summary HEAD^.. + arch/ia64/kvm/irq.h | 32 ++ + arch/powerpc/include/asm/kvm_host.h | 14 +- + arch/powerpc/include/asm/kvm_ppc.h | 12 + + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x_tlb.c | 49 ++- + arch/powerpc/kvm/Kconfig | 11 + + arch/powerpc/kvm/Makefile | 6 +- + arch/powerpc/kvm/booke_guest.c | 17 + + arch/powerpc/kvm/booke_interrupts.S | 79 +++-- + arch/powerpc/kvm/emulate.c | 8 +- + arch/powerpc/kvm/powerpc.c | 99 +++++- + arch/x86/kernel/kvmclock.c | 30 ++ + arch/x86/kernel/pvclock.c | 12 + + arch/x86/kvm/i8254.c | 76 ++-- + arch/x86/kvm/i8254.h | 7 +- + arch/x86/kvm/i8259.c | 36 ++- + arch/x86/kvm/irq.c | 36 ++- + arch/x86/kvm/irq.h | 10 +- + arch/x86/kvm/kvm_cache_regs.h | 32 ++ + arch/x86/kvm/lapic.c | 11 +- + arch/x86/kvm/mmu.c | 54 ++-- + arch/x86/kvm/paging_tmpl.h | 5 +- + arch/x86/kvm/svm.c | 140 +++----- + arch/x86/kvm/vmx.c | 688 ++++++++++++++++++++++++----------- + arch/x86/kvm/vmx.h | 4 +- + arch/x86/kvm/x86.c | 667 +++++++++++++++++++++++++--------- + arch/x86/kvm/x86.h | 22 ++ + arch/x86/kvm/x86_emulate.c | 23 +- + arch/x86/xen/time.c | 11 +- + include/asm-x86/kvm.h | 22 -- + include/asm-x86/kvm_host.h | 91 +++-- + include/asm-x86/pvclock.h | 1 + + include/linux/kvm.h | 67 +++- + include/linux/kvm_host.h | 19 + + kernel/smp.c | 58 +--- + virt/kvm/ioapic.c | 22 +- + virt/kvm/ioapic.h | 3 +- + virt/kvm/kvm_main.c | 68 +++-- + virt/kvm/kvm_trace.c | 30 +- + 39 files changed, 1768 insertions(+), 808 deletions(-) + create mode 100644 arch/ia64/kvm/irq.h + create mode 100644 arch/x86/kvm/kvm_cache_regs.h + create mode 100644 arch/x86/kvm/x86.h +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/dlm_internal.h | 7 ++- + fs/dlm/lockspace.c | 158 ++++++++++++++++++++++++++++++++----------- + fs/dlm/lockspace.h | 1 + + fs/dlm/user.c | 117 ++++++++++++++++++++++++++------ + fs/dlm/user.h | 4 +- + fs/gfs2/locking/dlm/mount.c | 3 +- + include/linux/dlm.h | 5 +- + include/linux/dlm_device.h | 2 +- + 8 files changed, 229 insertions(+), 68 deletions(-) +Merging scsi/master +$ git merge scsi/master +Merge made by recursive. + drivers/scsi/hosts.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 1 - + drivers/scsi/scsi_proc.c | 8 ++++---- + drivers/scsi/scsi_tgt_lib.c | 6 +++--- + drivers/scsi/scsi_transport_iscsi.c | 4 ++-- + drivers/scsi/tmscsim.c | 4 ++-- + 6 files changed, 12 insertions(+), 13 deletions(-) +Merging tests/master +$ git merge tests/master +Auto-merged Makefile +Auto-merged drivers/misc/Makefile +Auto-merged kernel/Makefile +Auto-merged lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merged lib/Makefile +Resolved 'lib/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d12de57: Merge commit 'tests/master' +$ git diff -M --stat --summary HEAD^.. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 93 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 101 +++++++++++++++++++++++ + tests/Makefile | 10 ++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 0 + {lib => tests}/locking-selftest-hardirq.h | 0 + {lib => tests}/locking-selftest-mutex.h | 0 + {lib => tests}/locking-selftest-rlock-hardirq.h | 0 + {lib => tests}/locking-selftest-rlock-softirq.h | 0 + {lib => tests}/locking-selftest-rlock.h | 0 + {lib => tests}/locking-selftest-rsem.h | 0 + {lib => tests}/locking-selftest-softirq.h | 0 + {lib => tests}/locking-selftest-spin-hardirq.h | 0 + {lib => tests}/locking-selftest-spin-softirq.h | 0 + {lib => tests}/locking-selftest-spin.h | 0 + {lib => tests}/locking-selftest-wlock-hardirq.h | 0 + {lib => tests}/locking-selftest-wlock-softirq.h | 0 + {lib => tests}/locking-selftest-wlock.h | 0 + {lib => tests}/locking-selftest-wsem.h | 0 + {lib => tests}/locking-selftest.c | 0 + {kernel => tests}/rcutorture.c | 0 + {kernel => tests}/rtmutex-tester.c | 2 +- + {kernel => tests}/test_kprobes.c | 0 + 27 files changed, 115 insertions(+), 98 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (100%) + rename {lib => tests}/locking-selftest-hardirq.h (100%) + rename {lib => tests}/locking-selftest-mutex.h (100%) + rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-rlock.h (100%) + rename {lib => tests}/locking-selftest-rsem.h (100%) + rename {lib => tests}/locking-selftest-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) + rename {lib => tests}/locking-selftest-spin-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin.h (100%) + rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-wlock.h (100%) + rename {lib => tests}/locking-selftest-wsem.h (100%) + rename {lib => tests}/locking-selftest.c (100%) + rename {kernel => tests}/rcutorture.c (100%) + rename {kernel => tests}/rtmutex-tester.c (99%) + rename {kernel => tests}/test_kprobes.c (100%) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/configfs/dir.c | 17 +- + fs/ocfs2/Makefile | 5 +- + fs/ocfs2/alloc.c | 829 +++++-- + fs/ocfs2/alloc.h | 86 +- + fs/ocfs2/aops.c | 28 +- + fs/ocfs2/cluster/masklog.c | 1 + + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/cluster/netdebug.c | 26 +- + fs/ocfs2/cluster/tcp.c | 44 +- + fs/ocfs2/cluster/tcp_internal.h | 32 - + fs/ocfs2/dir.c | 37 +- + fs/ocfs2/extent_map.c | 60 + + fs/ocfs2/extent_map.h | 3 + + fs/ocfs2/file.c | 299 +-- + fs/ocfs2/file.h | 32 +- + fs/ocfs2/inode.c | 23 +- + fs/ocfs2/inode.h | 3 + + fs/ocfs2/journal.c | 23 +- + fs/ocfs2/journal.h | 27 +- + fs/ocfs2/locks.c | 15 + + fs/ocfs2/locks.h | 1 + + fs/ocfs2/namei.c | 13 +- + fs/ocfs2/ocfs2.h | 10 + + fs/ocfs2/ocfs2_fs.h | 220 ++- + fs/ocfs2/stack_user.c | 33 + + fs/ocfs2/stackglue.c | 20 + + fs/ocfs2/stackglue.h | 19 + + fs/ocfs2/suballoc.c | 98 +- + fs/ocfs2/suballoc.h | 14 +- + fs/ocfs2/super.c | 17 + + fs/ocfs2/symlink.c | 9 + + fs/ocfs2/uptodate.c | 32 +- + fs/ocfs2/uptodate.h | 3 + + fs/ocfs2/xattr.c | 4842 +++++++++++++++++++++++++++++++++++++++ + fs/ocfs2/xattr.h | 75 + + fs/ocfs2/xattr_trusted.c | 82 + + fs/ocfs2/xattr_user.c | 94 + + 37 files changed, 6626 insertions(+), 547 deletions(-) + create mode 100644 fs/ocfs2/xattr.c + create mode 100644 fs/ocfs2/xattr.h + create mode 100644 fs/ocfs2/xattr_trusted.c + create mode 100644 fs/ocfs2/xattr_user.c +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Merge made by recursive. + fs/udf/ialloc.c | 44 +++++++++++++++++++------------------------- + 1 files changed, 19 insertions(+), 25 deletions(-) +Merging net/master +$ git merge net/master +Merge made by recursive. + drivers/net/wireless/Kconfig | 17 +- + drivers/net/wireless/Makefile | 4 +- + drivers/net/wireless/airo.c | 16 +- + drivers/net/wireless/airport.c | 3 +- + drivers/net/wireless/ath5k/ath5k.h | 162 +-- + drivers/net/wireless/ath5k/base.c | 383 ++--- + drivers/net/wireless/ath5k/base.h | 8 +- + drivers/net/wireless/ath5k/hw.c | 77 +- + drivers/net/wireless/b43legacy/xmit.c | 4 +- + drivers/net/wireless/hermes.c | 124 +- + drivers/net/wireless/hermes.h | 45 + + drivers/net/wireless/hermes_dld.c | 730 +++++++++ + drivers/net/wireless/hermes_dld.h | 48 + + drivers/net/wireless/hermes_rid.h | 17 + + drivers/net/wireless/ipw2100.c | 2 +- + drivers/net/wireless/ipw2200.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945-debug.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 104 +-- + drivers/net/wireless/iwlwifi/iwl-3945.h | 1 - + drivers/net/wireless/iwlwifi/iwl-agn.c | 2 - + drivers/net/wireless/iwlwifi/iwl-core.c | 1 - + drivers/net/wireless/iwlwifi/iwl-debug.h | 12 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 16 - + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 125 +-- + drivers/net/wireless/iwlwifi/iwl-tx.c | 32 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 8 +- + drivers/net/wireless/libertas/cmd.c | 21 +- + drivers/net/wireless/libertas/defs.h | 6 +- + drivers/net/wireless/libertas/if_cs.c | 2 +- + drivers/net/wireless/libertas/if_usb.c | 177 ++- + drivers/net/wireless/libertas/if_usb.h | 5 + + drivers/net/wireless/libertas_tf/Makefile | 6 + + drivers/net/wireless/libertas_tf/cmd.c | 669 ++++++++ + drivers/net/wireless/libertas_tf/if_usb.c | 766 ++++++++++ + drivers/net/wireless/libertas_tf/if_usb.h | 98 ++ + drivers/net/wireless/libertas_tf/libertas_tf.h | 514 +++++++ + drivers/net/wireless/libertas_tf/main.c | 666 ++++++++ + drivers/net/wireless/orinoco.c | 1949 +++++++++++++++++++++--- + drivers/net/wireless/orinoco.h | 61 +- + drivers/net/wireless/orinoco_cs.c | 3 +- + drivers/net/wireless/orinoco_nortel.c | 3 +- + drivers/net/wireless/orinoco_pci.c | 3 +- + drivers/net/wireless/orinoco_plx.c | 3 +- + drivers/net/wireless/orinoco_tmd.c | 3 +- + drivers/net/wireless/p54/p54.h | 6 +- + drivers/net/wireless/p54/p54common.h | 6 +- + drivers/net/wireless/p54/p54pci.c | 34 +- + drivers/net/wireless/p54/p54pci.h | 10 +- + drivers/net/wireless/p54/p54usb.c | 32 +- + drivers/net/wireless/p54/p54usb.h | 6 +- + drivers/net/wireless/prism54/isl_ioctl.c | 8 +- + drivers/net/wireless/rt2x00/Kconfig | 6 + + drivers/net/wireless/rt2x00/Makefile | 1 + + drivers/net/wireless/rt2x00/rt2400pci.c | 40 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 22 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 39 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 17 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 39 +- + drivers/net/wireless/rt2x00/rt2500usb.h | 17 +- + drivers/net/wireless/rt2x00/rt2x00.h | 73 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 4 + + drivers/net/wireless/rt2x00/rt2x00crypto.c | 215 +++ + drivers/net/wireless/rt2x00/rt2x00debug.c | 97 ++ + drivers/net/wireless/rt2x00/rt2x00dev.c | 48 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 47 + + drivers/net/wireless/rt2x00/rt2x00mac.c | 153 ++- + drivers/net/wireless/rt2x00/rt2x00queue.c | 81 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 73 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 19 +- + drivers/net/wireless/rt2x00/rt61pci.c | 354 ++++- + drivers/net/wireless/rt2x00/rt61pci.h | 38 +- + drivers/net/wireless/rt2x00/rt73usb.c | 363 ++++- + drivers/net/wireless/rt2x00/rt73usb.h | 38 +- + drivers/net/wireless/rtl8180.h | 31 - + drivers/net/wireless/rtl8180_dev.c | 34 +- + drivers/net/wireless/rtl8187.h | 6 - + drivers/net/wireless/rtl8187_dev.c | 10 +- + drivers/net/wireless/rtl818x.h | 35 + + drivers/net/wireless/spectrum_cs.c | 426 +----- + drivers/net/wireless/wl3501_cs.c | 8 +- + include/linux/if_ether.h | 1 + + include/linux/rfkill.h | 7 +- + include/net/mac80211.h | 22 +- + net/Kconfig | 8 +- + net/ieee80211/ieee80211_module.c | 8 +- + net/ipv4/tcp_input.c | 208 ++-- + net/mac80211/cfg.c | 21 +- + net/mac80211/debugfs_sta.c | 2 +- + net/mac80211/event.c | 5 +- + net/mac80211/ieee80211_i.h | 103 +- + net/mac80211/iface.c | 8 +- + net/mac80211/main.c | 81 +- + net/mac80211/mesh.c | 29 +- + net/mac80211/mesh.h | 61 +- + net/mac80211/mesh_hwmp.c | 120 +- + net/mac80211/mesh_pathtbl.c | 76 +- + net/mac80211/mesh_plink.c | 56 +- + net/mac80211/mlme.c | 850 ++++++----- + net/mac80211/rx.c | 140 +- + net/mac80211/tx.c | 46 +- + net/mac80211/util.c | 46 +- + net/mac80211/wep.c | 14 +- + net/mac80211/wext.c | 53 +- + net/mac80211/wme.h | 2 - + net/mac80211/wpa.c | 2 +- + net/rfkill/rfkill-input.h | 1 + + net/rfkill/rfkill.c | 170 ++- + 108 files changed, 8753 insertions(+), 2741 deletions(-) + create mode 100644 drivers/net/wireless/hermes_dld.c + create mode 100644 drivers/net/wireless/hermes_dld.h + create mode 100644 drivers/net/wireless/libertas_tf/Makefile + create mode 100644 drivers/net/wireless/libertas_tf/cmd.c + create mode 100644 drivers/net/wireless/libertas_tf/if_usb.c + create mode 100644 drivers/net/wireless/libertas_tf/if_usb.h + create mode 100644 drivers/net/wireless/libertas_tf/libertas_tf.h + create mode 100644 drivers/net/wireless/libertas_tf/main.c + create mode 100644 drivers/net/wireless/rt2x00/rt2x00crypto.c +Merging mtd/master +$ git merge mtd/master +Removed drivers/mtd/maps/ebony.c +Removed drivers/mtd/maps/ocotea.c +Removed drivers/mtd/maps/omap-toto-flash.c +Removed drivers/mtd/maps/walnut.c +Auto-merged drivers/mtd/mtdchar.c +Removed drivers/mtd/nand/toto.c +Merge made by recursive. + Documentation/mtd/nand_ecc.txt | 714 ++++++++++++++++++++++++++ + arch/arm/plat-omap/include/mach/onenand.h | 6 +- + drivers/mtd/Kconfig | 5 + + drivers/mtd/chips/Kconfig | 3 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 54 ++- + drivers/mtd/chips/cfi_probe.c | 58 +-- + drivers/mtd/chips/cfi_util.c | 66 +++- + drivers/mtd/chips/gen_probe.c | 2 +- + drivers/mtd/devices/Kconfig | 21 + + drivers/mtd/devices/m25p80.c | 136 ++++-- + drivers/mtd/devices/mtd_dataflash.c | 214 ++++++++- + drivers/mtd/maps/Kconfig | 31 -- + drivers/mtd/maps/Makefile | 4 - + drivers/mtd/maps/ebony.c | 163 ------ + drivers/mtd/maps/ocotea.c | 154 ------ + drivers/mtd/maps/omap-toto-flash.c | 133 ----- + drivers/mtd/maps/walnut.c | 122 ----- + drivers/mtd/mtdchar.c | 4 +- + drivers/mtd/mtdconcat.c | 4 +- + drivers/mtd/mtdpart.c | 4 +- + drivers/mtd/nand/Kconfig | 6 - + drivers/mtd/nand/Makefile | 1 - + drivers/mtd/nand/nand_base.c | 8 +- + drivers/mtd/nand/nand_ecc.c | 516 +++++++++++++++----- + drivers/mtd/nand/nandsim.c | 1 - + drivers/mtd/nand/toto.c | 206 -------- + drivers/mtd/onenand/Kconfig | 8 + + drivers/mtd/onenand/Makefile | 1 + + drivers/mtd/onenand/omap2.c | 782 +++++++++++++++++++++++++++++ + drivers/mtd/onenand/onenand_base.c | 2 +- + drivers/mtd/ssfdc.c | 3 +- + fs/jffs2/dir.c | 2 +- + fs/jffs2/erase.c | 4 +- + fs/jffs2/fs.c | 2 + + include/linux/mtd/cfi.h | 9 +- + include/linux/mtd/flashchip.h | 4 + + include/linux/mtd/mtd.h | 4 +- + include/linux/mtd/nand.h | 1 + + include/linux/mtd/onenand_regs.h | 2 + + 39 files changed, 2367 insertions(+), 1093 deletions(-) + create mode 100644 Documentation/mtd/nand_ecc.txt + delete mode 100644 drivers/mtd/maps/ebony.c + delete mode 100644 drivers/mtd/maps/ocotea.c + delete mode 100644 drivers/mtd/maps/omap-toto-flash.c + delete mode 100644 drivers/mtd/maps/walnut.c + delete mode 100644 drivers/mtd/nand/toto.c + create mode 100644 drivers/mtd/onenand/omap2.c +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Auto-merged include/asm-x86/cpufeature.h +CONFLICT (content): Merge conflict in include/asm-x86/cpufeature.h +Resolved 'include/asm-x86/cpufeature.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 25115b6: Merge commit 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + arch/x86/crypto/Makefile | 2 + + arch/x86/crypto/crc32c-intel.c | 197 + + crypto/Kconfig | 127 +- + crypto/Makefile | 12 +- + crypto/algapi.c | 147 +- + crypto/{cryptomgr.c => algboss.c} | 92 +- + crypto/ansi_cprng.c | 417 ++ + crypto/api.c | 81 +- + crypto/blkcipher.c | 29 - + crypto/chainiv.c | 44 +- + crypto/eseqiv.c | 35 +- + crypto/fips.c | 27 + + crypto/internal.h | 18 +- + crypto/krng.c | 66 + + crypto/proc.c | 57 +- + crypto/rng.c | 126 + + crypto/seqiv.c | 27 +- + crypto/tcrypt.c | 1347 +----- + crypto/tcrypt.h | 8709 +----------------------------------- + crypto/testmgr.c | 1868 ++++++++ + crypto/testmgr.h | 8738 ++++++++++++++++++++++++++++++++++++ + include/asm-x86/cpufeature.h | 2 + + include/crypto/internal/rng.h | 26 + + include/crypto/internal/skcipher.h | 6 - + include/crypto/rng.h | 75 + + include/linux/crypto.h | 35 + + 26 files changed, 12251 insertions(+), 10059 deletions(-) + create mode 100644 arch/x86/crypto/crc32c-intel.c + rename crypto/{cryptomgr.c => algboss.c} (69%) + create mode 100644 crypto/ansi_cprng.c + create mode 100644 crypto/fips.c + create mode 100644 crypto/krng.c + create mode 100644 crypto/rng.c + create mode 100644 crypto/testmgr.c + create mode 100644 crypto/testmgr.h + create mode 100644 include/crypto/internal/rng.h + create mode 100644 include/crypto/rng.h +Merging vfs/for-next +$ git merge vfs/for-next +Auto-merged fs/nfsd/vfs.c +Merge made by recursive. + arch/alpha/kernel/osf_sys.c | 26 +++--- + arch/parisc/hpux/fs.c | 35 ++++--- + arch/powerpc/platforms/cell/spufs/syscalls.c | 4 +- + drivers/md/dm-table.c | 21 +--- + fs/9p/vfs_dir.c | 1 + + fs/adfs/dir.c | 1 + + fs/affs/dir.c | 1 + + fs/autofs4/root.c | 2 + + fs/befs/linuxvfs.c | 1 + + fs/block_dev.c | 14 ++-- + fs/char_dev.c | 21 +++-- + fs/compat.c | 30 +++--- + fs/configfs/symlink.c | 16 ++-- + fs/dcache.c | 87 +++++++++--------- + fs/dquot.c | 10 +- + fs/ecryptfs/main.c | 23 ++--- + fs/efs/namei.c | 32 +------ + fs/exportfs/expfs.c | 16 ++-- + fs/ext2/dir.c | 14 ++-- + fs/ext2/ext2.h | 4 +- + fs/ext2/namei.c | 30 ++----- + fs/ext3/namei.c | 84 +++++++---------- + fs/ext3/super.c | 22 ++-- + fs/ext4/namei.c | 14 +--- + fs/ext4/super.c | 22 ++-- + fs/fat/inode.c | 52 ++++------- + fs/fuse/inode.c | 23 ++--- + fs/gfs2/ops_export.c | 33 ++----- + fs/gfs2/ops_inode.c | 2 +- + fs/hpfs/file.c | 2 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/inode.c | 29 ++++-- + fs/hpfs/namei.c | 2 +- + fs/isofs/export.c | 33 +------ + fs/jffs2/super.c | 48 ++++++++++ + fs/jfs/namei.c | 15 +--- + fs/libfs.c | 26 +----- + fs/namei.c | 75 +++++++-------- + fs/namespace.c | 126 ++++++++++++------------- + fs/nfs/dir.c | 6 +- + fs/nfs/getroot.c | 6 +- + fs/nfsd/export.c | 125 ++++++++++++------------- + fs/nfsd/nfs4recover.c | 50 +++++----- + fs/nfsd/nfs4state.c | 8 +- + fs/nfsd/nfsctl.c | 8 +- + fs/nfsd/vfs.c | 125 ++++++++++++++++++++++--- + fs/ntfs/namei.c | 111 +--------------------- + fs/ocfs2/export.c | 30 +----- + fs/proc/generic.c | 1 + + fs/read_write.c | 58 ++++++++---- + fs/readdir.c | 30 +++--- + fs/reiserfs/inode.c | 13 +-- + fs/reiserfs/namei.c | 11 +-- + fs/reiserfs/super.c | 18 ++-- + fs/seq_file.c | 11 ++- + fs/udf/namei.c | 17 +--- + fs/xfs/linux-2.6/xfs_export.c | 32 +------ + fs/xfs/linux-2.6/xfs_file.c | 129 +------------------------- + fs/xfs/linux-2.6/xfs_ioctl.c | 3 +- + fs/xfs/linux-2.6/xfs_iops.c | 2 +- + include/linux/dcache.h | 4 +- + include/linux/namei.h | 7 +- + kernel/audit_tree.c | 48 +++++----- + net/unix/af_unix.c | 18 ++-- + 64 files changed, 783 insertions(+), 1087 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Auto-merged MAINTAINERS +Removed include/sound/cs4231.h +Auto-merged sound/core/init.c +Auto-merged sound/core/sound.c +Removed sound/isa/cs423x/cs4231_lib.c +Auto-merged sound/mips/au1x00.c +Removed sound/oss/hal2.c +Removed sound/oss/hal2.h +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 41 +- + .../sound/alsa/DocBook/writing-an-alsa-driver.tmpl | 62 +- + MAINTAINERS | 2 + + drivers/media/video/saa7134/saa7134-alsa.c | 13 +- + include/sound/ad1848.h | 218 -- + include/sound/asound.h | 3 +- + include/sound/asoundef.h | 89 +- + include/sound/core.h | 30 +- + include/sound/cs4231.h | 175 -- + include/sound/jack.h | 75 + + include/sound/memalloc.h | 16 +- + include/sound/minors.h | 2 + + include/sound/pcm.h | 39 +- + include/sound/sb.h | 5 + + include/sound/snd_wavefront.h | 1 - + include/sound/soc-of-simple.h | 25 + + include/sound/soc.h | 74 +- + include/sound/version.h | 2 +- + include/sound/vx_core.h | 9 - + include/sound/wss.h | 235 ++ + sound/aoa/codecs/snd-aoa-codec-tas.c | 6 +- + sound/arm/sa11xx-uda1341.c | 5 +- + sound/core/Kconfig | 6 + + sound/core/Makefile | 1 + + sound/core/control.c | 50 +- + sound/core/control_compat.c | 3 +- + sound/core/device.c | 26 +- + sound/core/hwdep.c | 16 +- + sound/core/info.c | 23 +- + sound/core/info_oss.c | 6 +- + sound/core/init.c | 3 +- + sound/core/jack.c | 163 ++ + sound/core/memalloc.c | 56 +- + sound/core/oss/copy.c | 30 +- + sound/core/oss/io.c | 24 +- + sound/core/oss/linear.c | 29 +- + sound/core/oss/mixer_oss.c | 18 +- + sound/core/oss/mulaw.c | 27 +- + sound/core/oss/pcm_oss.c | 52 +- + sound/core/oss/pcm_plugin.c | 38 +- + sound/core/oss/rate.c | 42 +- + sound/core/oss/route.c | 12 +- + sound/core/pcm.c | 84 +- + sound/core/pcm_compat.c | 3 +- + sound/core/pcm_lib.c | 102 +- + sound/core/pcm_memory.c | 40 +- + sound/core/pcm_native.c | 127 +- + sound/core/pcm_timer.c | 6 +- + sound/core/rawmidi.c | 25 +- + sound/core/rtctimer.c | 6 +- + sound/core/seq/oss/seq_oss.c | 12 +- + sound/core/seq/oss/seq_oss_synth.c | 6 +- + sound/core/seq/seq_clientmgr.c | 30 +- + sound/core/seq/seq_compat.c | 3 +- + sound/core/seq/seq_device.c | 6 +- + sound/core/seq/seq_fifo.c | 15 +- + sound/core/seq/seq_memory.c | 12 +- + sound/core/seq/seq_midi.c | 15 +- + sound/core/seq/seq_ports.c | 13 +- + sound/core/seq/seq_prioq.c | 4 +- + sound/core/seq/seq_queue.c | 6 +- + sound/core/seq/seq_timer.c | 24 +- + sound/core/sgbuf.c | 62 +- + sound/core/sound.c | 14 +- + sound/core/sound_oss.c | 12 +- + sound/core/timer.c | 33 +- + sound/core/timer_compat.c | 9 +- + sound/drivers/dummy.c | 41 +- + sound/drivers/opl3/opl3_lib.c | 6 +- + sound/drivers/opl3/opl3_midi.c | 6 +- + sound/drivers/opl3/opl3_oss.c | 15 +- + sound/drivers/opl3/opl3_synth.c | 3 +- + sound/drivers/opl4/opl4_synth.c | 2 +- + sound/drivers/vx/vx_cmd.c | 3 +- + sound/drivers/vx/vx_core.c | 21 +- + sound/drivers/vx/vx_hwdep.c | 6 +- + sound/drivers/vx/vx_mixer.c | 3 +- + sound/drivers/vx/vx_pcm.c | 9 +- + sound/drivers/vx/vx_uer.c | 6 +- + sound/i2c/cs8427.c | 15 +- + sound/i2c/i2c.c | 6 +- + sound/i2c/l3/uda1341.c | 3 +- + sound/i2c/other/ak4114.c | 3 +- + sound/i2c/other/ak4117.c | 3 +- + sound/i2c/other/ak4xxx-adda.c | 4 +- + sound/isa/Kconfig | 42 +- + sound/isa/Makefile | 2 +- + sound/isa/ad1816a/ad1816a.c | 4 +- + sound/isa/ad1816a/ad1816a_lib.c | 6 +- + sound/isa/ad1848/Makefile | 2 - + sound/isa/ad1848/ad1848.c | 17 +- + sound/isa/ad1848/ad1848_lib.c | 1267 ----------- + sound/isa/azt2320.c | 29 +- + sound/isa/cmi8330.c | 106 +- + sound/isa/cs423x/Makefile | 2 - + sound/isa/cs423x/cs4231.c | 18 +- + sound/isa/cs423x/cs4231_lib.c | 1945 ---------------- + sound/isa/cs423x/cs4236.c | 51 +- + sound/isa/cs423x/cs4236_lib.c | 349 ++-- + sound/isa/es1688/es1688_lib.c | 3 +- + sound/isa/gus/gus_main.c | 6 +- + sound/isa/gus/gus_mixer.c | 6 +- + sound/isa/gus/gus_pcm.c | 12 +- + sound/isa/gus/gusmax.c | 50 +- + sound/isa/gus/interwave.c | 67 +- + sound/isa/opl3sa2.c | 99 +- + sound/isa/opti9xx/miro.c | 28 +- + sound/isa/opti9xx/opti92x-ad1848.c | 70 +- + sound/isa/sb/emu8000.c | 3 +- + sound/isa/sb/emu8000_patch.c | 3 +- + sound/isa/sb/sb16_csp.c | 9 +- + sound/isa/sb/sb16_main.c | 3 +- + sound/isa/sb/sb8_main.c | 8 +- + sound/isa/sb/sb_common.c | 3 +- + sound/isa/sb/sb_mixer.c | 9 +- + sound/isa/sc6000.c | 18 +- + sound/isa/sgalaxy.c | 43 +- + sound/isa/sscape.c | 63 +- + sound/isa/wavefront/wavefront.c | 62 +- + sound/isa/wavefront/wavefront_fx.c | 8 +- + sound/isa/wavefront/wavefront_midi.c | 24 +- + sound/isa/wavefront/wavefront_synth.c | 7 +- + sound/isa/wss/Makefile | 10 + + sound/isa/wss/wss_lib.c | 2322 ++++++++++++++++++++ + sound/mips/au1x00.c | 6 +- + sound/oss/Kconfig | 7 - + sound/oss/Makefile | 1 - + sound/oss/hal2.c | 1558 ------------- + sound/oss/hal2.h | 248 --- + sound/oss/mpu401.c | 2 +- + sound/parisc/harmony.c | 3 +- + sound/pci/Kconfig | 22 +- + sound/pci/ac97/ac97_codec.c | 39 +- + sound/pci/ac97/ac97_patch.c | 8 + + sound/pci/ad1889.c | 6 +- + sound/pci/ak4531_codec.c | 10 +- + sound/pci/als4000.c | 391 +++- + sound/pci/atiixp.c | 10 +- + sound/pci/atiixp_modem.c | 10 +- + sound/pci/au88x0/au88x0.h | 7 +- + sound/pci/au88x0/au88x0_core.c | 40 +- + sound/pci/au88x0/au88x0_pcm.c | 14 +- + sound/pci/azt3328.c | 6 +- + sound/pci/bt87x.c | 5 +- + sound/pci/ca0106/ca_midi.c | 20 +- + sound/pci/cmipci.c | 9 +- + sound/pci/cs4281.c | 13 +- + sound/pci/cs46xx/cs46xx_lib.c | 72 +- + sound/pci/cs46xx/dsp_spos.c | 51 +- + sound/pci/cs46xx/dsp_spos_scb_lib.c | 115 +- + sound/pci/echoaudio/darla20_dsp.c | 3 +- + sound/pci/echoaudio/darla24_dsp.c | 8 +- + sound/pci/echoaudio/echo3g_dsp.c | 9 +- + sound/pci/echoaudio/echoaudio.c | 22 +- + sound/pci/echoaudio/echoaudio_3g.c | 11 +- + sound/pci/echoaudio/echoaudio_dsp.c | 21 +- + sound/pci/echoaudio/echoaudio_gml.c | 6 +- + sound/pci/echoaudio/gina20_dsp.c | 6 +- + sound/pci/echoaudio/gina24_dsp.c | 11 +- + sound/pci/echoaudio/indigo_dsp.c | 8 +- + sound/pci/echoaudio/indigodj_dsp.c | 8 +- + sound/pci/echoaudio/indigoio_dsp.c | 8 +- + sound/pci/echoaudio/layla20_dsp.c | 9 +- + sound/pci/echoaudio/layla24_dsp.c | 11 +- + sound/pci/echoaudio/mia_dsp.c | 13 +- + sound/pci/echoaudio/midi.c | 6 +- + sound/pci/echoaudio/mona_dsp.c | 6 +- + sound/pci/emu10k1/emu10k1_callback.c | 6 +- + sound/pci/emu10k1/emu10k1_patch.c | 23 +- + sound/pci/emu10k1/emu10k1x.c | 18 +- + sound/pci/emu10k1/emufx.c | 6 +- + sound/pci/emu10k1/emumpu401.c | 18 +- + sound/pci/emu10k1/memory.c | 31 +- + sound/pci/emu10k1/voice.c | 9 +- + sound/pci/es1938.c | 3 +- + sound/pci/es1968.c | 6 +- + sound/pci/hda/Makefile | 1 + + sound/pci/hda/hda_beep.c | 134 ++ + sound/pci/hda/hda_beep.h | 44 + + sound/pci/hda/hda_codec.c | 29 +- + sound/pci/hda/hda_codec.h | 92 +- + sound/pci/hda/hda_generic.c | 3 +- + sound/pci/hda/hda_intel.c | 14 +- + sound/pci/hda/hda_proc.c | 23 +- + sound/pci/hda/patch_analog.c | 80 +- + sound/pci/hda/patch_atihdmi.c | 45 +- + sound/pci/hda/patch_realtek.c | 87 +- + sound/pci/hda/patch_sigmatel.c | 485 ++++- + sound/pci/ice1712/ak4xxx.c | 3 +- + sound/pci/ice1712/delta.h | 1 + + sound/pci/ice1712/ews.c | 9 +- + sound/pci/ice1712/ice1712.c | 3 +- + sound/pci/ice1712/ice1724.c | 3 +- + sound/pci/ice1712/juli.c | 3 +- + sound/pci/ice1712/phase.c | 12 + + sound/pci/ice1712/phase.h | 4 +- + sound/pci/ice1712/revo.c | 17 +- + sound/pci/intel8x0.c | 10 +- + sound/pci/intel8x0m.c | 3 +- + sound/pci/korg1212/korg1212.c | 9 +- + sound/pci/maestro3.c | 10 +- + sound/pci/mixart/mixart.c | 4 +- + sound/pci/mixart/mixart_core.c | 18 +- + sound/pci/mixart/mixart_hwdep.c | 19 +- + sound/pci/mixart/mixart_mixer.c | 8 +- + sound/pci/nm256/nm256.c | 15 +- + sound/pci/pcxhr/pcxhr.c | 6 +- + sound/pci/pcxhr/pcxhr_core.c | 27 +- + sound/pci/pcxhr/pcxhr_hwdep.c | 15 +- + sound/pci/riptide/riptide.c | 31 +- + sound/pci/rme9652/hdsp.c | 25 +- + sound/pci/rme9652/hdspm.c | 52 +- + sound/pci/rme9652/rme9652.c | 23 +- + sound/pci/sonicvibes.c | 10 +- + sound/pci/trident/trident_main.c | 22 +- + sound/pci/trident/trident_memory.c | 37 +- + sound/pci/via82xx.c | 60 +- + sound/pci/via82xx_modem.c | 8 +- + sound/pci/vx222/vx222_ops.c | 12 +- + sound/pci/ymfpci/ymfpci_main.c | 21 +- + sound/pcmcia/vx/vxp_ops.c | 3 +- + sound/ppc/awacs.c | 23 +- + sound/ppc/beep.c | 6 +- + sound/ppc/tumbler.c | 17 +- + sound/sh/aica.c | 3 +- + sound/soc/codecs/Kconfig | 38 + + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ad1980.c | 309 +++ + sound/soc/codecs/ad1980.h | 23 + + sound/soc/codecs/cs4270.c | 71 +- + sound/soc/codecs/tlv320aic26.c | 520 +++++ + sound/soc/codecs/tlv320aic26.h | 96 + + sound/soc/codecs/wm8580.c | 1055 +++++++++ + sound/soc/codecs/wm8580.h | 42 + + sound/soc/codecs/wm8900.c | 1542 +++++++++++++ + sound/soc/codecs/wm8900.h | 64 + + sound/soc/fsl/Kconfig | 10 + + sound/soc/fsl/Makefile | 5 + + sound/soc/fsl/mpc5200_psc_i2s.c | 884 ++++++++ + sound/soc/fsl/mpc8610_hpcd.c | 26 +- + sound/soc/fsl/soc-of-simple.c | 171 ++ + sound/soc/pxa/pxa2xx-pcm.c | 4 +- + sound/soc/soc-core.c | 132 +- + sound/soc/soc-dapm.c | 66 +- + sound/sparc/amd7930.c | 19 +- + sound/sparc/cs4231.c | 3 +- + sound/sparc/dbri.c | 17 +- + sound/synth/emux/emux.c | 8 +- + sound/synth/emux/emux_nrpn.c | 8 +- + sound/synth/emux/emux_oss.c | 42 +- + sound/synth/emux/emux_seq.c | 15 +- + sound/synth/emux/emux_synth.c | 47 +- + sound/synth/util_mem.c | 10 +- + sound/usb/Kconfig | 11 + + sound/usb/Makefile | 1 + + sound/usb/usbaudio.c | 19 +- + sound/usb/usbaudio.h | 4 +- + sound/usb/usbmidi.c | 39 + + sound/usb/usbmixer.c | 19 +- + sound/usb/usbquirks.h | 31 +- + sound/usb/usx2y/Makefile | 2 + + sound/usb/usx2y/us122l.c | 692 ++++++ + sound/usb/usx2y/us122l.h | 27 + + sound/usb/usx2y/usb_stream.c | 761 +++++++ + sound/usb/usx2y/usb_stream.h | 112 + + 265 files changed, 13303 insertions(+), 7550 deletions(-) + delete mode 100644 include/sound/cs4231.h + create mode 100644 include/sound/jack.h + create mode 100644 include/sound/soc-of-simple.h + create mode 100644 include/sound/wss.h + create mode 100644 sound/core/jack.c + delete mode 100644 sound/isa/cs423x/cs4231_lib.c + create mode 100644 sound/isa/wss/Makefile + create mode 100644 sound/isa/wss/wss_lib.c + delete mode 100644 sound/oss/hal2.c + delete mode 100644 sound/oss/hal2.h + create mode 100644 sound/pci/hda/hda_beep.c + create mode 100644 sound/pci/hda/hda_beep.h + create mode 100644 sound/soc/codecs/ad1980.c + create mode 100644 sound/soc/codecs/ad1980.h + create mode 100644 sound/soc/codecs/tlv320aic26.c + create mode 100644 sound/soc/codecs/tlv320aic26.h + create mode 100644 sound/soc/codecs/wm8580.c + create mode 100644 sound/soc/codecs/wm8580.h + create mode 100644 sound/soc/codecs/wm8900.c + create mode 100644 sound/soc/codecs/wm8900.h + create mode 100644 sound/soc/fsl/mpc5200_psc_i2s.c + create mode 100644 sound/soc/fsl/soc-of-simple.c + create mode 100644 sound/usb/usx2y/us122l.c + create mode 100644 sound/usb/usx2y/us122l.h + create mode 100644 sound/usb/usx2y/usb_stream.c + create mode 100644 sound/usb/usx2y/usb_stream.h +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merged arch/x86/kernel/cpu/cpufreq/elanfreq.c +Auto-merged drivers/cpufreq/cpufreq_conservative.c +Auto-merged include/linux/tick.h +Auto-merged kernel/time/tick-sched.c +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 13 ++- + arch/x86/kernel/cpu/cpufreq/elanfreq.c | 42 ++++---- + arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 41 ++++---- + drivers/cpufreq/cpufreq.c | 30 ++++-- + drivers/cpufreq/cpufreq_conservative.c | 1 + + drivers/cpufreq/cpufreq_ondemand.c | 140 ++++++++++++++++++++-------- + include/linux/cpufreq.h | 7 +- + include/linux/tick.h | 2 +- + kernel/time/tick-sched.c | 11 ++- + 9 files changed, 186 insertions(+), 101 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Merge made by recursive. + Documentation/lguest/lguest.c | 8 ++++++++ + drivers/lguest/lguest_device.c | 8 ++++++++ + drivers/virtio/virtio_balloon.c | 2 +- + drivers/xen/manage.c | 2 +- + include/linux/stop_machine.h | 19 +------------------ + 5 files changed, 19 insertions(+), 20 deletions(-) +Merging cifs/master +$ git merge cifs/master +Auto-merged fs/Kconfig +Merge made by recursive. + fs/Kconfig | 1 - + fs/cifs/README | 30 ++++++++++++++++++++++++++---- + fs/cifs/asn1.c | 11 ++++++++--- + fs/cifs/cifs_spnego.c | 4 +++- + fs/cifs/cifsglob.h | 3 ++- + fs/cifs/connect.c | 33 +++++++++++++++++---------------- + fs/cifs/inode.c | 3 ++- + fs/cifs/sess.c | 2 +- + 8 files changed, 59 insertions(+), 28 deletions(-) +Merging mmc/next +$ git merge mmc/next +Merge made by recursive. + drivers/mmc/core/sdio_io.c | 249 +++++++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/sdhci.c | 39 ++++++- + include/linux/mmc/sdio_func.h | 41 +++++++- + 3 files changed, 322 insertions(+), 7 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Auto-merged fs/gfs2/ops_inode.c +Merge made by recursive. + fs/gfs2/glock.c | 11 +- + fs/gfs2/incore.h | 7 +- + fs/gfs2/mount.c | 7 + + fs/gfs2/ops_fstype.c | 566 ++++++++++++++++++++++++++++++++++---------------- + fs/gfs2/ops_inode.c | 56 ++++-- + fs/gfs2/ops_super.c | 57 +++++- + fs/gfs2/super.c | 340 ------------------------------ + fs/gfs2/super.h | 6 - + 8 files changed, 492 insertions(+), 558 deletions(-) +Merging input/next +$ git merge input/next +Auto-merged drivers/input/keyboard/bf54x-keys.c +Auto-merged drivers/input/keyboard/gpio_keys.c +Auto-merged drivers/input/tablet/aiptek.c +Auto-merged include/linux/mod_devicetable.h +Merge made by recursive. + drivers/input/gameport/gameport.c | 88 +++- + drivers/input/joystick/a3d.c | 3 +- + drivers/input/joystick/adi.c | 3 +- + drivers/input/joystick/analog.c | 4 +- + drivers/input/joystick/cobra.c | 3 +- + drivers/input/joystick/gf2k.c | 3 +- + drivers/input/joystick/grip.c | 3 +- + drivers/input/joystick/grip_mp.c | 3 +- + drivers/input/joystick/guillemot.c | 3 +- + drivers/input/joystick/interact.c | 3 +- + drivers/input/joystick/joydump.c | 3 +- + drivers/input/joystick/sidewinder.c | 3 +- + drivers/input/joystick/tmdc.c | 3 +- + drivers/input/keyboard/atkbd.c | 30 +- + drivers/input/keyboard/bf54x-keys.c | 13 +- + drivers/input/keyboard/gpio_keys.c | 42 +- + drivers/input/misc/Kconfig | 13 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ati_remote2.c | 263 ++++++++-- + drivers/input/misc/cm109.c | 884 ++++++++++++++++++++++++++++++ + drivers/input/misc/wistron_btns.c | 19 + + drivers/input/mouse/appletouch.c | 299 ++++++++--- + drivers/input/mouse/logips2pp.c | 4 +- + drivers/input/mouse/psmouse-base.c | 12 +- + drivers/input/mouse/trackpoint.c | 8 +- + drivers/input/tablet/aiptek.c | 53 ++- + drivers/input/touchscreen/ads7846.c | 6 +- + drivers/input/touchscreen/atmel_tsadcc.c | 37 +- + include/linux/gameport.h | 7 +- + include/linux/input.h | 15 +- + include/linux/mod_devicetable.h | 2 +- + 31 files changed, 1575 insertions(+), 258 deletions(-) + create mode 100644 drivers/input/misc/cm109.c +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged arch/arm/mach-lh7a40x/clocks.c +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/bonding/bond_sysfs.c +Auto-merged drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Merge made by recursive. + arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- + drivers/net/bonding/bond_main.c | 21 +++++++++++---------- + drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- + drivers/net/ppp_async.c | 8 ++++---- + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- + include/net/bluetooth/hci_core.h | 7 ++++--- + net/9p/trans_virtio.c | 21 +++++++++++---------- + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- + 11 files changed, 69 insertions(+), 63 deletions(-) +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged drivers/infiniband/core/ucma.c +Merge made by recursive. +Merging trivial/next +$ git merge trivial/next +Auto-merged Documentation/edac.txt +CONFLICT (content): Merge conflict in Documentation/edac.txt +Auto-merged arch/mips/kernel/vpe.c +Auto-merged drivers/base/sys.c +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/net/spider_net.c +Auto-merged drivers/serial/mpc52xx_uart.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged fs/jffs2/fs.c +Auto-merged fs/ntfs/aops.c +Auto-merged fs/proc/nommu.c +Auto-merged include/linux/securebits.h +CONFLICT (content): Merge conflict in include/linux/securebits.h +Auto-merged mm/migrate.c +Auto-merged mm/slub.c +Auto-merged net/wireless/wext.c +Resolved 'Documentation/edac.txt' using previous resolution. +Resolved 'include/linux/securebits.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit abfde90: Merge commit 'trivial/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/hfs.txt | 2 +- + Documentation/ja_JP/SubmittingPatches | 4 ++-- + Documentation/zh_CN/SubmittingPatches | 4 ++-- + arch/mips/kernel/vpe.c | 2 +- + arch/sh/lib64/c-checksum.c | 4 ++-- + drivers/base/sys.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/net/spider_net.c | 2 +- + drivers/serial/mpc52xx_uart.c | 4 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/proc/nommu.c | 2 +- + mm/migrate.c | 2 +- + mm/slub.c | 4 ++-- + net/wireless/wext.c | 2 +- + 19 files changed, 24 insertions(+), 24 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Merge made by recursive. + fs/ubifs/dir.c | 1 - + fs/ubifs/file.c | 20 ++++++++++++++++---- + 2 files changed, 16 insertions(+), 5 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merged Documentation/DocBook/kernel-api.tmpl +Auto-merged block/blk-core.c +Auto-merged block/blk-settings.c +Auto-merged block/genhd.c +Auto-merged include/linux/fs.h +Merge made by recursive. + Documentation/block/deadline-iosched.txt | 14 +++- + block/blk-barrier.c | 71 +++++++++++++++++++- + block/blk-core.c | 50 ++++++++------ + block/blk-merge.c | 109 ++++-------------------------- + block/blk-settings.c | 17 +++++ + block/blktrace.c | 29 ++------ + block/compat_ioctl.c | 1 + + block/deadline-iosched.c | 40 +++++------- + block/elevator.c | 14 +++- + block/ioctl.c | 76 +++++++++++++++++++++ + drivers/block/ps3disk.c | 9 ++- + drivers/block/virtio_blk.c | 4 +- + drivers/md/raid1.c | 4 - + drivers/md/raid10.c | 4 - + drivers/md/raid5.c | 66 ++++++++++++++---- + drivers/mtd/ftl.c | 24 +++++++ + drivers/mtd/mtd_blkdevs.c | 16 +++++ + fs/bio.c | 16 +---- + fs/fat/fatent.c | 14 ++++ + include/linux/bio.h | 55 +++++---------- + include/linux/blkdev.h | 42 +++++++---- + include/linux/blktrace_api.h | 4 + + include/linux/fs.h | 5 +- + include/linux/mtd/blktrans.h | 2 + + mm/bounce.c | 2 +- + 25 files changed, 421 insertions(+), 267 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/av7110.c +Removed drivers/media/dvb/ttpci/fdump.c +Removed drivers/net/acenic_firmware.h +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Removed drivers/scsi/qlogicpti_asm.c +Merge made by recursive. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 --------------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 789 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +------ + drivers/scsi/ql1040_fw.h | 2130 -------- + drivers/scsi/ql12160_fw.h | 1811 ------- + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 19 + + firmware/WHENCE | 109 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 ++ + firmware/advansys/38C0800.bin.ihex | 336 ++ + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 ++++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 +++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + 45 files changed, 19549 insertions(+), 19733 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex +Merging pcmcia/master +$ git merge pcmcia/master +Auto-merged drivers/bluetooth/bt3c_cs.c +Auto-merged drivers/char/pcmcia/cm4000_cs.c +Auto-merged drivers/char/pcmcia/cm4040_cs.c +Auto-merged drivers/ide/legacy/ide-cs.c +Auto-merged drivers/net/wireless/orinoco_cs.c +Auto-merged drivers/net/wireless/spectrum_cs.c +Auto-merged drivers/net/wireless/wavelan_cs.c +Auto-merged drivers/net/wireless/wl3501_cs.c +Auto-merged drivers/pcmcia/Makefile +Auto-merged drivers/pcmcia/rsrc_nonstatic.c +Auto-merged drivers/pcmcia/soc_common.c +Auto-merged drivers/scsi/pcmcia/nsp_cs.c +Merge made by recursive. + Documentation/pcmcia/driver-changes.txt | 6 + + drivers/ata/pata_pcmcia.c | 168 ++++++-------- + drivers/bluetooth/bluecard_cs.c | 8 +- + drivers/bluetooth/bt3c_cs.c | 125 ++++------ + drivers/bluetooth/btuart_cs.c | 126 ++++------ + drivers/bluetooth/dtl1_cs.c | 67 ++---- + drivers/char/pcmcia/cm4000_cs.c | 73 ++---- + drivers/char/pcmcia/cm4040_cs.c | 80 +++---- + drivers/char/pcmcia/ipwireless/main.c | 46 ++--- + drivers/ide/legacy/ide-cs.c | 158 ++++++------- + drivers/isdn/hardware/avm/avm_cs.c | 85 ++----- + drivers/isdn/hisax/avma1_cs.c | 81 ++----- + drivers/isdn/hisax/elsa_cs.c | 79 ++----- + drivers/isdn/hisax/sedlbauer_cs.c | 197 ++++++++--------- + drivers/isdn/hisax/teles_cs.c | 79 ++----- + drivers/mtd/maps/pcmciamtd.c | 29 +-- + drivers/net/pcmcia/3c574_cs.c | 7 +- + drivers/net/pcmcia/3c589_cs.c | 7 +- + drivers/net/pcmcia/axnet_cs.c | 80 +++---- + drivers/net/pcmcia/com20020_cs.c | 8 +- + drivers/net/pcmcia/fmvj18x_cs.c | 19 +- + drivers/net/pcmcia/ibmtr_cs.c | 2 +- + drivers/net/pcmcia/pcnet_cs.c | 86 ++++---- + drivers/net/pcmcia/smc91c92_cs.c | 147 +++++------- + drivers/net/pcmcia/xirc2ps_cs.c | 75 ++++--- + drivers/net/wireless/airo_cs.c | 222 +++++++++--------- + drivers/net/wireless/atmel_cs.c | 119 ++++------ + drivers/net/wireless/b43/pcmcia.c | 14 +- + drivers/net/wireless/hostap/hostap_cs.c | 235 +++++++++----------- + drivers/net/wireless/netwave_cs.c | 5 +- + drivers/net/wireless/orinoco_cs.c | 163 ++++++-------- + drivers/net/wireless/ray_cs.c | 4 +- + drivers/net/wireless/spectrum_cs.c | 162 ++++++-------- + drivers/net/wireless/wavelan_cs.c | 16 +- + drivers/net/wireless/wl3501_cs.c | 4 +- + drivers/parport/parport_cs.c | 70 +++---- + drivers/pcmcia/Makefile | 4 - + drivers/pcmcia/cardbus.c | 2 +- + drivers/pcmcia/cistpl.c | 291 ++++++++++++++---------- + drivers/pcmcia/cs.c | 74 ++++--- + drivers/pcmcia/cs_internal.h | 17 +- + drivers/pcmcia/ds.c | 238 ++++++++----------- + drivers/pcmcia/ds_internal.h | 10 +- + drivers/pcmcia/i82365.c | 2 +- + drivers/pcmcia/m32r_cfc.c | 4 +- + drivers/pcmcia/m32r_pcc.c | 4 +- + drivers/pcmcia/m8xx_pcmcia.c | 4 +- + drivers/pcmcia/o2micro.h | 10 +- + drivers/pcmcia/pcmcia_ioctl.c | 115 ++++++++-- + drivers/pcmcia/pcmcia_resource.c | 380 +++++++++++++++++-------------- + drivers/pcmcia/rsrc_nonstatic.c | 67 +++--- + drivers/pcmcia/soc_common.c | 2 +- + drivers/pcmcia/soc_common.h | 2 +- + drivers/pcmcia/socket_sysfs.c | 13 +- + drivers/pcmcia/tcic.c | 2 +- + drivers/pcmcia/ti113x.h | 78 ++++--- + drivers/pcmcia/yenta_socket.c | 86 ++++---- + drivers/scsi/pcmcia/aha152x_stub.c | 58 +++--- + drivers/scsi/pcmcia/fdomain_stub.c | 37 ++-- + drivers/scsi/pcmcia/nsp_cs.c | 194 ++++++++-------- + drivers/scsi/pcmcia/qlogic_stub.c | 47 ++-- + drivers/scsi/pcmcia/sym53c500_cs.c | 46 ++-- + drivers/serial/serial_cs.c | 300 +++++++++++-------------- + drivers/ssb/pcmcia.c | 22 +- + drivers/telephony/ixj_pcmcia.c | 72 +++---- + drivers/usb/host/sl811_cs.c | 130 +++++------- + include/pcmcia/cistpl.h | 18 +- + include/pcmcia/cs.h | 55 ----- + include/pcmcia/ds.h | 43 ++++- + include/pcmcia/ss.h | 4 +- + 70 files changed, 2460 insertions(+), 2823 deletions(-) +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Already up-to-date. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + drivers/serial/serial_txx9.c | 113 ++++++++++++++++++++++++++++++++++-------- + 1 files changed, 92 insertions(+), 21 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Auto-merged fs/ext3/super.c +Auto-merged fs/ext4/super.c +Auto-merged fs/inode.c +Auto-merged fs/reiserfs/super.c +Auto-merged fs/xfs/linux-2.6/xfs_super.c +Auto-merged include/linux/fs.h +Auto-merged include/linux/mm.h +Auto-merged init/main.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Kconfig.debug +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/ABI/testing/debugfs-kmemtrace | 71 ++++ + Documentation/kernel-parameters.txt | 10 + + Documentation/sysctl/vm.txt | 12 + + Documentation/vm/kmemtrace.txt | 126 +++++++ + Documentation/vm/slabinfo.c | 91 +++++- + MAINTAINERS | 6 + + fs/buffer.c | 99 ++++++ + fs/drop_caches.c | 2 +- + fs/ext2/super.c | 9 + + fs/ext3/super.c | 8 + + fs/ext4/super.c | 8 + + fs/inode.c | 123 +++++++ + fs/proc/inode.c | 8 + + fs/reiserfs/super.c | 8 + + fs/xfs/linux-2.6/xfs_super.c | 2 + + include/linux/fs.h | 6 + + include/linux/kmemtrace.h | 86 +++++ + include/linux/mm.h | 3 +- + include/linux/mmzone.h | 1 + + include/linux/page-flags.h | 2 + + include/linux/slab.h | 61 +++- + include/linux/slab_def.h | 68 ++++- + include/linux/slob_def.h | 9 +- + include/linux/slub_def.h | 69 ++++- + include/linux/swap.h | 3 + + init/main.c | 2 + + kernel/sysctl.c | 20 + + lib/Kconfig.debug | 28 ++ + mm/Makefile | 2 +- + mm/kmemtrace.c | 335 ++++++++++++++++++ + mm/slab.c | 79 ++++- + mm/slob.c | 37 ++- + mm/slub.c | 499 ++++++++++++++++++++++----- + mm/vmscan.c | 64 +++- + mm/vmstat.c | 4 +- + 35 files changed, 1811 insertions(+), 150 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-kmemtrace + create mode 100644 Documentation/vm/kmemtrace.txt + create mode 100644 include/linux/kmemtrace.h + create mode 100644 mm/kmemtrace.c +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/process_32.c +Auto-merged arch/x86/kernel/process_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/traps_64.c +Auto-merged arch/x86/mm/fault.c +Auto-merged include/asm-x86/kdebug.h +Auto-merged include/asm-x86/pgtable.h +Auto-merged include/asm-x86/pgtable_32.h +Auto-merged include/asm-x86/pgtable_64.h +Auto-merged include/asm-x86/string_32.h +Auto-merged include/asm-x86/string_64.h +Auto-merged include/linux/slab.h +Auto-merged include/linux/slab_def.h +Auto-merged init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/sysctl.c +Auto-merged mm/Makefile +CONFLICT (content): Merge conflict in mm/Makefile +Auto-merged mm/slab.c +CONFLICT (content): Merge conflict in mm/slab.c +Auto-merged mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'arch/x86/kernel/process_64.c' using previous resolution. +Resolved 'arch/x86/kernel/traps_64.c' using previous resolution. +Resolved 'init/main.c' using previous resolution. +Resolved 'mm/Makefile' using previous resolution. +Resolved 'mm/slab.c' using previous resolution. +Resolved 'mm/slub.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit cdeb77d: Merge commit 'kmemcheck/auto-kmemcheck-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kmemcheck.txt | 135 ++++++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 109 +++++++++ + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 12 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps_32.c | 11 +- + arch/x86/kernel/traps_64.c | 11 +- + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 ++- + arch/x86/mm/kmemcheck/Makefile | 3 + + arch/x86/mm/kmemcheck/error.c | 216 ++++++++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 ++ + arch/x86/mm/kmemcheck/kmemcheck.c | 485 +++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 72 ++++++ + arch/x86/mm/kmemcheck/opcode.h | 9 + + arch/x86/mm/kmemcheck/pte.c | 22 ++ + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 178 ++++++++++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 ++ + arch/x86/mm/kmemcheck/smp.c | 80 ++++++ + arch/x86/mm/kmemcheck/smp.h | 23 ++ + arch/x86/mm/kmemcheck/string.c | 95 +++++++ + include/asm-x86/kdebug.h | 3 +- + include/asm-x86/kmemcheck.h | 36 +++ + include/asm-x86/pgtable.h | 4 +- + include/asm-x86/pgtable_32.h | 6 + + include/asm-x86/pgtable_64.h | 6 + + include/asm-x86/string_32.h | 8 + + include/asm-x86/string_64.h | 1 + + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 70 ++++++ + include/linux/mm_types.h | 4 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 26 ++- + mm/Makefile | 1 + + mm/kmemcheck.c | 97 ++++++++ + mm/slab.c | 101 ++------- + mm/slub.c | 20 ++- + 46 files changed, 1948 insertions(+), 117 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 arch/x86/mm/kmemcheck/smp.c + create mode 100644 arch/x86/mm/kmemcheck/smp.h + create mode 100644 arch/x86/mm/kmemcheck/string.c + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Merge made by recursive. + drivers/mfd/mfd-core.c | 15 +++++++++++---- + drivers/mfd/sm501.c | 6 +++--- + 2 files changed, 14 insertions(+), 7 deletions(-) +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Removed Documentation/DocBook/wanbook.tmpl +Removed drivers/net/wan/syncppp.c +Removed include/net/syncppp.h +Merge made by recursive. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/networking.tmpl | 3 - + Documentation/DocBook/wanbook.tmpl | 99 -- + Documentation/networking/generic-hdlc.txt | 8 +- + drivers/net/wan/Makefile | 2 +- + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/{hd6457x.c => hd64570.c} | 254 ++---- + drivers/net/wan/hd64572.c | 641 +++++++++++++ + drivers/net/wan/hdlc_ppp.c | 648 ++++++++++++- + drivers/net/wan/n2.c | 9 +- + drivers/net/wan/pc300too.c | 73 +- + drivers/net/wan/pci200syn.c | 77 +- + drivers/net/wan/syncppp.c | 1479 ----------------------------- + include/net/syncppp.h | 102 -- + 14 files changed, 1357 insertions(+), 2046 deletions(-) + delete mode 100644 Documentation/DocBook/wanbook.tmpl + rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%) + create mode 100644 drivers/net/wan/hd64572.c + delete mode 100644 drivers/net/wan/syncppp.c + delete mode 100644 include/net/syncppp.h +Merging drm/drm-next +$ git merge drm/drm-next +Merge made by recursive. + drivers/gpu/drm/Kconfig | 1 + + drivers/gpu/drm/drm_irq.c | 40 +- + drivers/gpu/drm/drm_lock.c | 33 +- + drivers/gpu/drm/i915/Makefile | 2 +- + drivers/gpu/drm/i915/i915_dma.c | 171 +++-- + drivers/gpu/drm/i915/i915_drv.c | 58 +- + drivers/gpu/drm/i915/i915_drv.h | 860 ++-------------------- + drivers/gpu/drm/i915/i915_irq.c | 189 ++++-- + drivers/gpu/drm/i915/i915_opregion.c | 371 +++++++++ + drivers/gpu/drm/i915/i915_reg.h | 1406 ++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/radeon/r300_cmdbuf.c | 196 ++++- + drivers/gpu/drm/radeon/r300_reg.h | 5 +- + drivers/gpu/drm/radeon/radeon_cp.c | 38 +- + drivers/gpu/drm/radeon/radeon_drv.h | 19 +- + drivers/gpu/drm/sis/sis_mm.c | 10 +- + include/drm/drm.h | 17 - + 16 files changed, 2333 insertions(+), 1083 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_opregion.c + create mode 100644 drivers/gpu/drm/i915/i915_reg.h +Merging voltage/reg-for-linus +$ git merge voltage/reg-for-linus +Already up-to-date. +Merging security-testing/next +$ git merge security-testing/next +Auto-merged Documentation/DocBook/kernel-api.tmpl +Auto-merged security/security.c +Auto-merged security/selinux/hooks.c +Merge made by recursive. + security/selinux/hooks.c | 45 ++++++++++-------- + security/selinux/ss/avtab.c | 8 +-- + security/selinux/ss/conditional.c | 18 ++++---- + security/selinux/ss/conditional.h | 2 +- + security/selinux/ss/ebitmap.c | 4 +- + security/selinux/ss/hashtab.c | 6 +- + security/selinux/ss/mls.c | 14 +++--- + security/selinux/ss/policydb.c | 20 ++++---- + security/selinux/ss/services.c | 8 ++-- + security/selinux/ss/sidtab.c | 12 ++-- + security/smack/smack.h | 1 + + security/smack/smack_access.c | 10 ++++- + security/smack/smackfs.c | 92 +++++++++++++++++++++++++++++++++++++ + 13 files changed, 173 insertions(+), 67 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merged drivers/char/istallion.c +Auto-merged drivers/char/stallion.c +Auto-merged drivers/char/tty_io.c +CONFLICT (content): Merge conflict in drivers/char/tty_io.c +Auto-merged drivers/char/vt.c +CONFLICT (content): Merge conflict in drivers/char/vt.c +Auto-merged drivers/net/usb/hso.c +CONFLICT (content): Merge conflict in drivers/net/usb/hso.c +Auto-merged drivers/serial/Kconfig +Removed drivers/serial/mcfserial.c +Removed drivers/serial/mcfserial.h +Auto-merged drivers/usb/serial/aircable.c +CONFLICT (content): Merge conflict in drivers/usb/serial/aircable.c +Auto-merged drivers/usb/serial/belkin_sa.c +Auto-merged drivers/usb/serial/cyberjack.c +Auto-merged drivers/usb/serial/cypress_m8.c +Auto-merged drivers/usb/serial/digi_acceleport.c +Auto-merged drivers/usb/serial/empeg.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged drivers/usb/serial/garmin_gps.c +Auto-merged drivers/usb/serial/io_edgeport.c +Auto-merged drivers/usb/serial/io_ti.c +Auto-merged drivers/usb/serial/ipaq.c +Auto-merged drivers/usb/serial/ipw.c +Auto-merged drivers/usb/serial/ir-usb.c +Auto-merged drivers/usb/serial/iuu_phoenix.c +Auto-merged drivers/usb/serial/keyspan.c +Auto-merged drivers/usb/serial/keyspan_pda.c +CONFLICT (content): Merge conflict in drivers/usb/serial/keyspan_pda.c +Auto-merged drivers/usb/serial/kl5kusb105.c +Auto-merged drivers/usb/serial/kobil_sct.c +Auto-merged drivers/usb/serial/mct_u232.c +Auto-merged drivers/usb/serial/mos7720.c +Auto-merged drivers/usb/serial/mos7840.c +Auto-merged drivers/usb/serial/omninet.c +Auto-merged drivers/usb/serial/option.c +Auto-merged drivers/usb/serial/pl2303.c +Auto-merged drivers/usb/serial/safe_serial.c +CONFLICT (content): Merge conflict in drivers/usb/serial/safe_serial.c +Auto-merged drivers/usb/serial/sierra.c +Auto-merged drivers/usb/serial/spcp8x5.c +Auto-merged drivers/usb/serial/ti_usb_3410_5052.c +Auto-merged drivers/usb/serial/usb-serial.c +Auto-merged drivers/usb/serial/visor.c +Auto-merged drivers/usb/serial/whiteheat.c +Auto-merged fs/dquot.c +Auto-merged include/asm-x86/ioctls.h +Auto-merged kernel/fork.c +Auto-merged kernel/printk.c +Auto-merged kernel/sys.c +Resolved 'drivers/net/usb/hso.c' using previous resolution. +Resolved 'drivers/usb/serial/aircable.c' using previous resolution. +Resolved 'drivers/usb/serial/keyspan_pda.c' using previous resolution. +Resolved 'drivers/usb/serial/safe_serial.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/feature-removal-schedule.txt'. +Recorded resolution for 'drivers/char/tty_io.c'. +Recorded resolution for 'drivers/char/vt.c'. +Created commit bb008bb: Merge branch 'quilt/ttydev' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 - + arch/blackfin/kernel/bfin_dma_5xx.c | 13 +- + arch/um/drivers/line.c | 2 + + drivers/char/Kconfig | 4 +- + drivers/char/Makefile | 2 +- + drivers/char/cyclades.c | 21 +- + drivers/char/epca.c | 5 +- + drivers/char/isicom.c | 61 +- + drivers/char/istallion.c | 107 +- + drivers/char/moxa.c | 61 +- + drivers/char/mxser.c | 192 ++- + drivers/char/pty.c | 91 +- + drivers/char/stallion.c | 105 +- + drivers/char/sx.c | 4 +- + drivers/char/tty_buffer.c | 511 ++++++ + drivers/char/tty_io.c | 904 ++-------- + drivers/char/tty_ioctl.c | 130 ++- + drivers/char/tty_port.c | 96 + + drivers/char/vt.c | 80 +- + drivers/char/vt_ioctl.c | 2 + + drivers/net/usb/hso.c | 44 +- + drivers/serial/68328serial.c | 11 +- + drivers/serial/8250.c | 83 +- + drivers/serial/Kconfig | 16 +- + drivers/serial/Makefile | 1 - + drivers/serial/bfin_5xx.c | 123 +- + drivers/serial/mcfserial.c | 1965 --------------------- + drivers/serial/mcfserial.h | 74 - + drivers/usb/serial/aircable.c | 12 +- + drivers/usb/serial/belkin_sa.c | 3 +- + drivers/usb/serial/console.c | 8 +- + drivers/usb/serial/cyberjack.c | 3 +- + drivers/usb/serial/cypress_m8.c | 5 +- + drivers/usb/serial/digi_acceleport.c | 19 +- + drivers/usb/serial/empeg.c | 8 +- + drivers/usb/serial/ftdi_sio.c | 19 +- + drivers/usb/serial/garmin_gps.c | 3 +- + drivers/usb/serial/generic.c | 3 +- + drivers/usb/serial/io_edgeport.c | 43 +- + drivers/usb/serial/io_ti.c | 26 +- + drivers/usb/serial/ipaq.c | 3 +- + drivers/usb/serial/ipw.c | 3 +- + drivers/usb/serial/ir-usb.c | 3 +- + drivers/usb/serial/iuu_phoenix.c | 3 +- + drivers/usb/serial/keyspan.c | 77 +- + drivers/usb/serial/keyspan_pda.c | 11 +- + drivers/usb/serial/kl5kusb105.c | 3 +- + drivers/usb/serial/kobil_sct.c | 3 +- + drivers/usb/serial/mct_u232.c | 6 +- + drivers/usb/serial/mos7720.c | 36 +- + drivers/usb/serial/mos7840.c | 7 +- + drivers/usb/serial/navman.c | 3 +- + drivers/usb/serial/omninet.c | 10 +- + drivers/usb/serial/option.c | 18 +- + drivers/usb/serial/oti6858.c | 3 +- + drivers/usb/serial/pl2303.c | 4 +- + drivers/usb/serial/safe_serial.c | 11 +- + drivers/usb/serial/sierra.c | 16 +- + drivers/usb/serial/spcp8x5.c | 3 +- + drivers/usb/serial/ti_usb_3410_5052.c | 44 +- + drivers/usb/serial/usb-serial.c | 24 +- + drivers/usb/serial/visor.c | 18 +- + drivers/usb/serial/whiteheat.c | 8 +- + fs/dquot.c | 6 +- + fs/open.c | 3 +- + include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 6 +- + include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 4 +- + include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 6 +- + include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 6 +- + include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 4 +- + include/asm-x86/ioctls.h | 6 + + include/linux/serial.h | 16 + + include/linux/termios.h | 15 + + include/linux/tty.h | 38 +- + include/linux/tty_driver.h | 15 + + include/linux/vt_kern.h | 2 +- + kernel/acct.c | 2 +- + kernel/auditsc.c | 10 +- + kernel/fork.c | 5 +- + kernel/printk.c | 16 - + kernel/sys.c | 4 +- + 81 files changed, 1921 insertions(+), 3428 deletions(-) + create mode 100644 drivers/char/tty_buffer.c + create mode 100644 drivers/char/tty_port.c + delete mode 100644 drivers/serial/mcfserial.c + delete mode 100644 drivers/serial/mcfserial.h +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging creds/next-creds +$ git merge creds/next-creds +Auto-merged arch/ia64/ia32/sys_ia32.c +Auto-merged arch/mips/kernel/vpe.c +Auto-merged arch/x86/ia32/ia32_aout.c +Auto-merged arch/x86/mm/fault.c +Auto-merged drivers/net/tun.c +Auto-merged drivers/usb/core/devio.c +Auto-merged drivers/usb/core/inode.c +Auto-merged fs/binfmt_flat.c +Auto-merged fs/cifs/connect.c +Auto-merged fs/cifs/inode.c +Auto-merged fs/compat.c +Auto-merged fs/dquot.c +Auto-merged fs/ecryptfs/main.c +Auto-merged fs/exportfs/expfs.c +Auto-merged fs/ext4/balloc.c +Auto-merged fs/ext4/ialloc.c +Auto-merged fs/fat/inode.c +Auto-merged fs/hpfs/namei.c +Auto-merged fs/ioprio.c +Auto-merged fs/jffs2/fs.c +Auto-merged fs/namei.c +Auto-merged fs/namespace.c +CONFLICT (content): Merge conflict in fs/namespace.c +Auto-merged fs/nfsd/nfs4recover.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4recover.c +Auto-merged fs/nfsd/nfsfh.c +Auto-merged fs/nfsd/vfs.c +Auto-merged fs/ocfs2/namei.c +Auto-merged fs/omfs/inode.c +Auto-merged fs/open.c +Auto-merged fs/reiserfs/namei.c +Auto-merged fs/ubifs/budget.c +Auto-merged fs/ubifs/dir.c +Auto-merged fs/udf/ialloc.c +Auto-merged fs/udf/namei.c +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/linux-2.6/xfs_linux.h +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_linux.h +Auto-merged fs/xfs/xfs_inode.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_inode.c +Auto-merged fs/xfs/xfs_vnodeops.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.c +Auto-merged include/linux/capability.h +CONFLICT (content): Merge conflict in include/linux/capability.h +Auto-merged include/linux/cred.h +CONFLICT (add/add): Merge conflict in include/linux/cred.h +Auto-merged include/linux/fs.h +Removed include/linux/key-ui.h +Auto-merged include/linux/sched.h +Auto-merged include/linux/security.h +Auto-merged init/main.c +Auto-merged kernel/Makefile +Auto-merged kernel/acct.c +Auto-merged kernel/auditsc.c +Auto-merged kernel/capability.c +Auto-merged kernel/exit.c +CONFLICT (content): Merge conflict in kernel/exit.c +Auto-merged kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merged kernel/ptrace.c +Auto-merged kernel/sched.c +Auto-merged kernel/signal.c +Auto-merged kernel/sys.c +Auto-merged kernel/sysctl.c +Auto-merged kernel/timer.c +Auto-merged kernel/trace/trace.c +Auto-merged kernel/user.c +Auto-merged kernel/user_namespace.c +Auto-merged lib/Makefile +Auto-merged mm/migrate.c +Auto-merged mm/oom_kill.c +Auto-merged net/core/dev.c +Auto-merged net/unix/af_unix.c +Auto-merged security/capability.c +Auto-merged security/commoncap.c +CONFLICT (content): Merge conflict in security/commoncap.c +Auto-merged security/root_plug.c +Auto-merged security/security.c +Auto-merged security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Auto-merged security/smack/smack_lsm.c +CONFLICT (content): Merge conflict in security/smack/smack_lsm.c +Resolved 'fs/namespace.c' using previous resolution. +Resolved 'fs/nfsd/nfs4recover.c' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_linux.h' using previous resolution. +Resolved 'fs/xfs/xfs_inode.c' using previous resolution. +Resolved 'fs/xfs/xfs_vnodeops.c' using previous resolution. +Resolved 'include/linux/capability.h' using previous resolution. +Resolved 'include/linux/cred.h' using previous resolution. +Resolved 'kernel/exit.c' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Resolved 'security/commoncap.c' using previous resolution. +Resolved 'security/selinux/hooks.c' using previous resolution. +Resolved 'security/smack/smack_lsm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 7164355: Merge commit 'creds/next-creds' +$ git diff -M --stat --summary HEAD^.. + Documentation/credentials.txt | 563 +++++++++++++ + arch/alpha/kernel/asm-offsets.c | 11 +- + arch/alpha/kernel/entry.S | 10 +- + arch/ia64/ia32/sys_ia32.c | 7 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/perfmon.c | 43 +- + arch/ia64/kernel/signal.c | 4 +- + arch/mips/kernel/kspd.c | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 5 +- + arch/mips/kernel/vpe.c | 4 +- + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 9 +- + arch/s390/hypfs/inode.c | 4 +- + arch/s390/kernel/compat_linux.c | 28 +- + arch/x86/ia32/ia32_aout.c | 2 +- + arch/x86/mm/fault.c | 2 +- + drivers/block/loop.c | 6 +- + drivers/char/tty_audit.c | 6 +- + drivers/connector/cn_proc.c | 16 +- + drivers/gpu/drm/drm_fops.c | 2 +- + drivers/isdn/capi/capifs.c | 4 +- + drivers/isdn/hysdn/hysdn_procconf.c | 6 +- + drivers/media/video/cpia.c | 2 +- + drivers/net/tun.c | 8 +- + drivers/net/wan/sbni.c | 9 +- + drivers/usb/core/devio.c | 10 +- + drivers/usb/core/inode.c | 4 +- + fs/9p/fid.c | 2 +- + fs/9p/vfs_inode.c | 4 +- + fs/9p/vfs_super.c | 4 +- + fs/affs/inode.c | 4 +- + fs/affs/super.c | 4 +- + fs/anon_inodes.c | 4 +- + fs/attr.c | 4 +- + fs/autofs/inode.c | 4 +- + fs/autofs4/inode.c | 4 +- + fs/autofs4/waitq.c | 4 +- + fs/bfs/dir.c | 4 +- + fs/binfmt_aout.c | 2 +- + fs/binfmt_elf.c | 20 +- + fs/binfmt_elf_fdpic.c | 19 +- + fs/binfmt_flat.c | 2 +- + fs/binfmt_som.c | 2 +- + fs/cifs/cifs_fs_sb.h | 2 +- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 4 +- + fs/cifs/dir.c | 12 +- + fs/cifs/inode.c | 8 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/misc.c | 4 +- + fs/coda/cache.c | 6 +- + fs/coda/file.c | 3 +- + fs/coda/upcall.c | 2 +- + fs/compat.c | 42 +- + fs/devpts/inode.c | 4 +- + fs/dquot.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 3 +- + fs/ecryptfs/kthread.c | 9 +- + fs/ecryptfs/main.c | 3 +- + fs/ecryptfs/messaging.c | 18 +- + fs/ecryptfs/miscdev.c | 20 +- + fs/exec.c | 183 +++-- + fs/exportfs/expfs.c | 4 +- + fs/ext2/balloc.c | 2 +- + fs/ext2/ialloc.c | 4 +- + fs/ext3/balloc.c | 2 +- + fs/ext3/ialloc.c | 4 +- + fs/ext4/balloc.c | 3 +- + fs/ext4/ialloc.c | 4 +- + fs/fat/file.c | 2 +- + fs/fat/inode.c | 4 +- + fs/fcntl.c | 18 +- + fs/file_table.c | 10 +- + fs/fuse/dev.c | 4 +- + fs/fuse/dir.c | 25 +- + fs/gfs2/inode.c | 10 +- + fs/hfs/inode.c | 4 +- + fs/hfs/super.c | 4 +- + fs/hfsplus/inode.c | 4 +- + fs/hfsplus/options.c | 4 +- + fs/hpfs/namei.c | 24 +- + fs/hpfs/super.c | 4 +- + fs/hppfs/hppfs.c | 6 +- + fs/hugetlbfs/inode.c | 21 +- + fs/inotify_user.c | 2 +- + fs/internal.h | 6 + + fs/ioprio.c | 18 +- + fs/jffs2/fs.c | 4 +- + fs/jfs/jfs_inode.c | 4 +- + fs/locks.c | 2 +- + fs/minix/bitmap.c | 4 +- + fs/namei.c | 10 +- + fs/namespace.c | 2 +- + fs/ncpfs/ioctl.c | 91 +-- + fs/nfsctl.c | 4 +- + fs/nfsd/auth.c | 95 ++- + fs/nfsd/nfs4recover.c | 71 +- + fs/nfsd/nfsfh.c | 11 +- + fs/nfsd/vfs.c | 9 +- + fs/ocfs2/dlm/dlmfs.c | 8 +- + fs/ocfs2/namei.c | 4 +- + fs/omfs/inode.c | 8 +- + fs/open.c | 59 +- + fs/pipe.c | 4 +- + fs/posix_acl.c | 4 +- + fs/proc/array.c | 32 +- + fs/proc/base.c | 32 +- + fs/quota.c | 4 +- + fs/ramfs/inode.c | 4 +- + fs/reiserfs/namei.c | 4 +- + fs/smbfs/dir.c | 3 +- + fs/smbfs/inode.c | 2 +- + fs/smbfs/proc.c | 2 +- + fs/sysv/ialloc.c | 4 +- + fs/ubifs/budget.c | 2 +- + fs/ubifs/dir.c | 4 +- + fs/udf/ialloc.c | 4 +- + fs/udf/namei.c | 2 +- + fs/ufs/ialloc.c | 4 +- + fs/xfs/linux-2.6/xfs_cred.h | 6 +- + fs/xfs/linux-2.6/xfs_globals.h | 2 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 5 +- + fs/xfs/xfs_acl.c | 6 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_vnodeops.h | 10 +- + include/keys/keyring-type.h | 31 + + include/linux/binfmts.h | 16 +- + include/linux/capability.h | 2 - + include/linux/cred.h | 332 +++++++- + include/linux/fs.h | 8 +- + include/linux/init_task.h | 13 +- + include/linux/key-ui.h | 66 -- + include/linux/key.h | 32 +- + include/linux/keyctl.h | 4 +- + include/linux/sched.h | 64 +-- + include/linux/securebits.h | 2 +- + include/linux/security.h | 326 ++++---- + include/net/scm.h | 4 +- + init/main.c | 1 + + ipc/mqueue.c | 19 +- + ipc/shm.c | 9 +- + ipc/util.c | 18 +- + kernel/Makefile | 2 +- + kernel/acct.c | 7 +- + kernel/auditsc.c | 57 +- + kernel/capability.c | 268 +------ + kernel/cgroup.c | 17 +- + kernel/cred-internals.h | 26 + + kernel/cred.c | 591 +++++++++++++ + kernel/exit.c | 23 +- + kernel/fork.c | 45 +- + kernel/futex.c | 20 +- + kernel/futex_compat.c | 7 +- + kernel/kmod.c | 30 +- + kernel/ptrace.c | 29 +- + kernel/sched.c | 26 +- + kernel/signal.c | 60 +- + kernel/sys.c | 579 ++++++++------ + kernel/sysctl.c | 2 +- + kernel/timer.c | 8 +- + kernel/trace/trace.c | 2 +- + kernel/tsacct.c | 6 +- + kernel/uid16.c | 31 +- + kernel/user.c | 37 +- + kernel/user_namespace.c | 14 +- + kernel/workqueue.c | 8 +- + lib/Makefile | 2 +- + lib/is_single_threaded.c | 45 + + mm/mempolicy.c | 9 +- + mm/migrate.c | 9 +- + mm/oom_kill.c | 6 +- + mm/shmem.c | 8 +- + net/9p/client.c | 2 +- + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_route.c | 2 +- + net/core/dev.c | 8 +- + net/core/scm.c | 10 +- + net/ipv4/netfilter/ipt_LOG.c | 4 +- + net/ipv6/ip6_flowlabel.c | 2 +- + net/ipv6/netfilter/ip6t_LOG.c | 4 +- + net/netfilter/nfnetlink_log.c | 5 +- + net/netfilter/xt_owner.c | 16 +- + net/netrom/af_netrom.c | 4 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/ar-key.c | 6 +- + net/sched/cls_flow.c | 4 +- + net/socket.c | 4 +- + net/sunrpc/auth.c | 14 +- + net/unix/af_unix.c | 11 +- + security/capability.c | 56 +- + security/commoncap.c | 699 ++++++++++------ + security/keys/internal.h | 47 +- + security/keys/key.c | 25 +- + security/keys/keyctl.c | 210 +++-- + security/keys/keyring.c | 15 +- + security/keys/permission.c | 29 +- + security/keys/proc.c | 8 +- + security/keys/process_keys.c | 468 +++++------ + security/keys/request_key.c | 133 ++-- + security/keys/request_key_auth.c | 46 +- + security/root_plug.c | 13 +- + security/security.c | 96 +-- + security/selinux/exports.c | 8 +- + security/selinux/hooks.c | 1148 ++++++++++++++------------ + security/selinux/include/av_perm_to_string.h | 2 + + security/selinux/include/av_permissions.h | 2 + + security/selinux/include/class_to_string.h | 5 + + security/selinux/include/flask.h | 1 + + security/selinux/include/objsec.h | 11 - + security/selinux/selinuxfs.c | 13 +- + security/selinux/xfrm.c | 6 +- + security/smack/smack_access.c | 4 +- + security/smack/smack_lsm.c | 173 +++-- + security/smack/smackfs.c | 6 +- + 215 files changed, 5061 insertions(+), 3100 deletions(-) + create mode 100644 Documentation/credentials.txt + create mode 100644 include/keys/keyring-type.h + delete mode 100644 include/linux/key-ui.h + create mode 100644 kernel/cred-internals.h + create mode 100644 kernel/cred.c + create mode 100644 lib/is_single_threaded.c +Merging oprofile/auto-oprofile-next +$ git merge oprofile/auto-oprofile-next +Auto-merged arch/x86/kernel/apic_32.c +CONFLICT (content): Merge conflict in arch/x86/kernel/apic_32.c +Auto-merged arch/x86/kernel/apic_64.c +Removed arch/x86/oprofile/op_model_athlon.c +Recorded preimage for 'arch/x86/kernel/apic_32.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/apic_32.c'. +Created commit de8f393: Merge commit 'oprofile/auto-oprofile-next' +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 14 + + arch/x86/kernel/apic_32.c | 4 + + arch/x86/kernel/apic_64.c | 4 + + arch/x86/oprofile/Makefile | 2 +- + arch/x86/oprofile/nmi_int.c | 127 +++++++- + arch/x86/oprofile/op_counter.h | 3 +- + arch/x86/oprofile/op_model_amd.c | 559 +++++++++++++++++++++++++++++++++++ + arch/x86/oprofile/op_model_athlon.c | 190 ------------ + arch/x86/oprofile/op_model_p4.c | 4 + + arch/x86/oprofile/op_model_ppro.c | 2 + + arch/x86/oprofile/op_x86_model.h | 7 +- + drivers/oprofile/buffer_sync.c | 209 +++++++++---- + drivers/oprofile/cpu_buffer.c | 74 +++++- + drivers/oprofile/cpu_buffer.h | 2 + + drivers/oprofile/oprof.c | 58 ++++- + drivers/oprofile/oprof.h | 4 +- + drivers/oprofile/oprofile_files.c | 39 +++- + include/linux/oprofile.h | 5 + + include/linux/pci_ids.h | 5 + + 19 files changed, 1031 insertions(+), 281 deletions(-) + create mode 100644 arch/x86/oprofile/op_model_amd.c + delete mode 100644 arch/x86/oprofile/op_model_athlon.c +Merging fastboot/auto-fastboot-next +$ git merge fastboot/auto-fastboot-next +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/linux/init.h +CONFLICT (content): Merge conflict in include/linux/init.h +Auto-merged init/Kconfig +Auto-merged init/main.c +Resolved 'include/linux/init.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 2faa808: Merge commit 'fastboot/auto-fastboot-next' +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/battery.c | 2 +- + drivers/acpi/button.c | 2 +- + drivers/acpi/thermal.c | 2 +- + drivers/pci/pci.c | 2 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/usb/host/uhci-hcd.c | 2 +- + include/asm-generic/vmlinux.lds.h | 6 ++- + include/linux/init.h | 8 ++++ + init/Kconfig | 11 +++++ + init/do_mounts.c | 2 + + init/do_mounts_md.c | 9 ++++ + init/initramfs.c | 71 +++++++++++++++++++++++++++------- + init/main.c | 77 +++++++++++++++++++++++++++++++++++- + 14 files changed, 172 insertions(+), 26 deletions(-) +Merging sparseirq/auto-sparseirq-next +$ git merge sparseirq/auto-sparseirq-next +Auto-merged arch/Kconfig +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/acpi/boot.c +Auto-merged arch/x86/kernel/apic_32.c +Auto-merged arch/x86/kernel/apic_64.c +Auto-merged arch/x86/kernel/entry_32.S +Removed arch/x86/kernel/io_apic_32.c +Auto-merged arch/x86/kernel/setup.c +Auto-merged arch/x86/kernel/visws_quirks.c +Auto-merged arch/x86/kernel/vmlinux_32.lds.S +Auto-merged arch/x86/lguest/boot.c +Auto-merged arch/x86/xen/enlighten.c +Auto-merged arch/x86/xen/spinlock.c +CONFLICT (content): Merge conflict in arch/x86/xen/spinlock.c +Auto-merged drivers/mfd/asic3.c +Auto-merged drivers/net/wan/sbni.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged drivers/serial/68328serial.c +CONFLICT (content): Merge conflict in drivers/serial/68328serial.c +Auto-merged drivers/serial/8250.c +CONFLICT (content): Merge conflict in drivers/serial/8250.c +Auto-merged drivers/xen/events.c +Auto-merged fs/proc/proc_misc.c +Auto-merged include/asm-generic/vmlinux.lds.h +Auto-merged include/asm-x86/apic.h +Auto-merged include/asm-x86/genapic_32.h +Auto-merged include/asm-x86/irq_vectors.h +Removed include/asm-x86/mach-generic/irq_vectors_limits.h +Removed include/asm-x86/summit/irq_vectors_limits.h +Auto-merged include/linux/init.h +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/pci.h +Auto-merged init/main.c +Auto-merged kernel/irq/manage.c +Recorded preimage for 'arch/x86/xen/spinlock.c' +Recorded preimage for 'drivers/serial/68328serial.c' +Recorded preimage for 'drivers/serial/8250.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/xen/spinlock.c'. +Recorded resolution for 'drivers/serial/68328serial.c'. +Recorded resolution for 'drivers/serial/8250.c'. +Created commit 2cc046b: Merge commit 'sparseirq/auto-sparseirq-next' +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 3 + + arch/m68k/kernel/ints.c | 2 + + arch/s390/kernel/irq.c | 2 + + arch/sparc/kernel/irq.c | 3 + + arch/x86/Kconfig | 20 +- + arch/x86/configs/i386_defconfig | 1 - + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/acpi/boot.c | 5 +- + arch/x86/kernel/apic_32.c | 1 - + arch/x86/kernel/apic_64.c | 6 +- + arch/x86/kernel/entry_32.S | 2 +- + arch/x86/kernel/{io_apic_64.c => io_apic.c} | 1470 +++++++++-- + arch/x86/kernel/io_apic_32.c | 2908 --------------------- + arch/x86/kernel/irq_32.c | 71 +- + arch/x86/kernel/irq_64.c | 74 +- + arch/x86/kernel/irqinit_32.c | 48 +- + arch/x86/kernel/irqinit_64.c | 28 +- + arch/x86/kernel/quirks.c | 3 - + arch/x86/kernel/setup.c | 4 + + arch/x86/kernel/setup_percpu.c | 19 +- + arch/x86/kernel/visws_quirks.c | 32 +- + arch/x86/kernel/vmiclock_32.c | 3 + + arch/x86/kernel/vmlinux_32.lds.S | 1 + + arch/x86/kernel/vmlinux_64.lds.S | 3 + + arch/x86/lguest/boot.c | 2 +- + arch/x86/mach-generic/bigsmp.c | 4 + + arch/x86/mach-generic/es7000.c | 14 + + arch/x86/mach-generic/numaq.c | 14 + + arch/x86/mach-generic/summit.c | 14 + + arch/x86/mach-voyager/voyager_smp.c | 4 +- + arch/x86/mm/init_32.c | 3 + + arch/x86/xen/irq.c | 2 - + arch/x86/xen/spinlock.c | 2 +- + drivers/char/hpet.c | 2 +- + drivers/char/random.c | 72 +- + drivers/char/vr41xx_giu.c | 2 +- + drivers/gpio/gpiolib.c | 2 +- + drivers/mfd/asic3.c | 4 +- + drivers/mfd/htc-egpio.c | 2 +- + drivers/net/3c59x.c | 4 +- + drivers/net/hamradio/baycom_ser_fdx.c | 4 +- + drivers/net/hamradio/scc.c | 6 +- + drivers/net/wan/sbni.c | 2 +- + drivers/parisc/dino.c | 6 +- + drivers/parisc/eisa.c | 4 +- + drivers/parisc/gsc.c | 12 +- + drivers/parisc/iosapic.c | 4 +- + drivers/parisc/superio.c | 4 +- + drivers/pci/htirq.c | 22 +- + drivers/pci/intr_remapping.c | 221 ++- + drivers/pcmcia/at91_cf.c | 2 +- + drivers/pcmcia/hd64465_ss.c | 12 +- + drivers/pcmcia/vrc4171_card.c | 2 +- + drivers/rtc/rtc-vr41xx.c | 4 +- + drivers/scsi/aha152x.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 2 +- + drivers/serial/8250.c | 4 +- + drivers/serial/amba-pl010.c | 2 +- + drivers/serial/amba-pl011.c | 2 +- + drivers/serial/cpm_uart/cpm_uart_core.c | 2 +- + drivers/serial/m32r_sio.c | 4 +- + drivers/serial/serial_core.c | 2 +- + drivers/serial/serial_lh7a40x.c | 2 +- + drivers/serial/sh-sci.c | 2 +- + drivers/serial/ucc_uart.c | 2 +- + drivers/xen/events.c | 20 +- + fs/proc/proc_misc.c | 72 +- + include/asm-generic/vmlinux.lds.h | 13 + + include/asm-x86/apic.h | 2 - + include/asm-x86/bigsmp/apic.h | 15 +- + include/asm-x86/es7000/apic.h | 3 +- + include/asm-x86/genapic_32.h | 2 + + include/asm-x86/hw_irq.h | 8 +- + include/asm-x86/io_apic.h | 24 +- + include/asm-x86/irq_vectors.h | 24 +- + include/asm-x86/mach-default/entry_arch.h | 1 + + include/asm-x86/mach-default/mach_apic.h | 15 +- + include/asm-x86/mach-generic/irq_vectors_limits.h | 14 - + include/asm-x86/mach-generic/mach_apic.h | 1 + + include/asm-x86/numaq/apic.h | 2 - + include/asm-x86/summit/apic.h | 1 - + include/asm-x86/summit/irq_vectors_limits.h | 14 - + include/linux/init.h | 44 + + include/linux/interrupt.h | 7 + + include/linux/irq.h | 85 +- + include/linux/kernel_stat.h | 20 +- + include/linux/pci.h | 2 +- + init/Makefile | 2 +- + init/dyn_array.c | 124 + + init/main.c | 11 +- + kernel/irq/autoprobe.c | 30 +- + kernel/irq/chip.c | 79 +- + kernel/irq/handle.c | 264 ++- + kernel/irq/internals.h | 4 +- + kernel/irq/manage.c | 65 +- + kernel/irq/migration.c | 14 +- + kernel/irq/proc.c | 44 +- + kernel/irq/resend.c | 6 +- + kernel/irq/spurious.c | 9 +- + 99 files changed, 2579 insertions(+), 3651 deletions(-) + rename arch/x86/kernel/{io_apic_64.c => io_apic.c} (69%) + delete mode 100644 arch/x86/kernel/io_apic_32.c + delete mode 100644 include/asm-x86/mach-generic/irq_vectors_limits.h + delete mode 100644 include/asm-x86/summit/irq_vectors_limits.h + create mode 100644 init/dyn_array.c +$ git reset --hard HEAD^ +HEAD is now at 2faa808 Merge commit 'fastboot/auto-fastboot-next' +$ git am -3 ../patches/Add_cuImage.mpc866ads_to_the_bootwrapper_as_a_cuboot-8xx_target +Applying Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target +$ git am -3 ../patches/powerpc-export-cmo-stuff +Applying powerpc: export CMO_PageSize +Applying agp: fix typo in uninorth-agp +Applying ftrace: protect the definition of ftrace_release +Applying revert BUILD_BUG_ON change diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..3c9ca1446cbc --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,118 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Importing m68k based on 6a55617ed5d1aa62b850de2cf66f5ede2eef4825 +$ git checkout quilt/m68k +Switched to branch "quilt/m68k" +$ git reset --hard 6a55617ed5d1aa62b850de2cf66f5ede2eef4825 +HEAD is now at 6a55617 Linux v2.6.27-rc4 +$ git quiltimport --author Geert Uytterhoeven <geert@linux-m68k.org> --patches ../quilt/m68k +m68k-use-bcd2bin-bin2bcd.diff +m68k-use-percent-pS-infrastructure.diff +Unchanged quilt series driver-core +Unchanged quilt series usb +Unchanged quilt series device-mapper +Unchanged quilt series i2c +Unchanged quilt series jdelvare-hwmon +Unchanged quilt series kernel-doc +Unchanged quilt series ide +Unchanged quilt series rr +Importing ttydev based on b09c3e3f1710b554348c98e78fbf4a661918779a +$ git checkout quilt/ttydev +Switched to branch "quilt/ttydev" +$ git reset --hard b09c3e3f1710b554348c98e78fbf4a661918779a +HEAD is now at b09c3e3 removed unused #include <version.h> +$ git quiltimport --author Alan Cox <alan@lxorguk.ukuu.org.uk> --patches ../quilt/ttydev +tty-fix-pty-termios-race +mcfserial-goes-byebye +epca-port-init +serial-remove-nr-irq +.dotest/patch:163: trailing whitespace. + +warning: 1 line adds whitespace errors. +blackfin-use-initdata +blackfin-suspend-all +blackfin-whitespace-trim +blackfin-common-vars +blackfin-remove-useless-stop +blackfin-fix-stop-bug +blackfin-fix-ircp-bug +blackfin-fix-uart-map +tty-move-tioclinux +tty-fixup-uml +tty-split-buffering +tty-split-port +tty-ldisc-for-pps +tty-kref +tty-kref-modcount +tty-kref-get-current-tty +tty-move-write +tty-usbserial-kref +.dotest/patch:134: trailing whitespace. +out: +.dotest/patch:326: trailing whitespace. + +.dotest/patch:897: trailing whitespace. + if (tty && !C_CLOCAL(tty)) +.dotest/patch:1070: trailing whitespace. + tty_kref_put(tty); +.dotest/patch:1320: trailing whitespace. + } else +warning: 5 lines add whitespace errors. +tty-misc-kref +tty-kref-stallion +tty-kref-mxser +.dotest/patch:390: trailing whitespace. + +warning: 1 line adds whitespace errors. +tty-fix-vhangup +tty-current-locking +tty-current-fix-abusers +tty-tiocrs485 +tty-kref-hso +tty-fix-pty +char-cyclades-remove-bogus-iomap.patch +char-sx-fix-io-unmapping.patch +8250-remove-a-few-inlines-of-dubious-value.patch +vt-remove-bogus-lockdrop +tty-fix-shutdown +tty-move-special-cases +.dotest/patch:553: trailing whitespace. + +warning: 1 line adds whitespace errors. +tty-add-termiox +.dotest/patch:83: trailing whitespace. +#endif +warning: 1 line adds whitespace errors. +tty-fix-softcar +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Unchanged quilt series m68k +Unchanged quilt series driver-core +Unchanged quilt series usb +Unchanged quilt series device-mapper +Importing i2c based on 2.6.27-rc4-git1 +$ git checkout quilt/i2c +Switched to branch "quilt/i2c" +$ git reset --hard d3ee1b405872214609868f3cde631ac157026dd0 +HEAD is now at d3ee1b4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-fix-device_init_wakeup-place.patch +i2c-add-missing-kerneldoc-descriptions.patch +i2c-less-noisy-on-missing-smbus-quick.patch +i2c-remove-unused-include-version.h.patch +i2c-isp1301_omap-convert-to-new-style-part-1.patch +i2c-isp1301_omap-convert-to-new-style-part-2.patch +i2c-pca-isa-dont-grab-arbitrary-resources.patch +i2c-renesas-highlander-fpga-smbus-support.patch +i2c-viapro-add-vx800-support.patch +i2c-tps65010-vibrator-hookup-to-gpiolib.patch +hwmon-dme1737-convert-to-new-style-part-1.patch +hwmon-dme1737-convert-to-new-style-part-2.patch +i2c-floppy-controller-bus-driver.patch +i2c-floppy-dependencies.patch +i2c-i801-smbus-patch-for-intel-ibex-peak-deviceids.patch +Unchanged quilt series jdelvare-hwmon +Unchanged quilt series kernel-doc +Unchanged quilt series ide +Unchanged quilt series rr +Unchanged quilt series ttydev diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..e136286982d6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080825 |