$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 386f40c Revert "tty: fix a little bug in scrup, vt.c" Merging origin/master $ git merge origin/master Updating 386f40c..3975d16 Fast-forward drivers/ata/libahci.c | 21 +------ drivers/ata/sata_sil24.c | 12 ++-- drivers/ata/sata_via.c | 18 +++++- drivers/mtd/mtdchar.c | 11 +--- drivers/mtd/nand/Kconfig | 21 ++++--- drivers/mtd/nand/r852.c | 27 ++++++--- drivers/pci/quirks.c | 5 +- drivers/watchdog/wm8350_wdt.c | 2 +- fs/jffs2/acl.c | 3 +- fs/jffs2/dir.c | 127 +++++++++++++++++++++-------------------- fs/jffs2/fs.c | 7 ++- include/linux/pci_ids.h | 1 + 12 files changed, 137 insertions(+), 118 deletions(-) Merging fixes/fixes $ git merge fixes/fixes Merge made by recursive. arch/arm/mach-vexpress/ct-ca9x4.c | 1 + drivers/acpi/apei/apei-base.c | 1 + drivers/acpi/atomicio.c | 1 + drivers/rtc/rtc-davinci.c | 1 + drivers/staging/tm6000/tm6000-alsa.c | 1 + drivers/staging/tm6000/tm6000-cards.c | 1 + drivers/staging/tm6000/tm6000-core.c | 1 + drivers/staging/tm6000/tm6000-dvb.c | 1 + fs/ocfs2/reservations.c | 1 - 9 files changed, 8 insertions(+), 1 deletions(-) Merging arm-current/master $ git merge arm-current/master Merge made by recursive. arch/arm/common/sa1111.c | 9 +++- arch/arm/mach-nomadik/clock.c | 11 +++-- arch/arm/mach-nomadik/clock.h | 2 + arch/arm/mach-nomadik/cpu-8815.c | 8 +++ arch/arm/mach-pxa/palmtc.c | 4 +- arch/arm/mach-pxa/spitz.c | 3 + arch/arm/mach-ux500/Makefile | 3 +- arch/arm/mach-ux500/clock.c | 104 +++++++++++++++++++++++++++++++++++-- arch/arm/mach-ux500/clock.h | 22 ++++++++ arch/arm/mach-ux500/cpu.c | 6 ++ arch/arm/mm/copypage-feroceon.c | 4 +- arch/arm/mm/copypage-v4wb.c | 4 +- arch/arm/mm/copypage-v4wt.c | 4 +- arch/arm/mm/copypage-xsc3.c | 4 +- arch/arm/mm/fault.c | 3 + arch/arm/mm/highmem.c | 11 ++++- arch/arm/mm/init.c | 6 +- arch/arm/plat-nomadik/timer.c | 26 +++++++++- arch/arm/vfp/vfphw.S | 2 +- sound/soc/pxa/spitz.c | 36 ------------- 20 files changed, 206 insertions(+), 66 deletions(-) Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master 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 Merge made by recursive. drivers/net/8139too.c | 1 + drivers/net/r8169.c | 5 +++++ drivers/net/usb/asix.c | 2 +- net/ipv4/ipmr.c | 4 +++- net/ipv6/ip6mr.c | 6 ++++-- net/ipv6/mcast.c | 5 ++++- 6 files changed, 18 insertions(+), 5 deletions(-) Merging sound-current/for-linus $ git merge sound-current/for-linus Already up-to-date. Merging pci-current/for-linus $ git merge pci-current/for-linus Auto-merging drivers/pci/pcie/aer/aerdrv_core.c Auto-merging drivers/pci/quirks.c Merge made by recursive. drivers/pci/bus.c | 2 +- drivers/pci/hotplug/shpchp_hpc.c | 2 +- drivers/pci/pcie/aer/aerdrv_core.c | 17 +++++++++-------- drivers/pci/quirks.c | 24 +++++++++++++++++++++--- drivers/pci/setup-res.c | 10 +++++----- 5 files changed, 37 insertions(+), 18 deletions(-) Merging wireless-current/master $ git merge wireless-current/master Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 5 +- drivers/net/wireless/ath/ath5k/base.c | 12 +- drivers/net/wireless/ath/ath5k/phy.c | 7 + drivers/net/wireless/hostap/hostap_hw.c | 9 - drivers/net/wireless/iwlwifi/iwl-3945.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 30 +--- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 2 + drivers/net/wireless/iwlwifi/iwl-agn.c | 318 +++++++++++++------------- drivers/net/wireless/iwlwifi/iwl-core.c | 39 ++++ drivers/net/wireless/iwlwifi/iwl-core.h | 2 + drivers/net/wireless/iwlwifi/iwl3945-base.c | 56 +++++- drivers/net/wireless/p54/p54usb.c | 1 + drivers/net/wireless/wl12xx/wl1251_sdio.c | 1 + net/mac80211/driver-ops.h | 2 +- net/mac80211/mlme.c | 92 +++++++- net/mac80211/rx.c | 3 + 16 files changed, 362 insertions(+), 218 deletions(-) Merging kbuild-current/for-linus $ git merge kbuild-current/for-linus Already up-to-date. Merging quilt/driver-core.current $ git merge quilt/driver-core.current Already up-to-date. Merging quilt/tty.current $ git merge quilt/tty.current Already up-to-date. Merging quilt/usb.current $ git merge quilt/usb.current Already up-to-date. Merging quilt/staging.current $ git merge quilt/staging.current Merge made by recursive. drivers/staging/usbip/usbip_common.c | 46 ++++++++++++++++++++++++--------- 1 files changed, 33 insertions(+), 13 deletions(-) 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-merging drivers/input/misc/pcf8574_keypad.c Merge made by recursive. drivers/input/misc/pcf8574_keypad.c | 2 +- drivers/input/touchscreen/ad7877.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. Merging ide-curent/master $ git merge ide-curent/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging gcl-current/merge $ git merge gcl-current/merge Already up-to-date. Merging arm/devel $ git merge arm/devel Already up-to-date. Merging davinci/davinci-next $ git merge davinci/davinci-next Already up-to-date. Merging i.MX/for-next $ git merge i.MX/for-next Auto-merging drivers/mmc/host/mxcmmc.c Merge made by recursive. arch/arm/configs/mx25_defconfig | 1756 ++++++++++++++++++++++++++ arch/arm/configs/mx3_defconfig | 695 ++++++++++- arch/arm/mach-mx2/Kconfig | 10 +- arch/arm/mach-mx2/devices.c | 18 + arch/arm/mach-mx2/devices.h | 1 + arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 181 +++- arch/arm/mach-mx2/mach-cpuimx27.c | 93 ++- arch/arm/mach-mx2/mach-pca100.c | 2 + arch/arm/mach-mx25/clock.c | 2 +- arch/arm/mach-mx25/devices.c | 20 + arch/arm/mach-mx25/devices.h | 1 + arch/arm/mach-mx25/mach-mx25pdk.c | 36 + arch/arm/mach-mx3/mach-mx31lilly.c | 34 +- arch/arm/mach-mx3/mach-pcm037.c | 3 +- arch/arm/mach-mx3/mach-pcm043.c | 2 + arch/arm/mach-mx5/board-mx51_babbage.c | 26 + arch/arm/mach-mx5/clock-mx51.c | 11 + arch/arm/mach-mx5/devices.c | 58 + arch/arm/mach-mx5/devices.h | 3 + arch/arm/plat-mxc/clock.c | 37 +- arch/arm/plat-mxc/include/mach/iomux-mx25.h | 19 +- arch/arm/plat-mxc/include/mach/iomux-mx51.h | 18 +- arch/arm/plat-mxc/include/mach/mmc.h | 3 + arch/arm/plat-mxc/include/mach/mx25.h | 2 + arch/arm/plat-mxc/include/mach/mxc_nand.h | 4 + drivers/mmc/host/mxcmmc.c | 16 +- drivers/mtd/nand/mxc_nand.c | 33 +- 27 files changed, 2949 insertions(+), 135 deletions(-) create mode 100644 arch/arm/configs/mx25_defconfig Merging msm/for-next $ git merge msm/for-next Merge made by recursive. arch/arm/mach-msm/acpuclock-arm11.c | 1 - arch/arm/mach-msm/clock.c | 1 - arch/arm/mach-msm/dma.c | 1 + drivers/mmc/host/Kconfig | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) Merging omap/for-next $ git merge omap/for-next Merge made by recursive. arch/arm/mach-omap2/Makefile | 5 ++- arch/arm/mach-omap2/board-omap3stalker.c | 4 +-- arch/arm/mach-omap2/board-overo.c | 42 ++++++++++++++++++++++++- arch/arm/mach-omap2/omap-iommu.c | 2 +- arch/arm/mach-omap2/pm34xx.c | 4 +- arch/arm/mach-omap2/usb-ehci.c | 2 + arch/arm/plat-omap/dmtimer.c | 6 ++-- arch/arm/plat-omap/gpio.c | 1 + arch/arm/plat-omap/include/plat/uncompress.h | 6 ++++ arch/arm/plat-omap/iovmm.c | 4 ++- 10 files changed, 63 insertions(+), 13 deletions(-) Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung $ git merge samsung/next-samsung Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Merge made by recursive. arch/blackfin/include/asm/elf.h | 1 + .../mach-bf527/include/mach/defBF52x_base.h | 81 -------------------- .../mach-bf548/include/mach/defBF54x_base.h | 60 --------------- 3 files changed, 1 insertions(+), 141 deletions(-) Merging cris/for-next $ git merge cris/for-next Already up-to-date. Merging ia64/test $ git merge ia64/test Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Merge made by recursive. arch/m68k/mac/config.c | 9 +++++++++ arch/m68k/mac/misc.c | 6 +++--- arch/m68k/sun3/leds.c | 4 ++-- drivers/zorro/proc.c | 15 ++++++++------- 4 files changed, 22 insertions(+), 12 deletions(-) Merging m68knommu/for-next $ git merge m68knommu/for-next Merge made by recursive. drivers/serial/68328serial.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) Merging microblaze/next $ git merge microblaze/next Merge made by recursive. arch/microblaze/Kconfig | 3 +++ arch/microblaze/include/asm/cacheflush.h | 13 +++++++++---- arch/microblaze/include/asm/page.h | 2 ++ arch/microblaze/include/asm/uaccess.h | 4 ++-- arch/microblaze/kernel/misc.S | 2 +- arch/microblaze/mm/fault.c | 1 - arch/microblaze/mm/init.c | 7 +------ 7 files changed, 18 insertions(+), 14 deletions(-) Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Removing arch/mips/nxp/pnx833x/stb22x/Makefile Removing arch/mips/nxp/pnx8550/jbs/Makefile Removing arch/mips/nxp/pnx8550/stb810/Makefile Merge made by recursive. arch/mips/Kbuild | 15 + arch/mips/Kbuild.platforms | 31 ++ arch/mips/Makefile | 519 +------------------- arch/mips/alchemy/Platform | 109 ++++ arch/mips/alchemy/common/Makefile | 2 - arch/mips/alchemy/devboards/Makefile | 2 - arch/mips/alchemy/devboards/pb1200/Makefile | 2 - arch/mips/alchemy/mtx-1/Makefile | 5 +- arch/mips/alchemy/xxs1500/Makefile | 4 +- arch/mips/ar7/Makefile | 1 - arch/mips/ar7/Platform | 6 + arch/mips/bcm47xx/Platform | 7 + arch/mips/bcm63xx/Makefile | 2 - arch/mips/bcm63xx/Platform | 7 + arch/mips/boot/Makefile | 49 +- arch/mips/boot/compressed/Makefile | 54 ++- arch/mips/cavium-octeon/Makefile | 3 +- arch/mips/cavium-octeon/Platform | 11 + arch/mips/cobalt/Makefile | 2 - arch/mips/cobalt/Platform | 6 + arch/mips/dec/Makefile | 2 - arch/mips/dec/Platform | 8 + arch/mips/dec/promcon.c | 3 +- arch/mips/emma/Makefile | 6 + arch/mips/emma/Platform | 4 + arch/mips/include/asm/mach-powertv/asic_reg_map.h | 2 +- arch/mips/include/asm/mach-powertv/dma-coherence.h | 8 +- arch/mips/include/asm/mach-powertv/ioremap.h | 165 +++++-- arch/mips/jazz/Makefile | 2 - arch/mips/jazz/Platform | 6 + arch/mips/kernel/Makefile | 2 - arch/mips/lasat/Makefile | 2 - arch/mips/lasat/Platform | 7 + arch/mips/loongson/Platform | 32 ++ arch/mips/loongson/common/cs5536/Makefile | 2 - arch/mips/loongson/fuloong-2e/Makefile | 2 - arch/mips/math-emu/Makefile | 1 - arch/mips/math-emu/dp_modf.c | 2 +- arch/mips/math-emu/dp_tint.c | 3 +- arch/mips/math-emu/dp_tlong.c | 3 +- arch/mips/math-emu/sp_modf.c | 2 +- arch/mips/math-emu/sp_tint.c | 3 +- arch/mips/math-emu/sp_tlong.c | 3 +- arch/mips/mipssim/Makefile | 2 - arch/mips/mipssim/Platform | 6 + arch/mips/mm/Makefile | 2 - arch/mips/mm/fault.c | 1 - arch/mips/mti-malta/Makefile | 2 - arch/mips/mti-malta/Platform | 7 + arch/mips/nxp/pnx833x/stb22x/Makefile | 3 - arch/mips/nxp/pnx8550/jbs/Makefile | 4 - arch/mips/nxp/pnx8550/stb810/Makefile | 4 - arch/mips/pci/ops-titan-ht.c | 4 +- arch/mips/pmc-sierra/Platform | 14 + arch/mips/pmc-sierra/yosemite/ht-irq.c | 13 +- arch/mips/pnx833x/Makefile | 3 + arch/mips/pnx833x/Platform | 5 + arch/mips/{nxp => }/pnx833x/common/Makefile | 2 - arch/mips/{nxp => }/pnx833x/common/interrupts.c | 0 arch/mips/{nxp => }/pnx833x/common/platform.c | 0 arch/mips/{nxp => }/pnx833x/common/prom.c | 0 arch/mips/{nxp => }/pnx833x/common/reset.c | 0 arch/mips/{nxp => }/pnx833x/common/setup.c | 0 arch/mips/pnx833x/stb22x/Makefile | 1 + arch/mips/{nxp => }/pnx833x/stb22x/board.c | 0 arch/mips/pnx8550/Makefile | 3 + arch/mips/pnx8550/Platform | 7 + arch/mips/{nxp => }/pnx8550/common/Makefile | 2 - arch/mips/{nxp => }/pnx8550/common/int.c | 0 arch/mips/{nxp => }/pnx8550/common/pci.c | 0 arch/mips/{nxp => }/pnx8550/common/platform.c | 0 arch/mips/{nxp => }/pnx8550/common/proc.c | 0 arch/mips/{nxp => }/pnx8550/common/prom.c | 0 arch/mips/{nxp => }/pnx8550/common/reset.c | 0 arch/mips/{nxp => }/pnx8550/common/setup.c | 0 arch/mips/{nxp => }/pnx8550/common/time.c | 0 arch/mips/pnx8550/jbs/Makefile | 4 + arch/mips/{nxp => }/pnx8550/jbs/board_setup.c | 0 arch/mips/{nxp => }/pnx8550/jbs/init.c | 0 arch/mips/{nxp => }/pnx8550/jbs/irqmap.c | 0 arch/mips/pnx8550/stb810/Makefile | 4 + arch/mips/{nxp => }/pnx8550/stb810/board_setup.c | 0 arch/mips/{nxp => }/pnx8550/stb810/irqmap.c | 0 arch/mips/{nxp => }/pnx8550/stb810/prom_init.c | 0 arch/mips/powertv/Makefile | 5 +- arch/mips/powertv/Platform | 7 + arch/mips/powertv/asic/asic-calliope.c | 2 +- arch/mips/powertv/asic/asic-cronus.c | 4 +- arch/mips/powertv/asic/asic-zeus.c | 2 +- arch/mips/powertv/asic/asic_devices.c | 24 +- arch/mips/powertv/ioremap.c | 136 +++++ arch/mips/powertv/memory.c | 342 ++++++++++---- arch/mips/rb532/Makefile | 2 - arch/mips/rb532/Platform | 7 + arch/mips/sgi-ip22/Makefile | 2 - arch/mips/sgi-ip22/Platform | 34 ++ arch/mips/sgi-ip27/Makefile | 2 - arch/mips/sgi-ip27/Platform | 19 + arch/mips/sgi-ip27/ip27-klconfig.c | 8 +- arch/mips/sgi-ip32/Makefile | 2 - arch/mips/sgi-ip32/Platform | 11 + arch/mips/sibyte/Makefile | 27 + arch/mips/sibyte/Platform | 43 ++ arch/mips/sibyte/bcm1480/Makefile | 2 - arch/mips/sibyte/common/Makefile | 2 - arch/mips/sibyte/sb1250/Makefile | 2 - arch/mips/sni/Makefile | 2 - arch/mips/sni/Platform | 11 + arch/mips/txx9/Makefile | 17 + arch/mips/txx9/Platform | 10 + arch/mips/txx9/generic/Makefile | 2 - arch/mips/txx9/jmr3927/Makefile | 2 - arch/mips/txx9/rbtx4927/Makefile | 2 - arch/mips/txx9/rbtx4938/Makefile | 2 - arch/mips/txx9/rbtx4939/Makefile | 2 - arch/mips/vr41xx/Platform | 32 ++ arch/mips/vr41xx/common/Makefile | 2 - arch/mips/{gt64120 => }/wrppmc/Makefile | 4 +- arch/mips/wrppmc/Platform | 7 + arch/mips/{gt64120 => }/wrppmc/irq.c | 0 arch/mips/{gt64120 => }/wrppmc/pci.c | 0 arch/mips/{gt64120 => }/wrppmc/reset.c | 0 arch/mips/{gt64120 => }/wrppmc/serial.c | 0 arch/mips/{gt64120 => }/wrppmc/setup.c | 0 arch/mips/{gt64120 => }/wrppmc/time.c | 0 kernel/printk.c | 30 +- 126 files changed, 1189 insertions(+), 821 deletions(-) create mode 100644 arch/mips/Kbuild create mode 100644 arch/mips/Kbuild.platforms create mode 100644 arch/mips/alchemy/Platform create mode 100644 arch/mips/ar7/Platform create mode 100644 arch/mips/bcm47xx/Platform create mode 100644 arch/mips/bcm63xx/Platform create mode 100644 arch/mips/cavium-octeon/Platform create mode 100644 arch/mips/cobalt/Platform create mode 100644 arch/mips/dec/Platform create mode 100644 arch/mips/emma/Makefile create mode 100644 arch/mips/emma/Platform create mode 100644 arch/mips/jazz/Platform create mode 100644 arch/mips/lasat/Platform create mode 100644 arch/mips/loongson/Platform create mode 100644 arch/mips/mipssim/Platform create mode 100644 arch/mips/mti-malta/Platform delete mode 100644 arch/mips/nxp/pnx833x/stb22x/Makefile delete mode 100644 arch/mips/nxp/pnx8550/jbs/Makefile delete mode 100644 arch/mips/nxp/pnx8550/stb810/Makefile create mode 100644 arch/mips/pmc-sierra/Platform create mode 100644 arch/mips/pnx833x/Makefile create mode 100644 arch/mips/pnx833x/Platform rename arch/mips/{nxp => }/pnx833x/common/Makefile (69%) rename arch/mips/{nxp => }/pnx833x/common/interrupts.c (100%) rename arch/mips/{nxp => }/pnx833x/common/platform.c (100%) rename arch/mips/{nxp => }/pnx833x/common/prom.c (100%) rename arch/mips/{nxp => }/pnx833x/common/reset.c (100%) rename arch/mips/{nxp => }/pnx833x/common/setup.c (100%) create mode 100644 arch/mips/pnx833x/stb22x/Makefile rename arch/mips/{nxp => }/pnx833x/stb22x/board.c (100%) create mode 100644 arch/mips/pnx8550/Makefile create mode 100644 arch/mips/pnx8550/Platform rename arch/mips/{nxp => }/pnx8550/common/Makefile (97%) rename arch/mips/{nxp => }/pnx8550/common/int.c (100%) rename arch/mips/{nxp => }/pnx8550/common/pci.c (100%) rename arch/mips/{nxp => }/pnx8550/common/platform.c (100%) rename arch/mips/{nxp => }/pnx8550/common/proc.c (100%) rename arch/mips/{nxp => }/pnx8550/common/prom.c (100%) rename arch/mips/{nxp => }/pnx8550/common/reset.c (100%) rename arch/mips/{nxp => }/pnx8550/common/setup.c (100%) rename arch/mips/{nxp => }/pnx8550/common/time.c (100%) create mode 100644 arch/mips/pnx8550/jbs/Makefile rename arch/mips/{nxp => }/pnx8550/jbs/board_setup.c (100%) rename arch/mips/{nxp => }/pnx8550/jbs/init.c (100%) rename arch/mips/{nxp => }/pnx8550/jbs/irqmap.c (100%) create mode 100644 arch/mips/pnx8550/stb810/Makefile rename arch/mips/{nxp => }/pnx8550/stb810/board_setup.c (100%) rename arch/mips/{nxp => }/pnx8550/stb810/irqmap.c (100%) rename arch/mips/{nxp => }/pnx8550/stb810/prom_init.c (100%) create mode 100644 arch/mips/powertv/Platform create mode 100644 arch/mips/powertv/ioremap.c create mode 100644 arch/mips/rb532/Platform create mode 100644 arch/mips/sgi-ip22/Platform create mode 100644 arch/mips/sgi-ip27/Platform create mode 100644 arch/mips/sgi-ip32/Platform create mode 100644 arch/mips/sibyte/Makefile create mode 100644 arch/mips/sibyte/Platform create mode 100644 arch/mips/sni/Platform create mode 100644 arch/mips/txx9/Makefile create mode 100644 arch/mips/txx9/Platform create mode 100644 arch/mips/vr41xx/Platform rename arch/mips/{gt64120 => }/wrppmc/Makefile (80%) create mode 100644 arch/mips/wrppmc/Platform rename arch/mips/{gt64120 => }/wrppmc/irq.c (100%) rename arch/mips/{gt64120 => }/wrppmc/pci.c (100%) rename arch/mips/{gt64120 => }/wrppmc/reset.c (100%) rename arch/mips/{gt64120 => }/wrppmc/serial.c (100%) rename arch/mips/{gt64120 => }/wrppmc/setup.c (100%) rename arch/mips/{gt64120 => }/wrppmc/time.c (100%) Merging parisc/next $ git merge parisc/next Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging 52xx-and-virtex/next $ git merge 52xx-and-virtex/next Resolved 'drivers/serial/mpc52xx_uart.c' using previous resolution. Auto-merging drivers/serial/mpc52xx_uart.c CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 116d2b9] Merge remote branch '52xx-and-virtex/next' $ git diff -M --stat --summary HEAD^.. arch/powerpc/platforms/512x/Kconfig | 13 +-- drivers/serial/mpc52xx_uart.c | 145 ++++++++++++++++++++++++++++------- 2 files changed, 120 insertions(+), 38 deletions(-) Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/appldata/appldata_os.c | 2 +- arch/s390/defconfig | 23 ++++++++++------- arch/s390/include/asm/ccwdev.h | 2 + arch/s390/kernel/module.c | 6 +++- arch/s390/kvm/kvm-s390.c | 2 +- arch/s390/kvm/sigp.c | 2 +- arch/s390/mm/cmm.c | 11 +++++++- arch/s390/mm/extmem.c | 19 +++++++------- drivers/s390/cio/chsc.c | 49 ++++++++++++++++++++++++++++++++++++++ drivers/s390/cio/chsc.h | 2 + drivers/s390/cio/device.c | 37 ++++++++++++++++++++++++++++ drivers/s390/cio/itcw.c | 2 +- drivers/s390/net/smsgiucv_app.c | 7 +++++ 13 files changed, 137 insertions(+), 27 deletions(-) Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/boards/mach-ecovec24/setup.c | 1 - arch/sh/drivers/pci/pci.c | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) Merging genesis/master $ git merge genesis/master Resolved 'include/linux/serial_sci.h' using previous resolution. Auto-merging MAINTAINERS Auto-merging drivers/i2c/busses/Kconfig Auto-merging drivers/video/Kconfig Auto-merging include/linux/serial_sci.h CONFLICT (content): Merge conflict in include/linux/serial_sci.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 127a37e] Merge remote branch 'genesis/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 3 +- arch/arm/configs/ap4evb_defconfig | 604 +++++++++++++++++++++++-- arch/arm/configs/g3evm_defconfig | 73 +++- arch/arm/configs/g4evm_defconfig | 72 +++- arch/arm/mach-shmobile/Kconfig | 13 + arch/arm/mach-shmobile/Makefile | 6 +- arch/arm/mach-shmobile/board-ap4evb.c | 499 ++++++++++++++++++++- arch/arm/mach-shmobile/board-g3evm.c | 58 ++- arch/arm/mach-shmobile/board-g4evm.c | 153 ++++++- arch/arm/mach-shmobile/clock-sh7367.c | 357 +++++++++++++-- arch/arm/mach-shmobile/clock-sh7372.c | 399 ++++++++++++++++ arch/arm/mach-shmobile/clock-sh7377.c | 369 +++++++++++++++ arch/arm/mach-shmobile/clock.c | 44 ++ arch/arm/mach-shmobile/include/mach/common.h | 10 + arch/arm/mach-shmobile/include/mach/irqs.h | 6 + arch/arm/mach-shmobile/include/mach/memory.h | 3 + arch/arm/mach-shmobile/include/mach/sh7372.h | 24 + arch/arm/mach-shmobile/include/mach/vmalloc.h | 3 +- arch/arm/mach-shmobile/intc-sh7367.c | 178 +++++++- arch/arm/mach-shmobile/intc-sh7372.c | 232 +++++++++- arch/arm/mach-shmobile/intc-sh7377.c | 300 ++++++++++++- arch/arm/mach-shmobile/setup-sh7367.c | 30 +- arch/arm/mach-shmobile/setup-sh7372.c | 391 +++++++++++++++- arch/arm/mach-shmobile/setup-sh7377.c | 34 +- drivers/dma/Kconfig | 2 +- drivers/dma/shdma.c | 8 +- drivers/i2c/busses/Kconfig | 2 +- drivers/i2c/busses/i2c-sh_mobile.c | 121 ++++-- drivers/serial/sh-sci.c | 42 ++- drivers/serial/sh-sci.h | 29 +- drivers/sh/Makefile | 5 +- drivers/video/Kconfig | 8 + drivers/video/Makefile | 1 + drivers/video/sh_mipi_dsi.c | 505 +++++++++++++++++++++ include/linux/serial_core.h | 3 + include/video/mipi_display.h | 130 ++++++ include/video/sh_mipi_dsi.h | 35 ++ include/video/sh_mobile_lcdc.h | 39 +- 38 files changed, 4518 insertions(+), 273 deletions(-) create mode 100644 arch/arm/mach-shmobile/clock-sh7372.c create mode 100644 arch/arm/mach-shmobile/clock-sh7377.c create mode 100644 arch/arm/mach-shmobile/clock.c create mode 100644 drivers/video/sh_mipi_dsi.c create mode 100644 include/video/mipi_display.h create mode 100644 include/video/sh_mipi_dsi.h Merging sparc/master $ git merge sparc/master Already up-to-date. Merging tile/master $ git merge tile/master Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 6 + arch/tile/Kbuild | 3 + arch/tile/Kconfig | 352 + arch/tile/Kconfig.debug | 43 + arch/tile/Makefile | 52 + arch/tile/configs/tile_defconfig | 1289 +++ arch/tile/include/arch/abi.h | 93 + arch/tile/include/arch/chip.h | 23 + arch/tile/include/arch/chip_tile64.h | 252 + arch/tile/include/arch/chip_tilepro.h | 252 + arch/tile/include/arch/interrupts.h | 19 + arch/tile/include/arch/interrupts_32.h | 304 + arch/tile/include/arch/sim_def.h | 512 + arch/tile/include/arch/spr_def.h | 19 + arch/tile/include/arch/spr_def_32.h | 162 + arch/tile/include/asm/Kbuild | 3 + arch/tile/include/asm/asm-offsets.h | 1 + arch/tile/include/asm/atomic.h | 159 + arch/tile/include/asm/atomic_32.h | 353 + arch/tile/include/asm/auxvec.h | 20 + arch/tile/include/asm/backtrace.h | 193 + arch/tile/include/asm/bitops.h | 126 + arch/tile/include/asm/bitops_32.h | 132 + arch/tile/include/asm/bitsperlong.h | 26 + arch/tile/include/asm/bug.h | 1 + arch/tile/include/asm/bugs.h | 1 + arch/tile/include/asm/byteorder.h | 1 + arch/tile/include/asm/cache.h | 50 + arch/tile/include/asm/cacheflush.h | 145 + arch/tile/include/asm/checksum.h | 24 + arch/tile/include/asm/compat.h | 308 + arch/tile/include/asm/cputime.h | 1 + arch/tile/include/asm/current.h | 31 + arch/tile/include/asm/delay.h | 34 + arch/tile/include/asm/device.h | 1 + arch/tile/include/asm/div64.h | 1 + arch/tile/include/asm/dma-mapping.h | 102 + arch/tile/include/asm/dma.h | 25 + arch/tile/include/asm/elf.h | 169 + arch/tile/include/asm/emergency-restart.h | 1 + arch/tile/include/asm/errno.h | 1 + arch/tile/include/asm/fcntl.h | 1 + arch/tile/include/asm/fixmap.h | 124 + arch/tile/include/asm/ftrace.h | 20 + arch/tile/include/asm/futex.h | 136 + arch/tile/include/asm/hardirq.h | 47 + arch/tile/include/asm/highmem.h | 73 + arch/tile/include/asm/homecache.h | 125 + arch/tile/include/asm/hugetlb.h | 109 + arch/tile/include/asm/hv_driver.h | 60 + arch/tile/include/asm/hw_irq.h | 18 + arch/tile/include/asm/ide.h | 25 + arch/tile/include/asm/io.h | 279 + arch/tile/include/asm/ioctl.h | 1 + arch/tile/include/asm/ioctls.h | 1 + arch/tile/include/asm/ipc.h | 1 + arch/tile/include/asm/ipcbuf.h | 1 + arch/tile/include/asm/irq.h | 37 + arch/tile/include/asm/irq_regs.h | 1 + arch/tile/include/asm/irqflags.h | 267 + arch/tile/include/asm/kdebug.h | 1 + arch/tile/include/asm/kexec.h | 53 + arch/tile/include/asm/kmap_types.h | 43 + arch/tile/include/asm/linkage.h | 51 + arch/tile/include/asm/local.h | 1 + arch/tile/include/asm/memprof.h | 33 + arch/tile/include/asm/mman.h | 40 + arch/tile/include/asm/mmu.h | 31 + arch/tile/include/asm/mmu_context.h | 131 + arch/tile/include/asm/mmzone.h | 81 + arch/tile/include/asm/module.h | 1 + arch/tile/include/asm/msgbuf.h | 1 + arch/tile/include/asm/mutex.h | 1 + arch/tile/include/asm/opcode-tile.h | 30 + arch/tile/include/asm/opcode-tile_32.h | 1597 ++++ arch/tile/include/asm/opcode-tile_64.h | 1597 ++++ arch/tile/include/asm/opcode_constants.h | 26 + arch/tile/include/asm/opcode_constants_32.h | 480 + arch/tile/include/asm/opcode_constants_64.h | 480 + arch/tile/include/asm/page.h | 334 + arch/tile/include/asm/param.h | 1 + arch/tile/include/asm/pci-bridge.h | 117 + arch/tile/include/asm/pci.h | 128 + arch/tile/include/asm/percpu.h | 24 + arch/tile/include/asm/pgalloc.h | 119 + arch/tile/include/asm/pgtable.h | 475 + arch/tile/include/asm/pgtable_32.h | 117 + arch/tile/include/asm/poll.h | 1 + arch/tile/include/asm/posix_types.h | 1 + arch/tile/include/asm/processor.h | 339 + arch/tile/include/asm/ptrace.h | 163 + arch/tile/include/asm/resource.h | 1 + arch/tile/include/asm/scatterlist.h | 22 + arch/tile/include/asm/sections.h | 37 + arch/tile/include/asm/sembuf.h | 1 + arch/tile/include/asm/setup.h | 32 + arch/tile/include/asm/shmbuf.h | 1 + arch/tile/include/asm/shmparam.h | 1 + arch/tile/include/asm/sigcontext.h | 27 + arch/tile/include/asm/sigframe.h | 33 + arch/tile/include/asm/siginfo.h | 30 + arch/tile/include/asm/signal.h | 31 + arch/tile/include/asm/smp.h | 126 + arch/tile/include/asm/socket.h | 1 + arch/tile/include/asm/sockios.h | 1 + arch/tile/include/asm/spinlock.h | 24 + arch/tile/include/asm/spinlock_32.h | 200 + arch/tile/include/asm/spinlock_types.h | 60 + arch/tile/include/asm/stack.h | 68 + arch/tile/include/asm/stat.h | 1 + arch/tile/include/asm/statfs.h | 1 + arch/tile/include/asm/string.h | 32 + arch/tile/include/asm/swab.h | 29 + arch/tile/include/asm/syscall.h | 79 + arch/tile/include/asm/syscalls.h | 40 + arch/tile/include/asm/system.h | 220 + arch/tile/include/asm/termbits.h | 1 + arch/tile/include/asm/termios.h | 1 + arch/tile/include/asm/thread_info.h | 165 + arch/tile/include/asm/timex.h | 47 + arch/tile/include/asm/tlb.h | 25 + arch/tile/include/asm/tlbflush.h | 128 + arch/tile/include/asm/topology.h | 85 + arch/tile/include/asm/traps.h | 36 + arch/tile/include/asm/types.h | 1 + arch/tile/include/asm/uaccess.h | 578 ++ arch/tile/include/asm/ucontext.h | 1 + arch/tile/include/asm/unaligned.h | 24 + arch/tile/include/asm/unistd.h | 47 + arch/tile/include/asm/user.h | 21 + arch/tile/include/asm/xor.h | 1 + arch/tile/include/hv/drv_pcie_rc_intf.h | 38 + arch/tile/include/hv/hypervisor.h | 2366 +++++ arch/tile/include/hv/syscall_public.h | 42 + arch/tile/kernel/Makefile | 16 + arch/tile/kernel/asm-offsets.c | 76 + arch/tile/kernel/backtrace.c | 634 ++ arch/tile/kernel/compat.c | 183 + arch/tile/kernel/compat_signal.c | 433 + arch/tile/kernel/early_printk.c | 109 + arch/tile/kernel/entry.S | 141 + arch/tile/kernel/head_32.S | 180 + arch/tile/kernel/hvglue.lds | 56 + arch/tile/kernel/init_task.c | 59 + arch/tile/kernel/intvec_32.S | 2006 ++++ arch/tile/kernel/irq.c | 227 + arch/tile/kernel/machine_kexec.c | 291 + arch/tile/kernel/messaging.c | 115 + arch/tile/kernel/module.c | 257 + arch/tile/kernel/pci-dma.c | 251 + arch/tile/kernel/proc.c | 91 + arch/tile/kernel/process.c | 647 ++ arch/tile/kernel/ptrace.c | 203 + arch/tile/kernel/reboot.c | 52 + arch/tile/kernel/regs_32.S | 145 + arch/tile/kernel/relocate_kernel.S | 280 + arch/tile/kernel/setup.c | 1497 +++ arch/tile/kernel/signal.c | 359 + arch/tile/kernel/single_step.c | 656 ++ arch/tile/kernel/smp.c | 202 + arch/tile/kernel/smpboot.c | 293 + arch/tile/kernel/stack.c | 485 + arch/tile/kernel/sys.c | 122 + arch/tile/kernel/tile-desc_32.c |13826 +++++++++++++++++++++++++++ arch/tile/kernel/time.c | 220 + arch/tile/kernel/tlb.c | 97 + arch/tile/kernel/traps.c | 237 + arch/tile/kernel/vmlinux.lds.S | 98 + arch/tile/lib/Makefile | 16 + arch/tile/lib/__invalidate_icache.S | 106 + arch/tile/lib/atomic_32.c | 347 + arch/tile/lib/atomic_asm_32.S | 197 + arch/tile/lib/checksum.c | 102 + arch/tile/lib/cpumask.c | 51 + arch/tile/lib/delay.c | 34 + arch/tile/lib/exports.c | 78 + arch/tile/lib/mb_incoherent.S | 34 + arch/tile/lib/memchr_32.c | 68 + arch/tile/lib/memcpy_32.S | 628 ++ arch/tile/lib/memcpy_tile64.c | 271 + arch/tile/lib/memmove_32.c | 63 + arch/tile/lib/memset_32.c | 274 + arch/tile/lib/spinlock_32.c | 221 + arch/tile/lib/spinlock_common.h | 64 + arch/tile/lib/strchr_32.c | 66 + arch/tile/lib/strlen_32.c | 36 + arch/tile/lib/uaccess.c | 31 + arch/tile/lib/usercopy_32.S | 223 + arch/tile/mm/Makefile | 9 + arch/tile/mm/elf.c | 164 + arch/tile/mm/extable.c | 30 + arch/tile/mm/fault.c | 905 ++ arch/tile/mm/highmem.c | 328 + arch/tile/mm/homecache.c | 445 + arch/tile/mm/hugetlbpage.c | 343 + arch/tile/mm/init.c | 1082 +++ arch/tile/mm/migrate.h | 50 + arch/tile/mm/migrate_32.S | 211 + arch/tile/mm/mmap.c | 75 + arch/tile/mm/pgtable.c | 566 ++ drivers/char/Makefile | 1 + drivers/char/hvc_tile.c | 67 + include/asm-generic/unistd.h | 26 +- 203 files changed, 49568 insertions(+), 6 deletions(-) create mode 100644 arch/tile/Kbuild create mode 100644 arch/tile/Kconfig create mode 100644 arch/tile/Kconfig.debug create mode 100644 arch/tile/Makefile create mode 100644 arch/tile/configs/tile_defconfig create mode 100644 arch/tile/include/arch/abi.h create mode 100644 arch/tile/include/arch/chip.h create mode 100644 arch/tile/include/arch/chip_tile64.h create mode 100644 arch/tile/include/arch/chip_tilepro.h create mode 100644 arch/tile/include/arch/interrupts.h create mode 100644 arch/tile/include/arch/interrupts_32.h create mode 100644 arch/tile/include/arch/sim_def.h create mode 100644 arch/tile/include/arch/spr_def.h create mode 100644 arch/tile/include/arch/spr_def_32.h create mode 100644 arch/tile/include/asm/Kbuild create mode 100644 arch/tile/include/asm/asm-offsets.h create mode 100644 arch/tile/include/asm/atomic.h create mode 100644 arch/tile/include/asm/atomic_32.h create mode 100644 arch/tile/include/asm/auxvec.h create mode 100644 arch/tile/include/asm/backtrace.h create mode 100644 arch/tile/include/asm/bitops.h create mode 100644 arch/tile/include/asm/bitops_32.h create mode 100644 arch/tile/include/asm/bitsperlong.h create mode 100644 arch/tile/include/asm/bug.h create mode 100644 arch/tile/include/asm/bugs.h create mode 100644 arch/tile/include/asm/byteorder.h create mode 100644 arch/tile/include/asm/cache.h create mode 100644 arch/tile/include/asm/cacheflush.h create mode 100644 arch/tile/include/asm/checksum.h create mode 100644 arch/tile/include/asm/compat.h create mode 100644 arch/tile/include/asm/cputime.h create mode 100644 arch/tile/include/asm/current.h create mode 100644 arch/tile/include/asm/delay.h create mode 100644 arch/tile/include/asm/device.h create mode 100644 arch/tile/include/asm/div64.h create mode 100644 arch/tile/include/asm/dma-mapping.h create mode 100644 arch/tile/include/asm/dma.h create mode 100644 arch/tile/include/asm/elf.h create mode 100644 arch/tile/include/asm/emergency-restart.h create mode 100644 arch/tile/include/asm/errno.h create mode 100644 arch/tile/include/asm/fcntl.h create mode 100644 arch/tile/include/asm/fixmap.h create mode 100644 arch/tile/include/asm/ftrace.h create mode 100644 arch/tile/include/asm/futex.h create mode 100644 arch/tile/include/asm/hardirq.h create mode 100644 arch/tile/include/asm/highmem.h create mode 100644 arch/tile/include/asm/homecache.h create mode 100644 arch/tile/include/asm/hugetlb.h create mode 100644 arch/tile/include/asm/hv_driver.h create mode 100644 arch/tile/include/asm/hw_irq.h create mode 100644 arch/tile/include/asm/ide.h create mode 100644 arch/tile/include/asm/io.h create mode 100644 arch/tile/include/asm/ioctl.h create mode 100644 arch/tile/include/asm/ioctls.h create mode 100644 arch/tile/include/asm/ipc.h create mode 100644 arch/tile/include/asm/ipcbuf.h create mode 100644 arch/tile/include/asm/irq.h create mode 100644 arch/tile/include/asm/irq_regs.h create mode 100644 arch/tile/include/asm/irqflags.h create mode 100644 arch/tile/include/asm/kdebug.h create mode 100644 arch/tile/include/asm/kexec.h create mode 100644 arch/tile/include/asm/kmap_types.h create mode 100644 arch/tile/include/asm/linkage.h create mode 100644 arch/tile/include/asm/local.h create mode 100644 arch/tile/include/asm/memprof.h create mode 100644 arch/tile/include/asm/mman.h create mode 100644 arch/tile/include/asm/mmu.h create mode 100644 arch/tile/include/asm/mmu_context.h create mode 100644 arch/tile/include/asm/mmzone.h create mode 100644 arch/tile/include/asm/module.h create mode 100644 arch/tile/include/asm/msgbuf.h create mode 100644 arch/tile/include/asm/mutex.h create mode 100644 arch/tile/include/asm/opcode-tile.h create mode 100644 arch/tile/include/asm/opcode-tile_32.h create mode 100644 arch/tile/include/asm/opcode-tile_64.h create mode 100644 arch/tile/include/asm/opcode_constants.h create mode 100644 arch/tile/include/asm/opcode_constants_32.h create mode 100644 arch/tile/include/asm/opcode_constants_64.h create mode 100644 arch/tile/include/asm/page.h create mode 100644 arch/tile/include/asm/param.h create mode 100644 arch/tile/include/asm/pci-bridge.h create mode 100644 arch/tile/include/asm/pci.h create mode 100644 arch/tile/include/asm/percpu.h create mode 100644 arch/tile/include/asm/pgalloc.h create mode 100644 arch/tile/include/asm/pgtable.h create mode 100644 arch/tile/include/asm/pgtable_32.h create mode 100644 arch/tile/include/asm/poll.h create mode 100644 arch/tile/include/asm/posix_types.h create mode 100644 arch/tile/include/asm/processor.h create mode 100644 arch/tile/include/asm/ptrace.h create mode 100644 arch/tile/include/asm/resource.h create mode 100644 arch/tile/include/asm/scatterlist.h create mode 100644 arch/tile/include/asm/sections.h create mode 100644 arch/tile/include/asm/sembuf.h create mode 100644 arch/tile/include/asm/setup.h create mode 100644 arch/tile/include/asm/shmbuf.h create mode 100644 arch/tile/include/asm/shmparam.h create mode 100644 arch/tile/include/asm/sigcontext.h create mode 100644 arch/tile/include/asm/sigframe.h create mode 100644 arch/tile/include/asm/siginfo.h create mode 100644 arch/tile/include/asm/signal.h create mode 100644 arch/tile/include/asm/smp.h create mode 100644 arch/tile/include/asm/socket.h create mode 100644 arch/tile/include/asm/sockios.h create mode 100644 arch/tile/include/asm/spinlock.h create mode 100644 arch/tile/include/asm/spinlock_32.h create mode 100644 arch/tile/include/asm/spinlock_types.h create mode 100644 arch/tile/include/asm/stack.h create mode 100644 arch/tile/include/asm/stat.h create mode 100644 arch/tile/include/asm/statfs.h create mode 100644 arch/tile/include/asm/string.h create mode 100644 arch/tile/include/asm/swab.h create mode 100644 arch/tile/include/asm/syscall.h create mode 100644 arch/tile/include/asm/syscalls.h create mode 100644 arch/tile/include/asm/system.h create mode 100644 arch/tile/include/asm/termbits.h create mode 100644 arch/tile/include/asm/termios.h create mode 100644 arch/tile/include/asm/thread_info.h create mode 100644 arch/tile/include/asm/timex.h create mode 100644 arch/tile/include/asm/tlb.h create mode 100644 arch/tile/include/asm/tlbflush.h create mode 100644 arch/tile/include/asm/topology.h create mode 100644 arch/tile/include/asm/traps.h create mode 100644 arch/tile/include/asm/types.h create mode 100644 arch/tile/include/asm/uaccess.h create mode 100644 arch/tile/include/asm/ucontext.h create mode 100644 arch/tile/include/asm/unaligned.h create mode 100644 arch/tile/include/asm/unistd.h create mode 100644 arch/tile/include/asm/user.h create mode 100644 arch/tile/include/asm/xor.h create mode 100644 arch/tile/include/hv/drv_pcie_rc_intf.h create mode 100644 arch/tile/include/hv/hypervisor.h create mode 100644 arch/tile/include/hv/syscall_public.h create mode 100644 arch/tile/kernel/Makefile create mode 100644 arch/tile/kernel/asm-offsets.c create mode 100644 arch/tile/kernel/backtrace.c create mode 100644 arch/tile/kernel/compat.c create mode 100644 arch/tile/kernel/compat_signal.c create mode 100644 arch/tile/kernel/early_printk.c create mode 100644 arch/tile/kernel/entry.S create mode 100644 arch/tile/kernel/head_32.S create mode 100644 arch/tile/kernel/hvglue.lds create mode 100644 arch/tile/kernel/init_task.c create mode 100644 arch/tile/kernel/intvec_32.S create mode 100644 arch/tile/kernel/irq.c create mode 100644 arch/tile/kernel/machine_kexec.c create mode 100644 arch/tile/kernel/messaging.c create mode 100644 arch/tile/kernel/module.c create mode 100644 arch/tile/kernel/pci-dma.c create mode 100644 arch/tile/kernel/proc.c create mode 100644 arch/tile/kernel/process.c create mode 100644 arch/tile/kernel/ptrace.c create mode 100644 arch/tile/kernel/reboot.c create mode 100644 arch/tile/kernel/regs_32.S create mode 100644 arch/tile/kernel/relocate_kernel.S create mode 100644 arch/tile/kernel/setup.c create mode 100644 arch/tile/kernel/signal.c create mode 100644 arch/tile/kernel/single_step.c create mode 100644 arch/tile/kernel/smp.c create mode 100644 arch/tile/kernel/smpboot.c create mode 100644 arch/tile/kernel/stack.c create mode 100644 arch/tile/kernel/sys.c create mode 100644 arch/tile/kernel/tile-desc_32.c create mode 100644 arch/tile/kernel/time.c create mode 100644 arch/tile/kernel/tlb.c create mode 100644 arch/tile/kernel/traps.c create mode 100644 arch/tile/kernel/vmlinux.lds.S create mode 100644 arch/tile/lib/Makefile create mode 100644 arch/tile/lib/__invalidate_icache.S create mode 100644 arch/tile/lib/atomic_32.c create mode 100644 arch/tile/lib/atomic_asm_32.S create mode 100644 arch/tile/lib/checksum.c create mode 100644 arch/tile/lib/cpumask.c create mode 100644 arch/tile/lib/delay.c create mode 100644 arch/tile/lib/exports.c create mode 100644 arch/tile/lib/mb_incoherent.S create mode 100644 arch/tile/lib/memchr_32.c create mode 100644 arch/tile/lib/memcpy_32.S create mode 100644 arch/tile/lib/memcpy_tile64.c create mode 100644 arch/tile/lib/memmove_32.c create mode 100644 arch/tile/lib/memset_32.c create mode 100644 arch/tile/lib/spinlock_32.c create mode 100644 arch/tile/lib/spinlock_common.h create mode 100644 arch/tile/lib/strchr_32.c create mode 100644 arch/tile/lib/strlen_32.c create mode 100644 arch/tile/lib/uaccess.c create mode 100644 arch/tile/lib/usercopy_32.S create mode 100644 arch/tile/mm/Makefile create mode 100644 arch/tile/mm/elf.c create mode 100644 arch/tile/mm/extable.c create mode 100644 arch/tile/mm/fault.c create mode 100644 arch/tile/mm/highmem.c create mode 100644 arch/tile/mm/homecache.c create mode 100644 arch/tile/mm/hugetlbpage.c create mode 100644 arch/tile/mm/init.c create mode 100644 arch/tile/mm/migrate.h create mode 100644 arch/tile/mm/migrate_32.S create mode 100644 arch/tile/mm/mmap.c create mode 100644 arch/tile/mm/pgtable.c create mode 100644 drivers/char/hvc_tile.c Merging xtensa/master $ git merge xtensa/master Auto-merging arch/xtensa/kernel/time.c Merge made by recursive. arch/xtensa/Kconfig | 17 +- arch/xtensa/Makefile | 7 +- arch/xtensa/boot/Makefile | 1 + arch/xtensa/configs/iss_defconfig | 1 + arch/xtensa/include/asm/cacheflush.h | 1 + arch/xtensa/include/asm/coprocessor.h | 9 +- arch/xtensa/include/asm/elf.h | 1 + arch/xtensa/include/asm/io.h | 40 ++-- arch/xtensa/include/asm/irq.h | 7 +- arch/xtensa/include/asm/pgalloc.h | 1 + arch/xtensa/include/asm/processor.h | 1 - arch/xtensa/include/asm/ptrace.h | 2 + arch/xtensa/include/asm/serial.h | 12 +- arch/xtensa/kernel/Makefile | 8 +- arch/xtensa/kernel/asm-offsets.c | 1 + arch/xtensa/kernel/entry.S | 1 + arch/xtensa/kernel/head.S | 4 +- arch/xtensa/kernel/time.c | 2 +- arch/xtensa/platforms/iss/network.c | 22 +- arch/xtensa/platforms/xtavnet/Makefile | 10 + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ .../platforms/xtavnet/include/platform/lcd.h | 22 ++ .../platforms/xtavnet/include/platform/serial.h | 1 + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ 25 files changed, 554 insertions(+), 50 deletions(-) create mode 100644 arch/xtensa/platforms/xtavnet/Makefile create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c create mode 100644 arch/xtensa/platforms/xtavnet/setup.c Merging ceph/for-next $ git merge ceph/for-next Merge made by recursive. fs/ceph/addr.c | 2 +- fs/ceph/caps.c | 40 +++++++++++++++++++++++++++++----------- fs/ceph/ceph_fs.c | 50 ++++++++++++++++++++++++-------------------------- fs/ceph/ceph_fs.h | 3 ++- fs/ceph/file.c | 24 ++++++++++++++++-------- fs/ceph/inode.c | 5 +++-- fs/ceph/ioctl.c | 24 ++++++++++++++++++++++++ fs/ceph/ioctl.h | 2 ++ 8 files changed, 101 insertions(+), 49 deletions(-) Merging cifs/master $ git merge cifs/master Already up-to-date. Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Resolved 'fs/ecryptfs/main.c' using previous resolution. Auto-merging fs/ecryptfs/main.c CONFLICT (content): Merge conflict in fs/ecryptfs/main.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a41a139] Merge remote branch 'ecryptfs/next' $ git diff -M --stat --summary HEAD^.. Merging ext3/for_next $ git merge ext3/for_next Auto-merging fs/xfs/linux-2.6/xfs_quotaops.c Merge made by recursive. fs/ext2/acl.c | 1 + fs/ext3/acl.c | 1 + fs/gfs2/quota.c | 10 +++++----- fs/quota/dquot.c | 38 +++++++++++++++++++++++++++++--------- fs/xfs/linux-2.6/xfs_quotaops.c | 10 +++++----- fs/xfs/quota/xfs_qm_syscalls.c | 32 ++++++++++++++++---------------- include/linux/dqblk_xfs.h | 24 ++++++++++++------------ include/linux/quotaops.h | 10 ---------- 8 files changed, 69 insertions(+), 57 deletions(-) Merging ext4/next $ git merge ext4/next Already up-to-date. Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Already up-to-date. Merging jfs/next $ git merge jfs/next Already up-to-date. Merging logfs/master $ git merge logfs/master Resolved 'fs/logfs/logfs.h' using previous resolution. Auto-merging fs/logfs/dir.c Auto-merging fs/logfs/file.c Auto-merging fs/logfs/logfs.h CONFLICT (content): Merge conflict in fs/logfs/logfs.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 57c480a] Merge remote branch 'logfs/master' $ git diff -M --stat --summary HEAD^.. fs/logfs/dir.c | 2 +- fs/logfs/file.c | 6 +++--- fs/logfs/logfs.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) Merging nfs/linux-next $ git merge nfs/linux-next Already up-to-date. Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Merge made by recursive. fs/nfsd/nfs4callback.c | 34 ++++++++++++++-------------------- fs/nfsd/nfs4state.c | 16 ++++++++++++---- 2 files changed, 26 insertions(+), 24 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Merge made by recursive. fs/nilfs2/recovery.c | 346 +++++++++++++++++++++++++++---------------------- fs/nilfs2/segbuf.h | 24 ++-- fs/nilfs2/segment.c | 8 +- fs/nilfs2/segment.h | 10 +- fs/nilfs2/the_nilfs.c | 12 +- fs/nilfs2/the_nilfs.h | 2 + 6 files changed, 222 insertions(+), 180 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Already up-to-date. Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging udf/for_next $ git merge udf/for_next Auto-merging fs/udf/file.c Merge made by recursive. fs/udf/file.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) Merging v9fs/for-next $ git merge v9fs/for-next Merge made by recursive. fs/9p/fid.c | 3 +- fs/9p/v9fs.c | 2 +- fs/9p/vfs_dir.c | 134 +++++++++++++++++++++++++++++++++++++++----- fs/9p/vfs_file.c | 13 ++-- fs/9p/vfs_inode.c | 79 ++++++++++++++++++++++++++- include/linux/virtio_9p.h | 1 + include/net/9p/9p.h | 19 ++++++ include/net/9p/client.h | 19 ++++++ net/9p/client.c | 71 +++++++++++++++++++++++- net/9p/protocol.c | 27 +++++++++ 10 files changed, 342 insertions(+), 26 deletions(-) Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Already up-to-date. Merging vfs/for-next $ git merge vfs/for-next Auto-merging fs/9p/vfs_inode.c Auto-merging fs/logfs/file.c Auto-merging fs/nilfs2/recovery.c Auto-merging fs/udf/file.c Merge made by recursive. Documentation/filesystems/porting | 18 +++ arch/powerpc/platforms/cell/spufs/inode.c | 4 +- arch/um/include/shared/os.h | 3 + arch/um/kernel/ksyms.c | 3 + arch/um/os-Linux/file.c | 15 +++ arch/um/os-Linux/user_syms.c | 4 + drivers/staging/pohmelfs/inode.c | 14 ++- fs/9p/vfs_inode.c | 15 ++- fs/adfs/inode.c | 16 ++- fs/affs/file.c | 11 ++- fs/affs/inode.c | 13 ++- fs/attr.c | 88 ++++++-------- fs/bfs/file.c | 14 ++- fs/block_dev.c | 10 +- fs/btrfs/inode.c | 12 +- fs/buffer.c | 180 ++++++----------------------- fs/cifs/inode.c | 74 ++++++++----- fs/direct-io.c | 74 +++--------- fs/ecryptfs/inode.c | 18 +++- fs/exofs/inode.c | 14 ++- fs/ext2/dir.c | 23 ++-- fs/ext2/ext2.h | 3 - fs/ext2/inode.c | 37 ++----- fs/ext3/inode.c | 26 ++++- fs/ext4/inode.c | 42 +++++--- fs/fat/fat.h | 1 - fs/fat/file.c | 49 +++----- fs/fat/inode.c | 6 +- fs/fuse/dir.c | 17 +-- fs/gfs2/aops.c | 10 +- fs/gfs2/inode.c | 25 +++- fs/gfs2/ops_inode.c | 18 ++- fs/gfs2/xattr.c | 24 +++- fs/hfs/inode.c | 40 ++++++- fs/hfsplus/inode.c | 50 ++++++++- fs/hostfs/hostfs_kern.c | 18 +++- fs/hostfs/hostfs_user.c | 6 +- fs/hpfs/file.c | 11 ++- fs/hpfs/inode.c | 12 ++- fs/hppfs/hppfs.c | 1 + fs/hugetlbfs/inode.c | 17 ++-- fs/jffs2/dir.c | 16 +-- fs/jffs2/fs.c | 4 +- fs/jfs/file.c | 14 ++- fs/jfs/inode.c | 28 ++++- fs/libfs.c | 70 +++--------- fs/logfs/file.c | 18 ++- fs/minix/dir.c | 21 +--- fs/minix/file.c | 22 ++++ fs/minix/inode.c | 20 ++- fs/minix/minix.h | 4 +- fs/ncpfs/inode.c | 24 ++-- fs/nilfs2/dir.c | 25 +--- fs/nilfs2/inode.c | 50 +++++++-- fs/nilfs2/recovery.c | 11 +- fs/ntfs/inode.c | 3 - fs/ocfs2/aops.c | 9 +- fs/ocfs2/dlmfs/dlmfs.c | 8 +- fs/ocfs2/file.c | 22 +++- fs/omfs/file.c | 36 ++++++- fs/proc/base.c | 16 ++- fs/proc/generic.c | 18 ++- fs/proc/proc_sysctl.c | 15 ++- fs/qnx4/inode.c | 11 ++- fs/ramfs/file-nommu.c | 7 +- fs/reiserfs/inode.c | 119 +++++++++++-------- fs/smbfs/inode.c | 4 +- fs/sysfs/inode.c | 2 +- fs/sysv/dir.c | 21 +--- fs/sysv/file.c | 22 ++++ fs/sysv/itree.c | 19 ++- fs/sysv/sysv.h | 4 +- fs/ubifs/file.c | 23 ++--- fs/ubifs/ubifs.h | 2 +- fs/udf/file.c | 22 ++++ fs/udf/inode.c | 13 ++- fs/ufs/dir.c | 13 +-- fs/ufs/inode.c | 20 ++- fs/ufs/truncate.c | 16 +-- fs/ufs/util.h | 4 +- fs/xfs/linux-2.6/xfs_aops.c | 21 +++- include/linux/buffer_head.h | 19 +--- include/linux/fs.h | 46 +------ include/linux/mm.h | 1 + mm/shmem.c | 15 ++- mm/truncate.c | 38 +++++-- 86 files changed, 1095 insertions(+), 857 deletions(-) Merging pci/linux-next $ git merge pci/linux-next Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/x86/include/asm/pci_x86.h Merge made by recursive. Documentation/kernel-parameters.txt | 2 ++ arch/x86/include/asm/pci_x86.h | 1 + arch/x86/pci/common.c | 20 ++++++++++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) Merging hid/for-next $ git merge hid/for-next Merge made by recursive. .../ABI/testing/sysfs-driver-hid-roccat-kone | 7 +++---- drivers/hid/Kconfig | 1 + drivers/hid/hid-core.c | 12 +++++++++++- drivers/hid/hid-ids.h | 15 ++++++++++++--- drivers/hid/hid-magicmouse.c | 13 +++++++++---- drivers/hid/hid-roccat-kone.c | 17 ++++++----------- drivers/hid/hid-roccat-kone.h | 2 +- drivers/hid/hid-roccat.c | 9 ++++++--- drivers/hid/hid-roccat.h | 2 +- drivers/hid/hidraw.c | 2 -- 10 files changed, 50 insertions(+), 30 deletions(-) Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. drivers/i2c/i2c-dev.c | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Resolved 'arch/arm/plat-omap/i2c.c' using previous resolution. Resolved 'drivers/i2c/busses/i2c-cpm.c' using previous resolution. Resolved 'drivers/i2c/busses/i2c-mpc.c' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/arm/plat-omap/i2c.c CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c Auto-merging drivers/i2c/busses/i2c-cpm.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c Auto-merging drivers/i2c/busses/i2c-ibm_iic.c Auto-merging drivers/i2c/busses/i2c-mpc.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c Auto-merging drivers/i2c/busses/i2c-pxa.c Auto-merging drivers/i2c/busses/i2c-s3c2410.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2d1648c] Merge remote branch 'bjdooks-i2c/next-i2c' $ git diff -M --stat --summary HEAD^.. Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/hwmon/ltc4245 | 24 ++++++- drivers/hwmon/emc1403.c | 33 ++++++++ drivers/hwmon/k10temp.c | 14 +++- drivers/hwmon/lm75.c | 39 ++++++++++ drivers/hwmon/lm75.h | 1 + drivers/hwmon/ltc4245.c | 177 ++++++++++++++++++++++++++++++++++++++++--- include/linux/i2c/ltc4245.h | 21 +++++ 7 files changed, 296 insertions(+), 13 deletions(-) create mode 100644 include/linux/i2c/ltc4245.h Merging quilt/kernel-doc $ git merge quilt/kernel-doc Auto-merging fs/aio.c Merge made by recursive. Documentation/kbuild/makefiles.txt | 100 +++++++++++++++++------------------ Documentation/vm/page-types.c | 2 +- fs/aio.c | 21 ++++---- 3 files changed, 61 insertions(+), 62 deletions(-) Merging v4l-dvb/master $ git merge v4l-dvb/master Already up-to-date. Merging kbuild/for-next $ git merge kbuild/for-next Auto-merging Makefile Auto-merging scripts/kconfig/Makefile Merge made by recursive. Makefile | 2 +- scripts/Makefile.build | 26 ++++---- scripts/checkkconfigsymbols.sh | 2 +- scripts/decodecode | 10 ++-- scripts/kconfig/.gitignore | 1 + scripts/kconfig/Makefile | 10 +++ scripts/kconfig/conf.c | 53 ++++++++++++++--- scripts/kconfig/expr.c | 2 +- scripts/kconfig/gconf.c | 7 +- scripts/kconfig/lxdialog/checklist.c | 10 +++- scripts/kconfig/mconf.c | 2 +- scripts/kconfig/menu.c | 20 ++++++- scripts/kconfig/qconf.cc | 106 +++++++++++++++++----------------- scripts/kconfig/qconf.h | 17 ++++-- scripts/package/builddeb | 5 +- 15 files changed, 175 insertions(+), 98 deletions(-) Merging kconfig/for-next $ git merge kconfig/for-next Already uptodate! Merge made by recursive. Merging ide/master $ git merge ide/master Merge made by recursive. drivers/ide/ide-taskfile.c | 10 +++------- drivers/ide/tx4938ide.c | 2 +- drivers/ide/tx4939ide.c | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) Merging libata/NEXT $ git merge libata/NEXT Already up-to-date. Merging infiniband/for-next $ git merge infiniband/for-next Already up-to-date. Merging acpi/test $ git merge acpi/test Merge made by recursive. arch/x86/kernel/e820.c | 2 +- drivers/acpi/acpi_pad.c | 36 +++++++--- drivers/acpi/acpica/acconfig.h | 4 + drivers/acpi/acpica/acglobal.h | 8 ++ drivers/acpi/acpica/aclocal.h | 5 +- drivers/acpi/acpica/acnamesp.h | 7 -- drivers/acpi/acpica/acobject.h | 16 ++-- drivers/acpi/acpica/acpredef.h | 13 ++-- drivers/acpi/acpica/acstruct.h | 32 +++++----- drivers/acpi/acpica/dsinit.c | 14 ++-- drivers/acpi/acpica/dsmethod.c | 20 +++++- drivers/acpi/acpica/dsmthdat.c | 16 ++--- drivers/acpi/acpica/dsopcode.c | 6 +- drivers/acpi/acpica/dsutils.c | 4 +- drivers/acpi/acpica/evrgnini.c | 10 ++-- drivers/acpi/acpica/exdump.c | 6 +- drivers/acpi/acpica/exfldio.c | 4 +- drivers/acpi/acpica/exprep.c | 23 ++----- drivers/acpi/acpica/exregion.c | 6 +- drivers/acpi/acpica/exsystem.c | 8 ++ drivers/acpi/acpica/hwsleep.c | 2 +- drivers/acpi/acpica/hwvalid.c | 12 +++ drivers/acpi/acpica/nsaccess.c | 9 +-- drivers/acpi/acpica/nsalloc.c | 94 +++++++++++-------------- drivers/acpi/acpica/nsdump.c | 2 +- drivers/acpi/acpica/nsinit.c | 25 +++++-- drivers/acpi/acpica/nsnames.c | 4 +- drivers/acpi/acpica/nsparse.c | 4 +- drivers/acpi/acpica/nsrepair2.c | 7 ++ drivers/acpi/acpica/nssearch.c | 15 +---- drivers/acpi/acpica/nsutils.c | 113 ------------------------------- drivers/acpi/acpica/nswalk.c | 15 +--- drivers/acpi/acpica/nsxfobj.c | 2 +- drivers/acpi/acpica/utglobal.c | 2 +- drivers/acpi/sleep.c | 34 +++++---- include/acpi/acexcep.h | 2 +- include/acpi/acpixf.h | 3 +- include/acpi/actbl2.h | 9 +++ include/linux/suspend.h | 26 ++++---- kernel/power/Kconfig | 9 ++- kernel/power/Makefile | 2 +- kernel/power/{hibernate_nvs.c => nvs.c} | 24 +++--- kernel/power/suspend.c | 6 ++ 43 files changed, 297 insertions(+), 364 deletions(-) rename kernel/power/{hibernate_nvs.c => nvs.c} (80%) Merging idle-test/idle-test $ git merge idle-test/idle-test Already up-to-date. Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/core-card.c | 24 +++++++++++++++++++----- drivers/ieee1394/video1394.c | 11 +++-------- 2 files changed, 22 insertions(+), 13 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/eba.c | 7 ++- drivers/mtd/ubi/io.c | 50 ++++++++++--------- drivers/mtd/ubi/scan.c | 126 +++++++++++++++++++++++++++++++++++++----------- drivers/mtd/ubi/scan.h | 19 +++++-- drivers/mtd/ubi/ubi.h | 10 ++-- 5 files changed, 148 insertions(+), 64 deletions(-) Merging kvm/linux-next $ git merge kvm/linux-next Merge made by recursive. arch/powerpc/kvm/e500.c | 2 +- arch/x86/include/asm/msr-index.h | 1 + arch/x86/kvm/mmu.c | 2 + arch/x86/kvm/svm.c | 96 +++++++++++++++++++++++++++++++++++++- 4 files changed, 99 insertions(+), 2 deletions(-) Merging dlm/next $ git merge dlm/next Already up-to-date. Merging ibft/master $ git merge ibft/master Merge made by recursive. drivers/firmware/Kconfig | 9 + drivers/firmware/Makefile | 1 + drivers/firmware/iscsi_boot_sysfs.c | 481 +++++++++++++++++++++++ drivers/firmware/iscsi_ibft.c | 726 +++++++++++++---------------------- drivers/firmware/iscsi_ibft_find.c | 56 +++- include/linux/iscsi_boot_sysfs.h | 123 ++++++ include/linux/iscsi_ibft.h | 12 +- 7 files changed, 924 insertions(+), 484 deletions(-) create mode 100644 drivers/firmware/iscsi_boot_sysfs.c create mode 100644 include/linux/iscsi_boot_sysfs.h Merging swiotlb/master $ git merge swiotlb/master Merge made by recursive. include/linux/swiotlb.h | 27 +++++++++- lib/swiotlb.c | 137 ++++++++++++++++++++++++++++------------------- 2 files changed, 106 insertions(+), 58 deletions(-) Merging scsi/master $ git merge scsi/master Already up-to-date. Merging async_tx/next $ git merge async_tx/next Already up-to-date. Merging net/master $ git merge net/master Auto-merging drivers/net/8139too.c Auto-merging drivers/net/usb/asix.c Auto-merging net/mac80211/rx.c Merge made by recursive. Documentation/filesystems/nfs/nfsroot.txt | 2 + Documentation/networking/bonding.txt | 84 +- Documentation/networking/ip-sysctl.txt | 2 +- Documentation/networking/packet_mmap.txt | 26 + drivers/atm/Kconfig | 2 +- drivers/atm/he.c | 308 +- drivers/atm/he.h | 65 +- drivers/atm/nicstar.c | 5197 ++++++++++++------------ drivers/atm/nicstar.h | 602 ++-- drivers/atm/nicstarmac.c | 364 +- drivers/isdn/i4l/isdn_ppp.c | 11 +- drivers/isdn/pcbit/drv.c | 10 +- drivers/isdn/sc/ioctl.c | 23 +- drivers/net/3c527.h | 6 +- drivers/net/8139cp.c | 2 +- drivers/net/8139too.c | 8 +- drivers/net/Kconfig | 1 + drivers/net/arcnet/capmode.c | 177 +- drivers/net/arm/ixp4xx_eth.c | 11 + drivers/net/atl1c/atl1c.h | 9 +- drivers/net/atl1c/atl1c_hw.c | 107 +- drivers/net/atl1c/atl1c_hw.h | 49 +- drivers/net/atl1c/atl1c_main.c | 348 +- drivers/net/atlx/atl1.h | 4 +- drivers/net/benet/be_cmds.c | 11 +- drivers/net/benet/be_main.c | 95 +- drivers/net/bonding/bond_alb.c | 33 +- drivers/net/bonding/bond_main.c | 111 +- drivers/net/bonding/bond_sysfs.c | 279 +- drivers/net/bonding/bonding.h | 14 +- drivers/net/caif/caif_serial.c | 11 +- drivers/net/can/mscan/mscan.h | 2 +- drivers/net/can/usb/ems_usb.c | 2 +- drivers/net/chelsio/common.h | 1 - drivers/net/chelsio/subr.c | 49 +- drivers/net/cxgb3/cxgb3_main.c | 12 +- drivers/net/dm9000.c | 2 +- drivers/net/ehea/ehea_qmr.h | 2 +- drivers/net/enic/vnic_vic.h | 2 +- drivers/net/fec.c | 40 +- drivers/net/fec_mpc52xx_phy.c | 24 +- drivers/net/fsl_pq_mdio.h | 2 +- drivers/net/gianfar.c | 8 +- drivers/net/greth.c | 1 - drivers/net/irda/donauboe.h | 2 +- drivers/net/irda/irda-usb.h | 2 +- drivers/net/irda/ks959-sir.c | 2 +- drivers/net/irda/ksdazzle-sir.c | 2 +- drivers/net/irda/vlsi_ir.h | 6 +- drivers/net/ixgbe/ixgbe.h | 8 +- drivers/net/ixgbe/ixgbe_82599.c | 5 +- drivers/net/ixgbe/ixgbe_common.h | 26 +- drivers/net/ixgbe/ixgbe_dcb_nl.c | 2 +- drivers/net/ixgbe/ixgbe_ethtool.c | 43 +- drivers/net/ixgbe/ixgbe_fcoe.c | 35 +- drivers/net/ixgbe/ixgbe_main.c | 281 +- drivers/net/ixgbe/ixgbe_sriov.c | 15 +- drivers/net/ixgbevf/ixgbevf_main.c | 1 + drivers/net/mac8390.c | 57 +- drivers/net/macvlan.c | 31 +- drivers/net/mlx4/en_netdev.c | 1 + drivers/net/mlx4/eq.c | 14 +- drivers/net/mlx4/mr.c | 2 +- drivers/net/ppp_generic.c | 18 +- drivers/net/pppoe.c | 2 +- drivers/net/ps3_gelic_wireless.h | 10 +- drivers/net/qlcnic/qlcnic.h | 120 +- drivers/net/qlcnic/qlcnic_ctx.c | 513 +++- drivers/net/qlcnic/qlcnic_ethtool.c | 11 +- drivers/net/qlcnic/qlcnic_hdr.h | 84 +- drivers/net/qlcnic/qlcnic_hw.c | 14 +- drivers/net/qlcnic/qlcnic_init.c | 40 +- drivers/net/qlcnic/qlcnic_main.c | 312 ++- drivers/net/qlge/qlge.h | 24 +- drivers/net/r6040.c | 302 +- drivers/net/r8169.c | 2 +- drivers/net/sfc/efx.c | 69 +- drivers/net/sfc/efx.h | 4 +- drivers/net/sfc/falcon.c | 8 +- drivers/net/sfc/mcdi_phy.c | 21 +- drivers/net/sfc/net_driver.h | 44 +- drivers/net/sfc/nic.c | 55 +- drivers/net/sfc/nic.h | 4 +- drivers/net/sfc/rx.c | 393 +- drivers/net/sfc/selftest.c | 28 +- drivers/net/sfc/workarounds.h | 2 +- drivers/net/sky2.h | 6 +- drivers/net/tehuti.h | 2 +- drivers/net/tg3.c | 163 +- drivers/net/tg3.h | 17 +- drivers/net/tulip/de2104x.c | 4 +- drivers/net/tulip/eeprom.c | 10 +- drivers/net/tulip/tulip.h | 64 +- drivers/net/tulip/tulip_core.c | 122 +- drivers/net/typhoon.c | 2 +- drivers/net/typhoon.h | 26 +- drivers/net/ucc_geth.h | 46 +- drivers/net/usb/asix.c | 2 +- drivers/net/usb/hso.c | 2 +- drivers/net/usb/kaweth.c | 2 +- drivers/net/usb/net1080.c | 4 +- drivers/net/usb/sierra_net.c | 2 +- drivers/net/via-velocity.h | 12 +- drivers/net/vxge/vxge-main.c | 93 +- drivers/net/wan/farsync.c | 14 +- drivers/net/wan/hd64570.h | 2 +- drivers/net/wan/hdlc_cisco.c | 4 +- drivers/net/wan/hdlc_fr.c | 2 +- drivers/net/wan/sdla.c | 13 +- drivers/net/wimax/i2400m/control.c | 2 +- drivers/net/wimax/i2400m/fw.c | 8 +- drivers/net/wimax/i2400m/op-rfkill.c | 2 +- drivers/net/wireless/adm8211.h | 6 +- drivers/net/wireless/airo.c | 32 +- drivers/net/wireless/at76c50x-usb.c | 2 +- drivers/net/wireless/at76c50x-usb.h | 40 +- drivers/net/wireless/b43/b43.h | 6 +- drivers/net/wireless/b43/dma.h | 8 +- drivers/net/wireless/b43/xmit.h | 20 +- drivers/net/wireless/b43legacy/b43legacy.h | 6 +- drivers/net/wireless/b43legacy/dma.h | 8 +- drivers/net/wireless/b43legacy/xmit.h | 10 +- drivers/net/wireless/hostap/hostap_80211.h | 18 +- drivers/net/wireless/hostap/hostap_common.h | 10 +- drivers/net/wireless/hostap/hostap_wlan.h | 32 +- drivers/net/wireless/ipw2x00/ipw2100.c | 4 +- drivers/net/wireless/ipw2x00/ipw2100.h | 16 +- drivers/net/wireless/ipw2x00/ipw2200.h | 122 +- drivers/net/wireless/ipw2x00/libipw.h | 62 +- drivers/net/wireless/iwlwifi/iwl-3945-fh.h | 4 +- drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 10 +- drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 2 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 244 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 8 +- drivers/net/wireless/iwlwifi/iwl-eeprom.h | 12 +- drivers/net/wireless/iwlwifi/iwl-fh.h | 6 +- drivers/net/wireless/iwlwifi/iwl-spectrum.h | 10 +- drivers/net/wireless/iwmc3200wifi/commands.h | 50 +- drivers/net/wireless/iwmc3200wifi/iwm.h | 2 +- drivers/net/wireless/iwmc3200wifi/lmac.h | 32 +- drivers/net/wireless/iwmc3200wifi/umac.h | 60 +- drivers/net/wireless/libertas/host.h | 120 +- drivers/net/wireless/libertas/radiotap.h | 4 +- drivers/net/wireless/libertas/rx.c | 8 +- drivers/net/wireless/libertas/types.h | 66 +- drivers/net/wireless/libertas_tf/libertas_tf.h | 4 +- drivers/net/wireless/mac80211_hwsim.c | 2 +- drivers/net/wireless/mwl8k.c | 66 +- drivers/net/wireless/orinoco/fw.c | 2 +- drivers/net/wireless/orinoco/hermes.h | 18 +- drivers/net/wireless/orinoco/hermes_dld.c | 8 +- drivers/net/wireless/orinoco/hw.c | 6 +- drivers/net/wireless/orinoco/main.c | 10 +- drivers/net/wireless/orinoco/orinoco.h | 2 +- drivers/net/wireless/orinoco/orinoco_usb.c | 4 +- drivers/net/wireless/orinoco/wext.c | 2 +- drivers/net/wireless/p54/net2280.h | 16 +- drivers/net/wireless/p54/p54pci.h | 6 +- drivers/net/wireless/p54/p54spi.h | 2 +- drivers/net/wireless/p54/p54usb.h | 6 +- drivers/net/wireless/prism54/isl_ioctl.c | 2 +- drivers/net/wireless/prism54/isl_oid.h | 18 +- drivers/net/wireless/prism54/islpci_eth.h | 4 +- drivers/net/wireless/prism54/islpci_mgt.h | 2 +- drivers/net/wireless/rndis_wlan.c | 34 +- drivers/net/wireless/rt2x00/rt2800.h | 6 +- drivers/net/wireless/rt2x00/rt61pci.h | 4 +- drivers/net/wireless/rt2x00/rt73usb.h | 4 +- drivers/net/wireless/rtl818x/rtl8180.h | 4 +- drivers/net/wireless/rtl818x/rtl8187.h | 8 +- drivers/net/wireless/rtl818x/rtl818x.h | 2 +- drivers/net/wireless/wl12xx/wl1251_acx.h | 102 +- drivers/net/wireless/wl12xx/wl1251_cmd.h | 22 +- drivers/net/wireless/wl12xx/wl1251_event.h | 4 +- drivers/net/wireless/wl12xx/wl1251_rx.h | 2 +- drivers/net/wireless/wl12xx/wl1251_tx.h | 6 +- drivers/net/wireless/wl12xx/wl1271.h | 4 +- drivers/net/wireless/wl12xx/wl1271_acx.h | 102 +- drivers/net/wireless/wl12xx/wl1271_cmd.h | 40 +- drivers/net/wireless/wl12xx/wl1271_event.h | 4 +- drivers/net/wireless/wl12xx/wl1271_rx.h | 2 +- drivers/net/wireless/wl12xx/wl1271_tx.h | 6 +- drivers/net/wireless/wl12xx/wl12xx_80211.h | 26 +- drivers/net/wireless/wl3501.h | 16 +- drivers/net/wireless/zd1211rw/zd_mac.h | 12 +- drivers/net/wireless/zd1211rw/zd_usb.h | 14 +- drivers/net/xen-netfront.c | 1 + drivers/vhost/net.c | 13 +- drivers/vhost/vhost.c | 4 +- include/linux/if_bonding.h | 1 + include/linux/if_bridge.h | 2 - include/linux/if_ether.h | 2 +- include/linux/if_fddi.h | 8 +- include/linux/if_frad.h | 2 +- include/linux/if_hippi.h | 8 +- include/linux/if_macvlan.h | 4 - include/linux/if_packet.h | 1 + include/linux/if_pppox.h | 8 +- include/linux/ipv6.h | 4 +- include/linux/isdnif.h | 2 +- include/linux/mISDNif.h | 2 +- include/linux/nbd.h | 2 +- include/linux/ncp.h | 10 +- include/linux/ncp_fs_sb.h | 14 +- include/linux/netdevice.h | 19 +- include/linux/notifier.h | 1 + include/linux/phonet.h | 4 +- include/linux/rds.h | 12 +- include/linux/sctp.h | 80 +- include/linux/skbuff.h | 3 +- include/linux/snmp.h | 1 + include/linux/wlp.h | 22 +- include/net/cfg80211.h | 15 +- include/net/dn_dev.h | 8 +- include/net/dn_nsp.h | 16 +- include/net/genetlink.h | 15 +- include/net/ip.h | 2 +- include/net/ip6_tunnel.h | 2 +- include/net/ipv6.h | 4 + include/net/ipx.h | 8 +- include/net/mip6.h | 2 +- include/net/ndisc.h | 2 +- include/net/netfilter/nf_conntrack.h | 6 +- include/net/pkt_sched.h | 2 +- include/net/sch_generic.h | 27 +- include/net/sctp/structs.h | 4 +- include/net/sock.h | 10 +- include/net/tcp.h | 3 +- include/rxrpc/packet.h | 8 +- net/bluetooth/bnep/bnep.h | 8 +- net/bridge/br.c | 2 - net/bridge/br_if.c | 8 + net/bridge/br_input.c | 12 +- net/bridge/br_private.h | 3 +- net/caif/caif_socket.c | 3 +- net/caif/cfcnfg.c | 8 +- net/can/raw.c | 11 +- net/compat.c | 53 +- net/core/dev.c | 183 +- net/core/netpoll.c | 31 - net/core/sock.c | 6 +- net/dccp/ipv6.c | 30 +- net/dccp/proto.c | 11 +- net/ipv4/arp.c | 11 +- net/ipv4/devinet.c | 1 + net/ipv4/fib_frontend.c | 6 +- net/ipv4/igmp.c | 13 +- net/ipv4/ip_input.c | 20 +- net/ipv4/ip_sockglue.c | 23 +- net/ipv4/ipconfig.c | 7 + net/ipv4/proc.c | 1 + net/ipv4/raw.c | 8 +- net/ipv4/route.c | 83 +- net/ipv4/syncookies.c | 40 +- net/ipv4/tcp.c | 5 + net/ipv4/tcp_ipv4.c | 118 +- net/ipv6/addrlabel.c | 6 +- net/ipv6/af_inet6.c | 9 +- net/ipv6/anycast.c | 90 +- net/ipv6/datagram.c | 18 +- net/ipv6/exthdrs.c | 24 + net/ipv6/inet6_connection_sock.c | 9 +- net/ipv6/mcast.c | 3 +- net/ipv6/raw.c | 22 +- net/ipv6/sit.c | 8 +- net/ipv6/syncookies.c | 50 +- net/ipv6/tcp_ipv6.c | 29 +- net/ipv6/udp.c | 11 +- net/iucv/iucv.c | 14 +- net/mac80211/cfg.c | 2 +- net/mac80211/ieee80211_i.h | 2 +- net/mac80211/rx.c | 2 +- net/netfilter/nf_conntrack_core.c | 8 +- net/packet/af_packet.c | 37 +- net/sched/act_pedit.c | 3 +- net/sched/sch_generic.c | 23 +- net/sched/sch_htb.c | 2 - net/sctp/sm_make_chunk.c | 2 +- net/socket.c | 164 +- 280 files changed, 7913 insertions(+), 6700 deletions(-) Merging wireless/master $ git merge wireless/master Resolved 'drivers/net/wireless/wl12xx/wl1271.h' using previous resolution. Resolved 'drivers/net/wireless/wl12xx/wl1271_cmd.h' using previous resolution. Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-tx.c Auto-merging drivers/net/wireless/iwlwifi/iwl-commands.h Auto-merging drivers/net/wireless/iwlwifi/iwl-dev.h Auto-merging drivers/net/wireless/mwl8k.c Auto-merging drivers/net/wireless/orinoco/hermes_dld.c Auto-merging drivers/net/wireless/orinoco/orinoco_usb.c Auto-merging drivers/net/wireless/orinoco/wext.c Auto-merging drivers/net/wireless/prism54/isl_ioctl.c Auto-merging drivers/net/wireless/rndis_wlan.c Auto-merging drivers/net/wireless/rt2x00/rt2800.h Auto-merging drivers/net/wireless/wl12xx/wl1271.h CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271.h Auto-merging drivers/net/wireless/wl12xx/wl1271_cmd.h CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_cmd.h Auto-merging drivers/net/wireless/wl12xx/wl1271_tx.h Auto-merging include/net/cfg80211.h Auto-merging net/mac80211/cfg.c Auto-merging net/mac80211/ieee80211_i.h Auto-merging net/mac80211/mlme.c Auto-merging net/mac80211/rx.c Auto-merging net/mac80211/sta_info.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 88fe68d] Merge remote branch 'wireless/master' $ git diff -M --stat --summary HEAD^.. drivers/net/b44.c | 144 ++-- drivers/net/wireless/ath/ath5k/Makefile | 1 + drivers/net/wireless/ath/ath5k/ani.c | 20 +- drivers/net/wireless/ath/ath5k/ath5k.h | 7 + drivers/net/wireless/ath/ath5k/attach.c | 2 - drivers/net/wireless/ath/ath5k/base.c | 38 +- drivers/net/wireless/ath/ath5k/caps.c | 7 - drivers/net/wireless/ath/ath5k/debug.c | 74 ++- drivers/net/wireless/ath/ath5k/debug.h | 9 +- drivers/net/wireless/ath/ath5k/desc.c | 7 - drivers/net/wireless/ath/ath5k/dma.c | 13 - drivers/net/wireless/ath/ath5k/eeprom.c | 3 +- drivers/net/wireless/ath/ath5k/gpio.c | 7 - drivers/net/wireless/ath/ath5k/pcu.c | 24 - drivers/net/wireless/ath/ath5k/phy.c | 82 +- drivers/net/wireless/ath/ath5k/qcu.c | 9 - drivers/net/wireless/ath/ath5k/reset.c | 64 +-- drivers/net/wireless/ath/ath5k/sysfs.c | 116 +++ drivers/net/wireless/ath/ath9k/ani.c | 1 + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 11 - drivers/net/wireless/ath/ath9k/ar9002_hw.c | 109 ++- drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 6 +- .../{ar9003_initvals.h => ar9003_2p0_initvals.h} | 6 +- .../{ar9003_initvals.h => ar9003_2p2_initvals.h} | 185 +++--- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 10 +- drivers/net/wireless/ath/ath9k/ar9003_hw.c | 163 ++++- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 5 + drivers/net/wireless/ath/ath9k/ar9003_mac.h | 1 + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 119 +++ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 66 +- drivers/net/wireless/ath/ath9k/ath9k.h | 68 ++- drivers/net/wireless/ath/ath9k/common.c | 314 +------- drivers/net/wireless/ath/ath9k/common.h | 77 +-- drivers/net/wireless/ath/ath9k/debug.c | 56 +- drivers/net/wireless/ath/ath9k/debug.h | 2 + drivers/net/wireless/ath/ath9k/eeprom.c | 29 + drivers/net/wireless/ath/ath9k/eeprom.h | 2 + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 1 + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 618 ++++++++-------- drivers/net/wireless/ath/ath9k/eeprom_def.c | 1 + drivers/net/wireless/ath/ath9k/hif_usb.c | 58 +- drivers/net/wireless/ath/ath9k/hif_usb.h | 2 + drivers/net/wireless/ath/ath9k/htc.h | 12 +- drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 23 + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 127 +++- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 397 ++++++---- drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 47 +- drivers/net/wireless/ath/ath9k/htc_hst.c | 3 +- drivers/net/wireless/ath/ath9k/hw.c | 41 +- drivers/net/wireless/ath/ath9k/hw.h | 14 +- drivers/net/wireless/ath/ath9k/init.c | 19 +- drivers/net/wireless/ath/ath9k/main.c | 255 +------ drivers/net/wireless/ath/ath9k/rc.c | 177 +++-- drivers/net/wireless/ath/ath9k/recv.c | 278 +++++++- drivers/net/wireless/ath/ath9k/reg.h | 62 +- drivers/net/wireless/ath/ath9k/wmi.c | 3 - drivers/net/wireless/ath/ath9k/xmit.c | 60 +- drivers/net/wireless/b43/dma.c | 69 +- drivers/net/wireless/b43legacy/dma.c | 49 +- drivers/net/wireless/ipw2x00/ipw2100.c | 18 +- drivers/net/wireless/ipw2x00/ipw2200.c | 3 +- drivers/net/wireless/iwlwifi/Kconfig | 6 +- drivers/net/wireless/iwlwifi/iwl-1000.c | 2 + drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c | 28 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 201 +----- drivers/net/wireless/iwlwifi/iwl-4965.c | 83 ++- drivers/net/wireless/iwlwifi/iwl-5000.c | 58 ++- drivers/net/wireless/iwlwifi/iwl-6000.c | 345 ++++++++- drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 27 +- drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 26 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 222 ++---- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 3 +- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 77 ++- drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 123 +++ drivers/net/wireless/iwlwifi/iwl-agn.c | 311 ++++++-- drivers/net/wireless/iwlwifi/iwl-agn.h | 34 + drivers/net/wireless/iwlwifi/iwl-commands.h | 3 +- drivers/net/wireless/iwlwifi/iwl-core.c | 266 +++---- drivers/net/wireless/iwlwifi/iwl-core.h | 23 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 81 +-- drivers/net/wireless/iwlwifi/iwl-dev.h | 76 +- drivers/net/wireless/iwlwifi/iwl-helpers.h | 27 + drivers/net/wireless/iwlwifi/iwl-rx.c | 6 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 40 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 72 +- drivers/net/wireless/iwlwifi/iwl-sta.h | 29 + drivers/net/wireless/iwlwifi/iwl-tx.c | 33 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 127 +--- drivers/net/wireless/iwmc3200wifi/hal.c | 2 +- drivers/net/wireless/iwmc3200wifi/rx.c | 4 +- drivers/net/wireless/libertas/cmd.c | 37 +- drivers/net/wireless/libertas/cmdresp.c | 30 +- drivers/net/wireless/libertas/decl.h | 2 +- drivers/net/wireless/libertas/dev.h | 6 + drivers/net/wireless/libertas/ethtool.c | 24 +- drivers/net/wireless/libertas/if_sdio.c | 58 ++ drivers/net/wireless/libertas/if_usb.c | 12 +- drivers/net/wireless/libertas/main.c | 79 ++- drivers/net/wireless/libertas/scan.c | 2 +- drivers/net/wireless/libertas_tf/if_usb.c | 5 +- drivers/net/wireless/mwl8k.c | 12 +- drivers/net/wireless/orinoco/hermes_dld.c | 2 +- drivers/net/wireless/orinoco/orinoco_usb.c | 4 +- drivers/net/wireless/orinoco/wext.c | 4 +- drivers/net/wireless/p54/eeprom.c | 4 +- drivers/net/wireless/p54/p54spi.c | 5 +- drivers/net/wireless/p54/p54usb.c | 3 +- drivers/net/wireless/prism54/isl_ioctl.c | 11 +- drivers/net/wireless/rndis_wlan.c | 36 +- drivers/net/wireless/rt2x00/rt2400pci.c | 17 +- drivers/net/wireless/rt2x00/rt2500pci.c | 17 +- drivers/net/wireless/rt2x00/rt2500usb.c | 31 +- drivers/net/wireless/rt2x00/rt2800.h | 49 ++- drivers/net/wireless/rt2x00/rt2800lib.c | 154 ++-- drivers/net/wireless/rt2x00/rt2800lib.h | 13 +- drivers/net/wireless/rt2x00/rt2800pci.c | 103 +-- drivers/net/wireless/rt2x00/rt2800pci.h | 19 - drivers/net/wireless/rt2x00/rt2800usb.c | 104 ++-- drivers/net/wireless/rt2x00/rt2800usb.h | 37 - drivers/net/wireless/rt2x00/rt2x00.h | 42 +- drivers/net/wireless/rt2x00/rt2x00config.c | 12 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 1 + drivers/net/wireless/rt2x00/rt2x00dev.c | 7 +- drivers/net/wireless/rt2x00/rt2x00dump.h | 7 +- drivers/net/wireless/rt2x00/rt2x00ht.c | 47 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 26 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 51 ++- drivers/net/wireless/rt2x00/rt2x00pci.h | 8 + drivers/net/wireless/rt2x00/rt2x00queue.c | 34 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 33 +- drivers/net/wireless/rt2x00/rt2x00usb.h | 19 - drivers/net/wireless/rt2x00/rt61pci.c | 14 +- drivers/net/wireless/rt2x00/rt73usb.c | 48 +- drivers/net/wireless/wl12xx/Kconfig | 4 +- drivers/net/wireless/wl12xx/wl1251_main.c | 4 +- drivers/net/wireless/wl12xx/wl1251_sdio.c | 40 +- drivers/net/wireless/wl12xx/wl1271.h | 31 +- drivers/net/wireless/wl12xx/wl1271_cmd.c | 41 +- drivers/net/wireless/wl12xx/wl1271_cmd.h | 28 +- drivers/net/wireless/wl12xx/wl1271_event.c | 10 +- drivers/net/wireless/wl12xx/wl1271_ini.h | 123 +++ drivers/net/wireless/wl12xx/wl1271_main.c | 95 ++- drivers/net/wireless/wl12xx/wl1271_sdio.c | 2 +- drivers/net/wireless/wl12xx/wl1271_testmode.c | 11 +- drivers/net/wireless/wl12xx/wl1271_tx.c | 36 +- drivers/net/wireless/wl12xx/wl1271_tx.h | 1 + drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- drivers/net/wireless/zd1211rw/zd_usb.c | 2 +- drivers/ssb/driver_chipcommon.c | 25 + drivers/ssb/driver_chipcommon_pmu.c | 17 +- drivers/ssb/main.c | 76 +-- drivers/ssb/pci.c | 15 +- include/linux/nl80211.h | 2 +- include/linux/ssb/ssb.h | 159 +---- include/net/cfg80211.h | 120 +++- include/net/mac80211.h | 35 +- net/mac80211/Kconfig | 7 + net/mac80211/Makefile | 4 + net/mac80211/agg-tx.c | 7 +- net/mac80211/cfg.c | 22 +- net/mac80211/debugfs.c | 154 ++--- net/mac80211/debugfs_sta.c | 48 +- net/mac80211/driver-ops.h | 23 +- net/mac80211/driver-trace.h | 35 +- net/mac80211/ibss.c | 14 +- net/mac80211/ieee80211_i.h | 7 +- net/mac80211/iface.c | 14 +- net/mac80211/key.c | 288 ++------ net/mac80211/key.h | 22 +- net/mac80211/main.c | 81 ++- net/mac80211/mlme.c | 23 +- net/mac80211/rate.h | 13 + net/mac80211/rc80211_minstrel_ht.c | 824 ++++++++++++++++++++ net/mac80211/rc80211_minstrel_ht.h | 128 +++ net/mac80211/rc80211_minstrel_ht_debugfs.c | 120 +++ net/mac80211/rx.c | 38 +- net/mac80211/sta_info.c | 8 - net/mac80211/sta_info.h | 44 +- net/mac80211/status.c | 2 +- net/mac80211/work.c | 2 +- net/wireless/chan.c | 5 +- net/wireless/core.h | 1 + net/wireless/mlme.c | 3 +- net/wireless/nl80211.c | 3 + 184 files changed, 6443 insertions(+), 4134 deletions(-) create mode 100644 drivers/net/wireless/ath/ath5k/sysfs.c copy drivers/net/wireless/ath/ath9k/{ar9003_initvals.h => ar9003_2p0_initvals.h} (99%) rename drivers/net/wireless/ath/ath9k/{ar9003_initvals.h => ar9003_2p2_initvals.h} (91%) create mode 100644 drivers/net/wireless/wl12xx/wl1271_ini.h create mode 100644 net/mac80211/rc80211_minstrel_ht.c create mode 100644 net/mac80211/rc80211_minstrel_ht.h create mode 100644 net/mac80211/rc80211_minstrel_ht_debugfs.c Merging mtd/master $ git merge mtd/master Auto-merging drivers/mtd/maps/physmap_of.c Auto-merging drivers/mtd/nand/fsl_upm.c Auto-merging drivers/mtd/nand/socrates_nand.c Merge made by recursive. drivers/mtd/maps/physmap_of.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Merging crypto/master $ git merge crypto/master Auto-merging kernel/padata.c Merge made by recursive. arch/s390/crypto/Makefile | 2 +- arch/s390/crypto/crypto_des.h | 2 +- arch/s390/crypto/des_s390.c | 238 ++---------------- crypto/Kconfig | 15 +- crypto/Makefile | 4 +- crypto/algboss.c | 4 + crypto/authenc.c | 2 +- crypto/ctr.c | 2 +- crypto/testmgr.c | 14 + crypto/{twofish.c => twofish_generic.c} | 1 + crypto/xts.c | 2 +- drivers/crypto/mv_cesa.c | 10 +- drivers/crypto/n2_core.c | 417 ++++++++++++++++++++++--------- drivers/crypto/omap-sham.c | 1 - kernel/padata.c | 2 +- 15 files changed, 364 insertions(+), 352 deletions(-) rename crypto/{twofish.c => twofish_generic.c} (99%) Merging sound/for-next $ git merge sound/for-next Auto-merging Documentation/kernel-parameters.txt Merge made by recursive. Documentation/kernel-parameters.txt | 167 +----- Documentation/sound/alsa/alsa-parameters.txt | 135 +++++ Documentation/sound/oss/oss-parameters.txt | 51 ++ arch/arm/mach-kirkwood/common.c | 38 ++ arch/arm/mach-kirkwood/common.h | 2 + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 + arch/arm/mach-kirkwood/openrd-setup.c | 13 + arch/arm/mach-omap2/mcbsp.c | 10 +- arch/arm/plat-mxc/include/mach/ssi.h | 3 + arch/arm/plat-omap/include/plat/mcbsp.h | 2 + arch/arm/plat-omap/mcbsp.c | 51 ++- arch/arm/plat-orion/include/plat/audio.h | 11 + include/sound/asound.h | 6 +- include/sound/pcm.h | 4 + include/sound/soc-dapm.h | 2 + include/sound/soc.h | 21 + sound/atmel/ac97c.c | 2 +- sound/core/pcm_misc.c | 16 + sound/pci/hda/patch_realtek.c | 3 + sound/soc/Kconfig | 3 + sound/soc/Makefile | 3 + sound/soc/atmel/atmel-pcm.c | 1 - sound/soc/atmel/atmel_ssc_dai.c | 1 - sound/soc/au1x/psc-ac97.c | 13 +- sound/soc/au1x/psc-i2s.c | 13 +- sound/soc/au1x/psc.h | 1 - sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ad193x.c | 41 ++- sound/soc/codecs/ad193x.h | 5 + sound/soc/codecs/cs42l51.c | 763 ++++++++++++++++++++++++ sound/soc/codecs/cs42l51.h | 163 +++++ sound/soc/codecs/spdif_transciever.c | 94 +++- sound/soc/codecs/spdif_transciever.h | 1 + sound/soc/codecs/tlv320dac33.c | 57 ++- sound/soc/codecs/twl4030.c | 291 +++++---- sound/soc/codecs/twl4030.h | 3 + sound/soc/codecs/twl6040.c | 2 +- sound/soc/codecs/wm8990.c | 4 - sound/soc/ep93xx/Kconfig | 9 + sound/soc/ep93xx/Makefile | 8 + sound/soc/ep93xx/ep93xx-i2s.c | 487 +++++++++++++++ sound/soc/ep93xx/ep93xx-i2s.h | 18 + sound/soc/ep93xx/ep93xx-pcm.c | 319 ++++++++++ sound/soc/ep93xx/ep93xx-pcm.h | 22 + sound/soc/imx/Kconfig | 9 + sound/soc/imx/Makefile | 2 + sound/soc/imx/eukrea-tlv320.c | 135 +++++ sound/soc/imx/imx-ssi.c | 11 +- sound/soc/kirkwood/Kconfig | 20 + sound/soc/kirkwood/Makefile | 9 + sound/soc/kirkwood/kirkwood-dma.c | 383 ++++++++++++ sound/soc/kirkwood/kirkwood-dma.h | 17 + sound/soc/kirkwood/kirkwood-i2s.c | 484 +++++++++++++++ sound/soc/kirkwood/kirkwood-i2s.h | 17 + sound/soc/kirkwood/kirkwood-openrd.c | 126 ++++ sound/soc/kirkwood/kirkwood.h | 126 ++++ sound/soc/nuc900/Kconfig | 27 + sound/soc/nuc900/Makefile | 11 + sound/soc/nuc900/nuc900-ac97.c | 430 +++++++++++++ sound/soc/nuc900/nuc900-audio.c | 81 +++ sound/soc/nuc900/nuc900-audio.h | 117 ++++ sound/soc/nuc900/nuc900-pcm.c | 354 +++++++++++ sound/soc/omap/omap-mcbsp.c | 112 +++- sound/soc/s3c24xx/Kconfig | 4 +- sound/soc/s3c24xx/s3c-ac97.c | 1 - sound/soc/s3c24xx/smdk_wm9713.c | 3 + sound/soc/s6000/s6000-i2s.c | 38 +- sound/soc/soc-core.c | 95 +++ sound/spi/at73c213.c | 1 - 70 files changed, 5084 insertions(+), 397 deletions(-) create mode 100644 Documentation/sound/alsa/alsa-parameters.txt create mode 100644 Documentation/sound/oss/oss-parameters.txt create mode 100644 arch/arm/plat-orion/include/plat/audio.h create mode 100644 sound/soc/codecs/cs42l51.c create mode 100644 sound/soc/codecs/cs42l51.h create mode 100644 sound/soc/ep93xx/Kconfig create mode 100644 sound/soc/ep93xx/Makefile create mode 100644 sound/soc/ep93xx/ep93xx-i2s.c create mode 100644 sound/soc/ep93xx/ep93xx-i2s.h create mode 100644 sound/soc/ep93xx/ep93xx-pcm.c create mode 100644 sound/soc/ep93xx/ep93xx-pcm.h create mode 100644 sound/soc/imx/eukrea-tlv320.c create mode 100644 sound/soc/kirkwood/Kconfig create mode 100644 sound/soc/kirkwood/Makefile create mode 100644 sound/soc/kirkwood/kirkwood-dma.c create mode 100644 sound/soc/kirkwood/kirkwood-dma.h create mode 100644 sound/soc/kirkwood/kirkwood-i2s.c create mode 100644 sound/soc/kirkwood/kirkwood-i2s.h create mode 100644 sound/soc/kirkwood/kirkwood-openrd.c create mode 100644 sound/soc/kirkwood/kirkwood.h create mode 100644 sound/soc/nuc900/Kconfig create mode 100644 sound/soc/nuc900/Makefile create mode 100644 sound/soc/nuc900/nuc900-ac97.c create mode 100644 sound/soc/nuc900/nuc900-audio.c create mode 100644 sound/soc/nuc900/nuc900-audio.h create mode 100644 sound/soc/nuc900/nuc900-pcm.c Merging cpufreq/next $ git merge cpufreq/next Auto-merging Documentation/feature-removal-schedule.txt Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c Auto-merging drivers/cpufreq/cpufreq.c Auto-merging drivers/cpufreq/cpufreq_ondemand.c Auto-merging include/linux/cpufreq.h Merge made by recursive. Documentation/feature-removal-schedule.txt | 10 -------- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 + drivers/cpufreq/cpufreq.c | 10 ++------ drivers/cpufreq/cpufreq_ondemand.c | 33 +++++++++++++++------------ include/linux/cpufreq.h | 5 ---- 5 files changed, 23 insertions(+), 37 deletions(-) Merging quilt/rr $ git merge quilt/rr Resolved 'kernel/module.c' using previous resolution. Auto-merging drivers/net/wireless/libertas/if_sdio.c Auto-merging drivers/net/wireless/libertas/if_usb.c Auto-merging drivers/net/wireless/libertas_tf/if_usb.c Auto-merging kernel/module.c CONFLICT (content): Merge conflict in kernel/module.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d8c590d] Merge branch 'quilt/rr' $ git diff -M --stat --summary HEAD^.. Documentation/cpu-hotplug.txt | 2 +- arch/um/drivers/hostaudio_kern.c | 10 + drivers/acpi/debug.c | 32 +- drivers/char/hvc_iucv.c | 9 +- drivers/char/ipmi/ipmi_watchdog.c | 42 +- drivers/ide/ide.c | 20 +- drivers/input/misc/ati_remote2.c | 26 +- drivers/input/mouse/psmouse-base.c | 14 +- drivers/message/fusion/mptbase.c | 3 +- drivers/misc/lkdtm.c | 4 +- drivers/net/myri10ge/myri10ge.c | 54 ++- drivers/net/wireless/libertas/if_sdio.c | 32 +- drivers/net/wireless/libertas/if_usb.c | 3 + drivers/net/wireless/libertas_tf/if_usb.c | 3 + drivers/scsi/bfa/bfad.c | 2 + drivers/staging/rtl8187se/r8180_core.c | 6 +- drivers/staging/rtl8192e/r8192E_core.c | 6 +- drivers/staging/rtl8192su/r8192U_core.c | 6 +- drivers/usb/atm/ueagle-atm.c | 2 + drivers/video/uvesafb.c | 7 +- drivers/video/vt8623fb.c | 2 + fs/nfs/callback.c | 11 +- include/linux/moduleparam.h | 282 ++++++-- init/main.c | 8 +- kernel/module.c | 1108 +++++++++++++++-------------- kernel/params.c | 233 +++++-- net/mac80211/rate.c | 2 + net/sunrpc/xprtsock.c | 26 +- scripts/mod/modpost.c | 13 + 29 files changed, 1215 insertions(+), 753 deletions(-) Merging mmc/next $ git merge mmc/next Already up-to-date. Merging input/next $ git merge input/next Merge made by recursive. drivers/input/mouse/bcm5974.c | 21 +++++--- drivers/input/serio/i8042-ppcio.h | 75 ---------------------------- drivers/input/touchscreen/usbtouchscreen.c | 34 +++++++------ 3 files changed, 32 insertions(+), 98 deletions(-) Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Already up-to-date. Merging quilt/device-mapper $ git merge quilt/device-mapper Merge made by recursive. drivers/md/dm-crypt.c | 3 +- drivers/md/dm-ioctl.c | 115 +++++++++++++++++++-------------------- drivers/md/dm-snap-persistent.c | 6 +- 3 files changed, 60 insertions(+), 64 deletions(-) Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Already up-to-date. Merging pcmcia/master $ git merge pcmcia/master Already up-to-date. Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Merge made by recursive. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging kernel/debug/kdb/kdb_main.c Merge made by recursive. drivers/char/sysrq.c | 2 +- kernel/debug/kdb/kdb_main.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) Merging slab/for-next $ git merge slab/for-next Merge made by recursive. 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 mfd/for-next $ git merge mfd/for-next Already up-to-date. Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Merge made by recursive. Merging viafb/viafb-next $ git merge viafb/viafb-next Auto-merging drivers/media/video/Kconfig Auto-merging drivers/media/video/Makefile Auto-merging include/media/v4l2-chip-ident.h Merge made by recursive. drivers/media/video/Kconfig | 10 + drivers/media/video/Makefile | 2 + drivers/media/video/via-camera.c | 1369 ++++++++++++++++++++++++++++++++++++++ drivers/media/video/via-camera.h | 93 +++ drivers/video/via/accel.c | 2 +- drivers/video/via/via-core.c | 16 +- include/linux/via-core.h | 4 +- include/media/v4l2-chip-ident.h | 4 + 8 files changed, 1496 insertions(+), 4 deletions(-) create mode 100644 drivers/media/video/via-camera.c create mode 100644 drivers/media/video/via-camera.h Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. drivers/regulator/Kconfig | 6 + drivers/regulator/Makefile | 1 + drivers/regulator/ad5398.c | 288 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 295 insertions(+), 0 deletions(-) create mode 100644 drivers/regulator/ad5398.c Merging security-testing/next $ git merge security-testing/next Merge made by recursive. fs/namei.c | 3 +- fs/open.c | 5 +- include/linux/security.h | 11 +- security/capability.c | 3 +- security/keys/keyctl.c | 4 +- security/security.c | 5 +- security/selinux/avc.c | 1 - security/selinux/netnode.c | 2 - security/smack/smack_lsm.c | 14 +- security/tomoyo/Makefile | 2 +- security/tomoyo/common.c | 2000 +++++++++++++++++---------------------- security/tomoyo/common.h | 454 +++++++-- security/tomoyo/domain.c | 294 +++++-- security/tomoyo/file.c | 1038 ++++++++++++++------- security/tomoyo/gc.c | 107 ++- security/tomoyo/load_policy.c | 81 ++ security/tomoyo/memory.c | 235 +++++ security/tomoyo/mount.c | 312 ++++++ security/tomoyo/number_group.c | 175 ++++ security/tomoyo/path_group.c | 19 +- security/tomoyo/realpath.c | 409 +++------ security/tomoyo/securityfs_if.c | 140 +++ security/tomoyo/tomoyo.c | 35 +- security/tomoyo/util.c | 963 +++++++++++++++++++ 24 files changed, 4285 insertions(+), 2027 deletions(-) create mode 100644 security/tomoyo/load_policy.c create mode 100644 security/tomoyo/memory.c create mode 100644 security/tomoyo/mount.c create mode 100644 security/tomoyo/number_group.c create mode 100644 security/tomoyo/securityfs_if.c create mode 100644 security/tomoyo/util.c Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Auto-merging drivers/char/agp/backend.c Auto-merging drivers/char/agp/hp-agp.c Merge made by recursive. Merging uwb/for-upstream $ git merge uwb/for-upstream Auto-merging include/linux/wlp.h Merge made by recursive. drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------ drivers/uwb/wlp/messages.c | 40 ++++++++++++++++---------------- drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------ drivers/uwb/wlp/wlp-lc.c | 12 +++++----- include/linux/wlp.h | 2 +- 5 files changed, 58 insertions(+), 58 deletions(-) Merging watchdog/master $ git merge watchdog/master Merge made by recursive. drivers/watchdog/hpwdt.c | 20 ++++++++++++++++---- drivers/watchdog/s3c2410_wdt.c | 17 +++++++++-------- 2 files changed, 25 insertions(+), 12 deletions(-) Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Already up-to-date. Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Already up-to-date. Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging include/linux/netdevice.h Merge made by recursive. Documentation/rt-mutex-design.txt | 2 +- include/linux/netdevice.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging quilt/aoe $ git merge quilt/aoe Auto-merging drivers/block/aoe/aoecmd.c Merge made by recursive. drivers/block/aoe/aoecmd.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Merging suspend/linux-next $ git merge suspend/linux-next Merge made by recursive. kernel/power/swap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Merging bluetooth/master $ git merge bluetooth/master Already up-to-date. Merging fsnotify/for-next $ git merge fsnotify/for-next Auto-merging Documentation/feature-removal-schedule.txt Auto-merging fs/compat.c Auto-merging fs/exec.c Auto-merging fs/inode.c Auto-merging fs/namei.c Auto-merging fs/namespace.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/notify/inotify/Kconfig CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree. Auto-merging fs/open.c Auto-merging fs/read_write.c Auto-merging include/linux/Kbuild Auto-merging include/linux/fs.h Auto-merging include/linux/security.h Auto-merging include/linux/syscalls.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/sysctl.c Auto-merging security/security.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f fs/notify/inotify/inotify.c fs/notify/inotify/inotify.c: needs merge rm 'fs/notify/inotify/inotify.c' $ git commit -v -a [master 1726693] Merge remote branch 'fsnotify/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 8 - arch/x86/ia32/ia32entry.S | 2 + arch/x86/ia32/sys_ia32.c | 9 + arch/x86/include/asm/sys_ia32.h | 3 + arch/x86/include/asm/unistd_32.h | 4 +- arch/x86/include/asm/unistd_64.h | 4 + arch/x86/kernel/syscall_table_32.S | 2 + fs/compat.c | 5 +- fs/exec.c | 4 +- fs/inode.c | 8 +- fs/namei.c | 2 +- fs/namespace.c | 5 + fs/nfsd/vfs.c | 4 +- fs/notify/Kconfig | 1 + fs/notify/Makefile | 4 +- fs/notify/dnotify/dnotify.c | 198 +++---- fs/notify/fanotify/Kconfig | 26 + fs/notify/fanotify/Makefile | 1 + fs/notify/fanotify/fanotify.c | 255 ++++++++ fs/notify/fanotify/fanotify_user.c | 776 ++++++++++++++++++++++++ fs/notify/fsnotify.c | 141 ++++- fs/notify/fsnotify.h | 33 +- fs/notify/group.c | 178 +++--- fs/notify/inode_mark.c | 309 +++------- fs/notify/inotify/Kconfig | 15 - fs/notify/inotify/Makefile | 1 - fs/notify/inotify/inotify.c | 873 ---------------------------- fs/notify/inotify/inotify.h | 7 +- fs/notify/inotify/inotify_fsnotify.c | 114 +++- fs/notify/inotify/inotify_user.c | 307 ++++++---- fs/notify/mark.c | 325 +++++++++++ fs/notify/notification.c | 180 ++++--- fs/notify/vfsmount_mark.c | 176 ++++++ fs/open.c | 3 +- fs/read_write.c | 8 +- include/asm-generic/fcntl.h | 8 + include/linux/Kbuild | 1 + include/linux/dnotify.h | 1 + include/linux/fanotify.h | 105 ++++ include/linux/fs.h | 16 +- include/linux/fsnotify.h | 166 +++--- include/linux/fsnotify_backend.h | 169 ++++-- include/linux/inotify.h | 175 +------ include/linux/mount.h | 6 +- include/linux/security.h | 1 + include/linux/syscalls.h | 5 + init/Kconfig | 10 +- kernel/Makefile | 5 +- kernel/audit.c | 1 - kernel/audit.h | 26 +- kernel/audit_tree.c | 233 ++++---- kernel/audit_watch.c | 295 ++++++---- kernel/auditfilter.c | 39 +- kernel/auditsc.c | 10 +- kernel/sys_ni.c | 4 + kernel/sysctl.c | 7 +- security/security.c | 16 +- 57 files changed, 3100 insertions(+), 2190 deletions(-) create mode 100644 fs/notify/fanotify/Kconfig create mode 100644 fs/notify/fanotify/Makefile create mode 100644 fs/notify/fanotify/fanotify.c create mode 100644 fs/notify/fanotify/fanotify_user.c delete mode 100644 fs/notify/inotify/inotify.c create mode 100644 fs/notify/mark.c create mode 100644 fs/notify/vfsmount_mark.c create mode 100644 include/linux/fanotify.h $ git am -3 ../patches/fsnotify__update_gfp_slab.h_includes Applying: fsnotify: update gfp/slab.h includes $ git reset HEAD^ Unstaged changes after reset: M fs/notify/fanotify/fanotify_user.c M fs/notify/vfsmount_mark.c $ git add . $ git commit -v -a --amend [master ff2d4ed] Merge remote branch 'fsnotify/for-next' Merging irda/for-next $ git merge irda/for-next Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. Auto-merging drivers/net/irda/irda-usb.c CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2a48c22] Merge remote branch 'irda/for-next' $ git diff -M --stat --summary HEAD^.. drivers/net/irda/irda-usb.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) Merging drbd/for-jens $ git merge drbd/for-jens Recorded preimage for 'include/linux/drbd.h' Resolved 'fs/fs-writeback.c' using previous resolution. Auto-merging drivers/block/drbd/drbd_main.c Auto-merging fs/fs-writeback.c CONFLICT (content): Merge conflict in fs/fs-writeback.c Auto-merging include/linux/drbd.h CONFLICT (content): Merge conflict in include/linux/drbd.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'include/linux/drbd.h'. [master fca64d7] Merge remote branch 'drbd/for-jens' $ git diff -M --stat --summary HEAD^.. drivers/block/drbd/drbd_main.c | 2 -- drivers/block/drbd/drbd_nl.c | 6 ++++++ include/linux/drbd.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) Merging catalin/for-next $ git merge catalin/for-next Already up-to-date. Merging alacrity/linux-next $ git merge alacrity/linux-next Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging drivers/Makefile Auto-merging drivers/net/Kconfig Auto-merging drivers/net/Makefile Auto-merging include/linux/Kbuild Auto-merging lib/Makefile Merge made by recursive. MAINTAINERS | 25 + arch/x86/Kconfig | 2 + drivers/Makefile | 1 + drivers/net/Kconfig | 14 + drivers/net/Makefile | 1 + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ drivers/vbus/Kconfig | 25 + drivers/vbus/Makefile | 6 + drivers/vbus/bus-proxy.c | 248 +++++++ drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ include/linux/Kbuild | 4 + include/linux/ioq.h | 414 ++++++++++++ include/linux/shm_signal.h | 189 ++++++ include/linux/vbus_driver.h | 83 +++ include/linux/vbus_pci.h | 145 ++++ include/linux/venet.h | 133 ++++ lib/Kconfig | 21 + lib/Makefile | 2 + lib/ioq.c | 304 +++++++++ lib/shm_signal.c | 196 ++++++ 20 files changed, 4389 insertions(+), 0 deletions(-) create mode 100644 drivers/net/vbus-enet.c create mode 100644 drivers/vbus/Kconfig create mode 100644 drivers/vbus/Makefile create mode 100644 drivers/vbus/bus-proxy.c create mode 100644 drivers/vbus/pci-bridge.c create mode 100644 include/linux/ioq.h create mode 100644 include/linux/shm_signal.h create mode 100644 include/linux/vbus_driver.h create mode 100644 include/linux/vbus_pci.h create mode 100644 include/linux/venet.h create mode 100644 lib/ioq.c create mode 100644 lib/shm_signal.c Merging i7core_edac/linux_next $ git merge i7core_edac/linux_next Already up-to-date. Merging devicetree/next-devicetree $ git merge devicetree/next-devicetree Removing arch/microblaze/kernel/of_device.c Merge made by recursive. arch/microblaze/include/asm/device.h | 3 + arch/microblaze/include/asm/irq.h | 13 - arch/microblaze/include/asm/of_device.h | 31 - arch/microblaze/include/asm/of_platform.h | 33 -- arch/microblaze/include/asm/pci-bridge.h | 5 - arch/microblaze/include/asm/prom.h | 94 +--- arch/microblaze/kernel/Makefile | 2 +- arch/microblaze/kernel/irq.c | 14 +- arch/microblaze/kernel/of_device.c | 112 ---- arch/microblaze/kernel/of_platform.c | 141 +---- arch/microblaze/kernel/prom_parse.c | 867 +---------------------------- arch/powerpc/include/asm/device.h | 3 + arch/powerpc/include/asm/irq.h | 13 - arch/powerpc/include/asm/of_device.h | 24 - arch/powerpc/include/asm/of_platform.h | 11 - arch/powerpc/include/asm/pci-bridge.h | 5 - arch/powerpc/include/asm/prom.h | 82 +--- arch/powerpc/include/asm/smu.h | 4 +- arch/powerpc/kernel/irq.c | 14 +- arch/powerpc/kernel/of_device.c | 110 +---- arch/powerpc/kernel/of_platform.c | 131 +----- arch/powerpc/kernel/prom_parse.c | 827 +--------------------------- arch/sparc/include/asm/device.h | 9 +- arch/sparc/include/asm/floppy_64.h | 4 +- arch/sparc/include/asm/of_device.h | 19 - arch/sparc/include/asm/parport.h | 4 +- arch/sparc/include/asm/prom.h | 1 - arch/sparc/kernel/of_device_32.c | 28 +- arch/sparc/kernel/of_device_64.c | 24 +- arch/sparc/kernel/of_device_common.c | 4 +- arch/sparc/kernel/pci.c | 2 +- arch/sparc/kernel/pci_psycho.c | 8 +- arch/sparc/kernel/pci_sabre.c | 8 +- arch/sparc/kernel/pci_schizo.c | 20 +- arch/sparc/kernel/power.c | 2 +- drivers/atm/fore200e.c | 2 +- drivers/input/serio/i8042-sparcio.h | 8 +- drivers/macintosh/macio_sysfs.c | 5 +- drivers/net/myri_sbus.c | 2 +- drivers/net/niu.c | 6 +- drivers/net/niu.h | 4 +- drivers/net/sunbmac.c | 2 +- drivers/net/sunhme.c | 6 +- drivers/net/sunlance.c | 2 +- drivers/net/sunqe.c | 6 +- drivers/of/Kconfig | 8 + drivers/of/Makefile | 2 + drivers/of/address.c | 595 ++++++++++++++++++++ drivers/of/device.c | 62 ++- drivers/of/irq.c | 338 +++++++++++ drivers/of/of_mdio.c | 1 + drivers/of/platform.c | 221 ++++++++ drivers/parport/parport_sunbpp.c | 2 +- drivers/sbus/char/bbc_i2c.c | 6 +- drivers/sbus/char/uctrl.c | 2 +- drivers/scsi/qlogicpti.c | 4 +- drivers/scsi/sun_esp.c | 2 +- drivers/serial/sunhv.c | 4 +- drivers/serial/sunsab.c | 2 +- drivers/serial/sunsu.c | 2 +- drivers/serial/sunzilog.c | 10 +- drivers/watchdog/cpwd.c | 2 +- include/linux/of_address.h | 12 + include/linux/of_device.h | 23 +- include/linux/of_irq.h | 49 ++ include/linux/of_platform.h | 21 + sound/sparc/amd7930.c | 2 +- sound/sparc/cs4231.c | 14 +- sound/sparc/dbri.c | 2 +- 69 files changed, 1496 insertions(+), 2605 deletions(-) delete mode 100644 arch/microblaze/kernel/of_device.c create mode 100644 drivers/of/address.c create mode 100644 drivers/of/irq.c create mode 100644 include/linux/of_address.h create mode 100644 include/linux/of_irq.h Merging spi/next-spi $ git merge spi/next-spi Already up-to-date. Merging omap_dss2/for-next $ git merge omap_dss2/for-next Already up-to-date. Merging tip/auto-latest $ git merge tip/auto-latest Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/x86/Kconfig Auto-merging kernel/Makefile Removing kernel/softlockup.c Auto-merging kernel/sysctl.c Merge made by recursive. Documentation/kernel-parameters.txt | 2 + arch/Kconfig | 7 + arch/x86/Kconfig | 1 + arch/x86/include/asm/apb_timer.h | 1 - arch/x86/include/asm/mrst.h | 26 ++ arch/x86/include/asm/nmi.h | 2 + arch/x86/include/asm/pgtable_32_types.h | 2 +- arch/x86/kernel/apb_timer.c | 37 +-- arch/x86/kernel/apic/Makefile | 7 +- arch/x86/kernel/apic/hw_nmi.c | 107 ++++++ arch/x86/kernel/apic/nmi.c | 7 - arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/mrst.c | 105 +++++-- arch/x86/kernel/process.c | 1 - arch/x86/kernel/traps.c | 7 + include/linux/nmi.h | 13 + include/linux/sched.h | 12 +- kernel/Makefile | 2 +- kernel/perf_event.c | 5 +- kernel/softlockup.c | 293 ---------------- kernel/sysctl.c | 55 ++-- kernel/timer.c | 1 - kernel/watchdog.c | 567 +++++++++++++++++++++++++++++++ lib/Kconfig.debug | 35 ++- tools/perf/util/symbol.c | 8 +- 25 files changed, 898 insertions(+), 407 deletions(-) create mode 100644 arch/x86/kernel/apic/hw_nmi.c delete mode 100644 kernel/softlockup.c create mode 100644 kernel/watchdog.c Merging edac-amd/for-next $ git merge edac-amd/for-next Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Auto-merging drivers/edac/Kconfig Auto-merging drivers/edac/edac_core.h Auto-merging drivers/edac/edac_mc_sysfs.c Merge made by recursive. arch/x86/kernel/cpu/mcheck/mce.c | 1 + drivers/edac/Kconfig | 8 -- drivers/edac/amd64_edac.c | 156 ++++++-------------------------------- drivers/edac/amd64_edac.h | 47 +++--------- drivers/edac/e752x_edac.c | 4 +- drivers/edac/edac_core.h | 17 +---- drivers/edac/edac_mc_sysfs.c | 86 +++++++++------------ drivers/edac/edac_mce_amd.c | 16 ++-- drivers/edac/i5100_edac.c | 7 +- 9 files changed, 88 insertions(+), 254 deletions(-) Merging oprofile/for-next $ git merge oprofile/for-next Merge made by recursive. arch/powerpc/oprofile/op_model_cell.c | 2 +- arch/x86/oprofile/nmi_int.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) Merging percpu/for-next $ git merge percpu/for-next Already up-to-date. Merging workqueues/for-next $ git merge workqueues/for-next Already up-to-date. Merging sfi/sfi-test $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next $ git merge asm-generic/next Already up-to-date. Merging drivers-x86/linux-next $ git merge drivers-x86/linux-next Auto-merging include/drm/i915_drm.h Auto-merging kernel/timer.c Merge made by recursive. drivers/platform/x86/Kconfig | 12 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/hp-wmi.c | 234 ++++-- drivers/platform/x86/intel_ips.c | 1659 +++++++++++++++++++++++++++++++++++ drivers/platform/x86/intel_menlow.c | 33 +- drivers/platform/x86/sony-laptop.c | 10 +- include/drm/i915_drm.h | 9 + include/linux/timer.h | 15 + kernel/timer.c | 13 + 9 files changed, 1920 insertions(+), 66 deletions(-) create mode 100644 drivers/platform/x86/intel_ips.c Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Merge made by recursive. include/linux/hugetlb.h | 14 +--- include/linux/hugetlb_inline.h | 22 +++++++ include/linux/pagemap.h | 9 +++- include/linux/poison.h | 9 --- include/linux/rmap.h | 5 ++ mm/hugetlb.c | 102 +++++++++++++++++++++++++++++++++- mm/hwpoison-inject.c | 15 +++-- mm/memory-failure.c | 120 ++++++++++++++++++++++++++++++---------- mm/rmap.c | 59 ++++++++++++++++++++ 9 files changed, 297 insertions(+), 58 deletions(-) create mode 100644 include/linux/hugetlb_inline.h Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging bkl-core/bkl/core $ git merge bkl-core/bkl/core Already up-to-date. Merging bkl-procfs/bkl/procfs $ git merge bkl-procfs/bkl/procfs Already up-to-date. Merging bkl-ioctl/bkl/ioctl $ git merge bkl-ioctl/bkl/ioctl Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Already up-to-date. Merging quilt/tty $ git merge quilt/tty Already up-to-date. Merging quilt/usb $ git merge quilt/usb Already up-to-date. Merging staging-next/staging-next $ git merge staging-next/staging-next Already up-to-date. Merging slabh/slabh $ git merge slabh/slabh Already up-to-date. Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.