From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: Tree for Oct 18 Date: Thu, 18 Oct 2012 14:46:14 +1100 Message-ID: <20121018144614.b61961cfae2274d52d340882@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Thu__18_Oct_2012_14_46_14_+1100_uTHc3zbFg=ym0ixc" Return-path: Received: from haggis.pcug.org.au ([203.10.76.10]:36600 "EHLO members.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753865Ab2JRDqZ (ORCPT ); Wed, 17 Oct 2012 23:46:25 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: linux-next@vger.kernel.org Cc: linux-kernel@vger.kernel.org --Signature=_Thu__18_Oct_2012_14_46_14_+1100_uTHc3zbFg=ym0ixc Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Changes since 201201017: The m68knommu gained conflicts against the m68k-current tree. The l2-mtd tree still had its build failure so I used the version from next-20121011. The hid tree lost its conflict. The sound tree gained a build failure for which I reverted 2 commits. The signal tree lost its build failure. The akpm tree lost a patch that turned up elsewhere. ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" as mentioned in the FAQ on the wiki (see below). You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 204 trees (counting Linus' and 26 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (1867353 Merge git://git.kernel.org/pub/scm/linux/ker= nel/git/davem/net) Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git:/= /git.pengutronix.de/git/wsa/linux) Merging kbuild-current/rc-fixes (b1e0d8b kbuild: Fix gcc -x syntax) Merging arm-current/fixes (3d6ee36 Merge branch 'late-for-linus' of git://g= it.linaro.org/people/rmk/linux-arm) Merging m68k-current/for-linus (92f79db m68k: Remove empty #ifdef/#else/#en= dif block) Merging powerpc-merge/merge (fd3bc66 Merge tag 'disintegrate-powerpc-201210= 09' into merge) Merging sparc/master (1867353 Merge git://git.kernel.org/pub/scm/linux/kern= el/git/davem/net) Merging net/master (1867353 Merge git://git.kernel.org/pub/scm/linux/kernel= /git/davem/net) Merging sound-current/for-linus (10f571d ALSA: emu10k1: add chip details fo= r E-mu 1010 PCIe card) Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while deco= ding is disabled) Merging wireless/master (290eddc Merge branch 'for-john' of git://git.kerne= l.org/pub/scm/linux/kernel/git/jberg/mac80211) Merging driver-core.current/driver-core-linus (ddffeb8 Linux 3.7-rc1) Merging tty.current/tty-linus (178e485 staging: dgrp: check return value of= alloc_tty_driver) Merging usb.current/usb-linus (bf90ff5 USB: spcp8x5: fix port-data memory l= eak) Merging staging.current/staging-linus (ddffeb8 Linux 3.7-rc1) Merging char-misc.current/char-misc-linus (ddffeb8 Linux 3.7-rc1) Merging input-current/for-linus (0cc8d6a Merge branch 'next' into for-linus) Merging md-current/for-linus (72f36d5 md: refine reporting of resync/reshap= e delays.) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_l= og_d_path prefix) Merging crypto-current/master (c9f97a2 crypto: x86/glue_helper - fix storin= g of new IV in CBC encryption) Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops) Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/ran= dom-2.6) Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros = to inline functions) Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs f= ormatting) Merging devicetree-current/devicetree/merge (4e8383b of: release node fix f= or of_parse_phandle_with_args) Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by us= ing proper "spi:" modalias prefixes.) Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactio= ns, remove cast) Merging asm-generic/master (c37d615 Merge branch 'disintegrate-asm-generic'= of git://git.infradead.org/users/dhowells/linux-headers into asm-generic) Merging arm/for-next (3d6ee36 Merge branch 'late-for-linus' of git://git.li= naro.org/people/rmk/linux-arm) Merging arm-perf/for-next/perf (eab8fc8 Merge branch 'hw-breakpoint' into f= or-next/perf) Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) Merging arm64/upstream (3b7c5f8 arm64: No need to set the x0-x2 registers i= n start_thread()) Merging blackfin/for-linus (d255e6f blackfin: Use Kbuild infrastructure for= kvm_para.h) Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/= include/asm) Merging cris/for-next (620614d Merge tag 'disintegrate-cris-20121009' of gi= t://git.infradead.org/users/dhowells/linux-headers into for-linus) Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platfor= m build code removal) Merging ia64/next (d536e0d Merge tag 'disintegrate-ia64-20121009' of git://= git.infradead.org/users/dhowells/linux-headers into next) Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)= ) + PTR_ERR) Merging m68knommu/for-next (4dbfd6d m68k: switch to using the asm-generic s= ocket.h) CONFLICT (rename/delete): arch/m68k/include/uapi/asm/termbits.h deleted in = m68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/u= api/asm/termbits.h left in tree. CONFLICT (rename/delete): arch/m68k/include/uapi/asm/sockios.h deleted in m= 68knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/ua= pi/asm/sockios.h left in tree. CONFLICT (rename/delete): arch/m68k/include/uapi/asm/socket.h deleted in m6= 8knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uap= i/asm/socket.h left in tree. CONFLICT (rename/delete): arch/m68k/include/uapi/asm/shmbuf.h deleted in m6= 8knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uap= i/asm/shmbuf.h left in tree. CONFLICT (rename/delete): arch/m68k/include/uapi/asm/sembuf.h deleted in m6= 8knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uap= i/asm/sembuf.h left in tree. CONFLICT (rename/delete): arch/m68k/include/uapi/asm/msgbuf.h deleted in m6= 8knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uap= i/asm/msgbuf.h left in tree. CONFLICT (rename/delete): arch/m68k/include/uapi/asm/auxvec.h deleted in m6= 8knommu/for-next and renamed in HEAD. Version HEAD of arch/m68k/include/uap= i/asm/auxvec.h left in tree. CONFLICT (modify/delete): arch/m68k/include/asm/termios.h deleted in m68kno= mmu/for-next and modified in HEAD. Version HEAD of arch/m68k/include/asm/te= rmios.h left in tree. Applying: m68k: fix up for UAPI changes Merging microblaze/next (1883baa UAPI: (Scripted) Disintegrate arch/microbl= aze/include/asm) Merging mips/mips-for-linux-next (05e283f Merge branch 'next/p1/for-linus' = into mips-for-linux-next) Merging openrisc/for-upstream (6257c57 Merge tag 'disintegrate-openrisc-201= 21009' of git://git.infradead.org/users/dhowells/linux-headers) Merging parisc/for-next (559fd14 Merge tag 'disintegrate-parisc-20121016' i= nto for-next) Merging powerpc/next (d900bd7 powerpc/iommu: Fix multiple issues with IOMMU= pools code) Merging 4xx/next (2074b1d powerpc: Fix irq distribution) Merging mpc5xxx/next (f3ac712 powerpc/pcm030: add pcm030-audio-fabric to dt= s) Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM be= fore any write) Merging s390/features (d1f8a7f s390/mm,vmemmap: use 1MB frames for vmemmap) Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __= iomem churn.) Merging sparc-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.= org/pub/scm/linux/kernel/git/broonie/misc) Merging tile/master (c19c6c9 arch/tile: enable interrupts in do_work_pendin= g()) Merging unicore32/unicore32 (935ce97 UAPI: (Scripted) Disintegrate arch/uni= core32/include/asm) Merging xtensa/for_next (795ca17 xtensa: Use Kbuild infrastructure to handl= e asm-generic headers) Merging btrfs/next (f46dbe3 btrfs: init ref_index to zero in add_inode_ref) Merging ceph/master (6285bc2 ceph: avoid 32-bit page index overflow) Merging cifs/for-next (72bd481 cifs: reinstate the forcegid option) Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.= kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) Merging ecryptfs/next (0d7614f Linux 3.6-rc1) Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not be= ing handled in need_print_warning()) Merging ext4/dev (c278531 ext4: fix ext4_flush_completed_IO wait semantics) Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfi= g into fs/fuse/Kconfig) Merging gfs2/master (b0780d7 GFS2: Fix FITRIM argument handling) Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling) Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_= can_write_buf()) Merging nfs/linux-next (4369d32 lockd: Remove BUG_ON()s from fs/lockd/clntp= roc.c) Merging nfsd/nfsd-next (a9ca404 Merge Trond's bugfixes) Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) Merging omfs/for-next (976d167 Linux 3.1-rc9) Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for = block_size and block_log match) Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_= fd_request()) Merging ubifs/linux-next (a74b6e4 UBIFS: fix mounting problems after power = cuts) Merging xfs/for-next (d35e88f xfs: only update the last_sync_lsn when a tra= nsaction completes) Merging vfs/for-next (f81700b procfs: don't need a PATH_MAX allocation to h= old a string representation of an int) Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next) Merging hid/for-next (5277e97 HID: roccat: allow readout of koneplus sensor= register data) Merging quilt/i2c (a17e9c1 i2c-stub: Move to drivers/i2c) Merging i2c-embedded/i2c-embedded/for-next (62885f5 MXS: Implement DMA supp= ort into mxs-i2c) Merging quilt/jdelvare-hwmon (12250d8 Merge branch 'i2c-embedded/for-next' = of git://git.pengutronix.de/git/wsa/linux) Merging hwmon-staging/hwmon-next (17875ef hwmon: DA9055 HWMON driver) Merging v4l-dvb/master (c3c0b61 Merge /home/v4l/v4l/patchwork) Merging kbuild/for-next (b974d36 Merge branch 'kbuild/kbuild' into kbuild/f= or-next) Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set= to 'y' not 'm') Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI) Merging infiniband/for-next (56040f0 Merge branches 'cma', 'ipoib', 'iser',= 'mlx4' and 'nes' into for-next) Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oop= s_in_progress case) Merging acpi/next (d1d4a81 Merge branches 'fixes-for-37', 'ec' and 'thermal= ' into release) Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency b= etween modules) CONFLICT (content): Merge conflict in include/linux/cpuidle.h CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c Merging cpupowerutils/master (f166033 cpupower tools: add install target to= the debug tools' makefiles) Merging thermal/next (f5a246e Merge tag 'sound-3.7' of git://git.kernel.org= /pub/scm/linux/kernel/git/tiwai/sound) Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corrupti= on (i386 userland on amd64 kernel)) Merging ubi/linux-next (ddffeb8 Linux 3.7-rc1) Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from use= r) Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packe= ts in the RESET path) Merging target-updates/for-next (cf0eb28 iscsi-target: Bump defaults for no= pin_timeout + nopin_response_timeout values) Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2) Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) Merging isci/all (6734092 isci: add a couple __iomem annotations) Merging slave-dma/next (ddffeb8 Linux 3.7-rc1) Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA o= ps) Merging net-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.or= g/pub/scm/linux/kernel/git/broonie/misc) Merging wireless-next/master (ddffeb8 Linux 3.7-rc1) Merging bluetooth/master (56f6098 Bluetooth: Zero bredr pointer when chan i= s deleted) Merging mtd/master (5a6ea4a mtd: ofpart: Fix incorrect NULL check in parse_= ofoldpart_partitions()) Merging l2-mtd/master (1eab1e5 mtd: spear_smi: use module_platform_driver m= acro) $ git reset --hard HEAD^ Merging refs/next/20121011/l2-mtd Merging crypto/master (ba1ee07 crypto: vmac - Make VMAC work when blocks ar= en't aligned) Merging drm/drm-next (1f31c69 Merge branch 'drm-intel-fixes' of git://peopl= e.freedesktop.org/~danvet/drm-intel into drm-next) Merging sound/for-next (34a9318 ALSA: hda - Don't enable unsol for jacks we= 're polling) Merging sound-asoc/for-next (bd2f2ac Merge branch 'asoc-da9055' into asoc-n= ext) Merging modules/modules-next (7460bf4 powerpc: add finit_module syscall.) Merging virtio/virtio-next (1609e71 virtio: tools: make it clear that virtq= ueue_add_buf() no longer returns > 0) Merging input/next (ad5396e Input: mms114 - add device tree bindings) Merging input-mt/for-next (51c80b7 Input: bcm5974 - Convert to MT-B) Merging cgroup/for-next (1f5320d cgroup: notify_on_release may not be trigg= ered in some cases) Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-nex= t) CONFLICT (content): Merge conflict in init/Kconfig Merging quilt/device-mapper (ddffeb8 Linux 3.7-rc1) Merging embedded/master (4744b43 embedded: fix vc_translate operator preced= ence) Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) Merging mmc/mmc-next (b35a5c5 mmc: rtsx_pci_sdmmc: Add realtek pcie sdmmc h= ost driver) Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/se= rial/kgdboc.c) Merging slab/for-next (e2087be Merge branch 'slab/tracing' into slab/for-li= nus) Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1) Merging md/for-next (635a2a0 md/raid5: add blktrace calls) Merging mfd/for-next (74d8378 ARM: dts: Enable 88pm860x pmic) Merging battery/master (18766f0 Merge with upstream to accommodate with MFD= changes) Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error) Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in s= et_par) Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string= .h) Merging regulator/for-next (ee15eb4 Merge remote-tracking branches 'regulat= or/topic/gpio', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regu= lator/topic/tps51632', 'regulator/topic/tps65910' and 'regulator/topic/vexp= ress' into regulator-next) Merging security/next (61d335d Merge branch 'security-next-keys' of git://g= it.kernel.org/pub/scm/linux/kernel/git/dhowells/security-keys into next-que= ue) CONFLICT (content): Merge conflict in security/keys/process_keys.c CONFLICT (content): Merge conflict in security/keys/keyring.c CONFLICT (content): Merge conflict in security/keys/keyctl.c CONFLICT (content): Merge conflict in net/dns_resolver/dns_key.c Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog) Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) Merging iommu/next (0094872 Merge branches 'dma-debug', 'iommu/fixes', 'arm= /tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' in= to next) Merging vfio/next (12250d8 Merge branch 'i2c-embedded/for-next' of git://gi= t.pengutronix.de/git/wsa/linux) Merging osd/linux-next (b6755ff osduld: Add osdname & systemid sysfs at scs= i_osd class) Merging jc_docs/docs-next (5c050fb docs: update the development process doc= ument) Merging trivial/for-next (db83101 iscsi: fix check keys) Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging pm/linux-next (df5a2a1 Merge tag 'firewire-updates' of git://git.ke= rnel.org/pub/scm/linux/kernel/git/ieee1394/linux1394) Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.= org/pub/scm/linux/kernel/git/jikos/apm) Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls) CONFLICT (content): Merge conflict in kernel/audit_tree.c Merging edac/linux_next (cfe5031 edac: edac_mc no longer deals with kobject= s directly) Merging edac-amd/for-next (20fe26b MCE, AMD: Dump error status) Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline f= or retrieving a node's full name) Merging dt-rh/for-next (36165f5 MAINTAINERS: add scripts/dtc under Devicetr= ee maintainers) Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute = of spi devices) Merging spi-mb/spi-next (b4482af Merge branch 'spi-pl022' into spi-next) Merging tip/auto-latest (4b84058 Merge branch 'sched/numa') CONFLICT (content): Merge conflict in mm/mempolicy.c CONFLICT (content): Merge conflict in mm/huge_memory.c CONFLICT (content): Merge conflict in include/linux/mempolicy.h Applying: mm/pol: fixups for UAPI include files split Merging rcu/rcu/next (d677124 rcu: Advise most users not to enable RCU user= mode) Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc= _show) Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singl= estep exceptions) Merging kvm/linux-next (03604b3 Merge branch 'for-upstream' of http://githu= b.com/agraf/linux-2.6 into queue) CONFLICT (content): Merge conflict in arch/powerpc/include/asm/kvm_para.h CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild Applying: KVM: PPC: fix fallout from UAPI changes Merging kvm-ppc/kvm-ppc-next (f37f444 KVM: PPC: Move mtspr/mfspr emulation = into own functions) Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x8= 6_get_ctrl()) Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/= kernel/git/steve/gfs2-3.0-fixes) Merging xen-two/linux-next (79fef7a Merge branch 'stable/for-linus-3.7' int= o linux-next) Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.o= rg/pub/scm/linux/kernel/git/teigland/linux-dlm) Merging workqueues/for-next (2b0f620 Merge branch 'for-3.7' into for-next) Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference = count leakage in eeepc_rfkill_hotplug()) Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into h= wpoison) Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may g= o away) Merging regmap/for-next (97f99c4 Merge tag 'regmap-fix-mmio' into regmap-ne= xt) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (2f73c39 leds: add output driver configuration for pc= a9633 led driver) Merging driver-core/driver-core-next (ddffeb8 Linux 3.7-rc1) Merging tty/tty-next (ddffeb8 Linux 3.7-rc1) Merging usb/usb-next (ddffeb8 Linux 3.7-rc1) Merging staging/staging-next (ddffeb8 Linux 3.7-rc1) Merging char-misc/char-misc-next (ddffeb8 Linux 3.7-rc1) Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next) Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't= call writeback_set_ratelimit() too often during hotplug) Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt= boot interface) Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) Merging pinctrl/for-next (d36d468 Merge branch 'u300' into for-next) Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support) CONFLICT (content): Merge conflict in drivers/net/tun.c Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplemen= t memblock allocation using reverse free area iterator) Merging remoteproc/for-next (ed26d19 remoteproc: fix (again) the virtio-rel= ated build breakage) Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics wh= en a domain mapping fails) Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kerne= l.org/pub/scm/linux/kernel/git/s390/linux) Merging gpio-lw/for-next (3fa851e Merge branch 'devel' into for-next) Merging arm-soc/for-next (0a5f9fe Merge branch 'next/cleanup' into for-next) Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handl= ing) Merging ep93xx/ep93xx-for-next (fab1f74 Merge branch 'ep93xx-fixes' into ep= 93xx-for-next) Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO) Merging msm/for-next (a0d271c Linux 3.6) Merging renesas/next (c136899 Merge branches 'heads/fixes', 'heads/defconfi= g' and 'heads/boards' into next) Merging samsung/for-next (ddffeb8 Linux 3.7-rc1) Merging tegra/for-next (51d64b8 Merge branch 'for-3.8/defconfig' into for-n= ext) Merging kvmtool/master (13d5097 kvm tools: Fix reported year in RTC emulati= on) Merging dma-mapping/dma-mapping-next (ddffeb8 Linux 3.7-rc1) Merging pwm/for-next (85f8879 pwm: dt: Fix description of second PWM cell) Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_a= ttachment()) Merging userns/for-next (e9069f4 btrfs: Fix compilation with user namespace= support enabled) Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements) Merging signal/for-next (8742548 Merge branches 'arch-parisc', 'arch-frv', = 'arch-powerpc', 'arch-s390' and 'no-rebases' into for-next) Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support) Merging random/dev (d2e7c96 random: mix in architectural randomness in extr= act_buf()) Merging lzo-update/lzo-update (2135668 lib/decompress_unlzo.c: fix a trivia= l compilation error) Merging scsi-post-merge/merge-base:master () $ git checkout akpm Applying: linux/coredump.h needs asm/siginfo.h Applying: memstick: remove unused field from state struct Applying: memstick: ms_block: fix compile issue Applying: memstick: use after free in msb_disk_release() Applying: memstick: memory leak on error in msb_ftl_scan() Applying: kernel/sys.c: fix stack memory content leak via UNAME26 Applying: drivers/video/backlight/lm3639_bl.c: return proper error in lm363= 9_bled_mode_store() error paths Applying: pidns: remove recursion from free_pid_ns() Applying: pidns-remove-recursion-from-free_pid_ns-v5-fix Applying: CRIS: Fix I/O macros Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference Applying: vfs: d_obtain_alias() needs to use "/" as default name. Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound = from the module acpi_memhotplug Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_devic= e() failed Applying: acpi_memhotplug.c: remove memory info from list before freeing it Applying: acpi_memhotplug.c: don't allow to eject the memory device if it i= s being used Applying: acpi_memhotplug.c: bind the memory device when the driver is bein= g loaded Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugge= d before the driver is loaded Applying: arch/x86/platform/iris/iris.c: register a platform device and a p= latform driver Applying: x86 numa: don't check if node is NUMA_NO_NODE Applying: arch/x86/tools/insn_sanity.c: identify source of messages Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue Applying: olpc: fix olpc-xo1-sci.c build errors Applying: fs/debugsfs: remove unnecessary inode->i_private initialization Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call Applying: timeconst.pl: remove deprecated defined(@array) Applying: time: don't inline EXPORT_SYMBOL functions Applying: h8300: select generic atomic64_t support Applying: cciss: cleanup bitops usage Applying: cciss: use check_signature() Applying: block: store partition_meta_info.uuid as a string Applying: init: reduce PARTUUID min length to 1 from 36 Applying: block: partition: msdos: provide UUIDs for partitions Applying: drbd: use copy_highpage Applying: vfs: increment iversion when a file is truncated Applying: fs: change return values from -EACCES to -EPERM Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget() Applying: mm/page_alloc.c: remove duplicate check Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_r= atelimited_nr() Applying: mm: show migration types in show_mem Applying: memory hotplug: suppress "Device memoryX does not have a release(= ) function" warning Applying: memory hotplug: suppress "Device nodeX does not have a release() = function" warning Applying: mm, memcg: make mem_cgroup_out_of_memory() static Applying: swap: add a simple detector for inappropriate swapin readahead Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix Applying: mm/memblock: reduce overhead in binary search Applying: compat: generic compat_sys_sched_rr_get_interval implementation Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uu= id Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid= -fix Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it = exists Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-ex= ists-checkpatch-fixes Applying: hfsplus: add on-disk layout declarations related to attributes tr= ee Applying: hfsplus: add functionality of manipulating by records in attribut= es tree Applying: hfsplus: rework functionality of getting, setting and deleting of= extended attributes Applying: hfsplus: add support of manipulation by attributes file Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch= -fixes Applying: hfsplus: code style fixes - reworked support of extended attribut= es Applying: fat: modify nfs mount option Applying: fat (exportfs): rebuild inode if ilookup() fails Applying: fat-exportfs-rebuild-inode-if-ilookup-fails-fix Applying: fat (exportfs): rebuild directory-inode if fat_dget() fails Applying: Documentation: update nfs option in filesystem/vfat.txt Applying: kstrto*: add documentation Applying: simple_strto*: annotate function as obsolete Applying: proc: don't show nonexistent capabilities Applying: ipc/sem.c: alternatives to preempt_disable() Applying: dma-debug: new interfaces to debug dma mapping errors Applying: linux/compiler.h: add __must_hold macro for functions called with= a lock held Merging akpm/master (57a593b linux/compiler.h: add __must_hold macro for fu= nctions called with a lock held) [master 5e8f8d7] Revert "ALSA: ice17xx: Constify strings and string arrays" [master 2ec2f35] Revert "ALSA: ice1712: Add Philips PSC724 Ultimate Edge" --Signature=_Thu__18_Oct_2012_14_46_14_+1100_uTHc3zbFg=ym0ixc Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAEBCAAGBQJQf3uGAAoJEECxmPOUX5FENCAP/iT2dM6JpWB21qGvwvoZSx5Q ++slhZkRw8NQq5L3wXKXuZ48VQl3Y6KTbwu/7zLjOWa1lJ/mFc1N8XOL6dKL494/ A4tZW7QE4kxBxz4ZLicDNLrPtJpJ4t5tdAZKq1X2OVeLrMd/lcR/kUOPg4OhM4FQ xIKBR3dtFRlB/0T37UvTl7fUyVEU88FPKn+QzFZvNZeGygqTTkT29Xv6aynMr47c 4xc1sjsyezvYf3VykdlRwXUig1Vb8qPpzxVrt97a4g9lE/5IrqRJXGGWtPvC9+lD 4PMoMQcDlR6NDX53SmcsQpuuFWb8ozzx2hopBg+ZzqKI76Nwg0KcHFJXHHSNYDJ3 UWENzVQBpAcn8yKouKfUNawtazdbON2J8WnHwm0T3DdM4TkdkPPT1jwiD7XcXF3w BEbjBxKAGfrco0p9MC+QoO8L+x76sYghvOuDyS1Rtb5eC2Y/rEpwvliMt84lSx7y vCA5eIy8mcJy8FXmTPv9/SMih/NWiOgWepncSUypEaWRwaCribYrbEMsokL5/2fh 3X5xx2RZyRvqvuJVKOWJ1IJ4Tt3OqBpWXyI3sl6qOJd36SVfC0369QjyhrqrkFM2 vseWI+QOcPIA7SObWCAM3e/rJfrEHtmyFYfxCU/T1ruUTBzVGYJRe5DIiR+qKLUc A+8wfYslCHr0kaLRlcNn =YUDY -----END PGP SIGNATURE----- --Signature=_Thu__18_Oct_2012_14_46_14_+1100_uTHc3zbFg=ym0ixc--