Hi all, Changes since 201209011: The pci tree lost its build failure. The mfd tree gained a conflict against Linus' tree. The omap_dss2 tree lost its conflict. The trivial tree gained a conflict against the mfd tree. The kvm tree gained a conflict against Linus' tree. The workqueues tree gained a conflict against the omap_dss2 tree. The usb tree gained conflicts against the usb.current tree. The staging tree gained a conflict against the thermal tree and a build failure for which I applied a merge fix patch. The tegra tree gained conflicts against the usb and arm-perf trees. ---------------------------------------------------------------------------- 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 197 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. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (0bd1189 Merge branch 'for-3.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq) Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc) Merging kbuild-current/rc-fixes (6c7080a firmware: fix directory creation rule matching with make 3.82) Merging arm-current/fixes (beafa0d ARM: 7529/1: delay: set loops_per_jiffy when moving to timer-based loop) Merging m68k-current/for-linus (3be7184 m68k: Add missing RCU idle APIs on idle loop) Merging powerpc-merge/merge (636802e powerpc: Don't use __put_user() in patch_instruction) Merging sparc/master (6dab7ed Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm) Merging net/master (b48d6f8 net: qmi_wwan: fix Gobi device probing for un2430) Merging sound-current/for-linus (c302d61 ALSA: hda_intel: add position_fix quirk for Asus K53E) Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled) Merging wireless/master (4abd044 brcm80211: fix missing allocation failure check) Merging driver-core.current/driver-core-linus (60e233a kobject: fix oops with "input0: bad kobj_uevent_env content in show_uevent()") Merging tty.current/tty-linus (7be0670 tty: serial: imx: don't reinit clock in imx_setup_ufcr()) Merging usb.current/usb-linus (ba9edaa USB: option: replace ZTE K5006-Z entry with vendor class rule) Merging staging.current/staging-linus (94254ed drm/omap: add more new timings fields) Merging char-misc.current/char-misc-linus (fea7a08 Linux 3.6-rc3) Merging input-current/for-linus (6f4d038 Input: wacom - add support for EMR on Cintiq 24HD touch) Merging md-current/for-linus (58e94ae md/raid1: close some possible races on write errors during resync) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (9b2f4cb crypto: authenc - Fix crash with zero-length assoc data) Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops) Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-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 formatting) Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args) Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.) Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast) Merging arm/for-next (8249694 Merge branches 'atags', 'fixes' and 'misc' into for-next) Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf) CONFLICT (content): Merge conflict in arch/arm/kernel/hw_breakpoint.c Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) Merging arm64/upstream (540fd04 fs: Build sys_stat64() and friends if __ARCH_WANT_COMPAT_STAT64) Merging blackfin/for-linus (6895f97 kbuild: add symbol prefix arg to kallsyms) Merging c6x/for-linux-next (55d512e Linux 3.6-rc5) Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code) Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal) Merging ia64/next (36a45e7 [IA64] kexec: Move the dereference below the NULL test) Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR) Merging m68knommu/for-next (42ec574 m68knommu: use "r", not "i" constraint in cacheflus asm's) Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd) Merging mips/mips-for-linux-next (84733d1 Merge branch 'next/p1/for-linus' into mips-for-linux-next) Merging openrisc/for-upstream (807607f openrisc: delay: fix handling of counter overflow) Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread()) Merging powerpc/next (6b5e722 powerpc/mm: Match variable types to API) Merging 4xx/next (2074b1d powerpc: Fix irq distribution) Merging mpc5xxx/next (12e3630 powerpc: Option FB_FSL_DIU is not really optional for mpc512x) Merging galak/next (087979d powerpc/8544ds: add partition table for norflash) Merging s390/features (e2c56c0 s390/vmlogrdr: change return value from -ENOSYS to -EOPNOTSUPP) Merging sh/sh-latest (d4b7c5d sh: intc: Fix up multi-evt irq association.) Merging sparc-next/master (c69ad0a sparc64: Use cpu_pgsz_mask for linear kernel mapping config.) Merging tile/master (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler) Merging xtensa/for_next (499d9ec xtensa: ISS: exit simulator in case of halt or panic) Merging ceph/master (1fe5e99 rbd: create rbd_refresh_helper()) Merging cifs/for-next (d0c105c cifs: remove the kmap size limit from wsize) 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 (5eec54f UDF: Add support for O_DIRECT) Merging ext4/dev (8a2f846 ext4: remove duplicated declarations in inode.c) Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig) Merging gfs2/master (de5b4c7 GFS2: Consolidate free block searching functions) Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf()) Merging nfs/linux-next (7b281ee NFS: fsync() must exit with an error if page writeback failed) Merging nfsd/nfsd-next (fac7a17 nfsd4: cast readlink() bug argument) 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 (43def35 net/9p: Check errno validity) Merging ubifs/linux-next (3668b70 UBIFS: print less) Merging xfs/for-next (b686d1f xfs: xfs_seek_hole() refinement with hole searching from page cache for unwritten extents) Merging vfs/for-next (61a1384 fanotify: sanitize failure exits in copy_event_to_user()) Merging pci/next (a63ab61 Merge branch 'pci/gavin-window-alignment' into next) CONFLICT (content): Merge conflict in drivers/rapidio/devices/tsi721.c CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Merging hid/for-next (ccdbda06 Merge branch 'picolcd' into for-next) CONFLICT (content): Merge conflict in drivers/hid/usbhid/hid-quirks.c Merging quilt/i2c (12dc268 i2c: Make I2C available on UML) CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-i801.c Merging i2c-embedded/i2c-embedded/for-next (c7751af ARM: davinci: i2c: add OF support) Merging quilt/jdelvare-hwmon (0c82d9f hwmon: (coretemp) Use get_online_cpus to avoid races involving CPU hotplug) Merging hwmon-staging/hwmon-next (8791b15 hwmon: (ina2xx) Add support for INA220 and INA230) Merging v4l-dvb/master (624bfcc Merge /home/v4l/v4l/patchwork) CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c Merging kbuild/for-next (c781288 Merge branches 'kbuild/kbuild', 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next) Merging kconfig/for-next (45f4c81 localmodconfig: Use my variable for loop in streamline_config.pl) Merging libata/NEXT (1b26d29 [libata] scsi: implement MODE SELECT command) Merging infiniband/for-next (fea7a08 Linux 3.6-rc3) Merging pstore/master (65f8c95 pstore/ftrace: Convert to its own enable/disable debugfs knob) Merging acpi/next (9d0b01a Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base) Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between 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 (2de237a thermal: exynos: Use devm_* functions) Merging ieee1394/for-next (e3cbd92 firewire: core: document is_local sysfs attribute) Merging ubi/linux-next (d9de5fa UBI: fix a horrible memory deallocation bug) Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user) Merging scsi/for-next (fec178b Merge branch 'misc' into for-next) Merging target-updates/for-next (827e10f target: do not submit a zero-bio I/O request) 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 (b5f1433 spi: davici - make davinci select edma) Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops) Merging net-next/master (280050c x86 bpf_jit: support MOD operation) CONFLICT (content): Merge conflict in net/socket.c Applying: net: cope with sock_alloc_file() API change Merging wireless-next/master (871fc09 libertas: set mac control synchronously during init) Merging bluetooth/master (3ca8611 drivers/bluetooth/btuart_cs.c: removes unnecessary semicolon) Merging mtd/master (2361f73 Merge tag 'v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux) Merging l2-mtd/master (44e42b9 mtd: mtd_nandecctest: ensure alignment requirement for bitops) Merging crypto/master (821873a hwrng: mxc-rnga - Access data via structure) CONFLICT (content): Merge conflict in crypto/Kconfig Merging drm/drm-next (95ca19c drm: udl: usb: Fix recursive Kconfig dependency) Merging sound/for-next (ef596a5 ALSA: hda - Add support for MacBook Pro 10,1) Merging sound-asoc/for-next (e0ca462 Merge branch 'for-3.7' into asoc-next) Merging quilt/rr (7421bb4 virtio: support reserved vqs) CONFLICT (content): Merge conflict in arch/xtensa/Kconfig CONFLICT (content): Merge conflict in arch/s390/Kconfig CONFLICT (content): Merge conflict in arch/mips/kernel/module.c CONFLICT (content): Merge conflict in arch/alpha/Kconfig Merging input/next (caaa357 Input: Add KD[GS]KBDIACRUC ioctls to the compatible list) Merging input-mt/for-next (4c93228 HID: hid-multitouch: Add Flatfrog support) Merging cgroup/for-next (9814e97 fs: add missing documentation to simple_xattr functions) Merging block/for-next (5611a9d Merge branch 'for-3.7/drivers' into for-next) Merging quilt/device-mapper (3bcc599 A little thin discard code refactoring in preparation for the next patch. Use bools instead of unsigned for features.) Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) 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 (2126a73 mmc: sdhci-pxav3: dt: Support "cd-gpios" property) Merging kgdb/kgdb-next (15d7ea0 kgdboc: Accept either kbd or kdb to activate the vga + keyboard kdb shell) Merging slab/for-next (8162231 Merge branch 'slab/next' into for-next) Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") Merging md/for-next (eef0978 md: avoid taking the mutex on some ioctls.) Merging mfd/for-next (a325eba mfd: 88pm860x: Fix section mismatch warning) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/regulator/tps6586x.txt Merging battery/master (2815b78 power_supply: Add new power supply properties CHARGE_CURRENT/VOLTAGE_MAX) Merging fbdev/fbdev-next (75435c7 video: exynos_dp: move setting analog parameter and interrupt to after sw reset) Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) Merging omap_dss2/for-next (6659145 Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6) Merging regulator/for-next (be9bfd9 Merge branch 'regulator-drivers' into regulator-next) CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/regulator/tps6586x.txt Merging security/next (2e4930e Yama: handle 32-bit userspace prctl) Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/master (b232a70 watchdog: move the dereference below the NULL test) Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) Merging iommu/next (6f286cc Merge branches 'iommu/fixes' and 'arm/tegra' into next) Merging vfio/next (d987569 Linux 3.6-rc2) Merging osd/linux-next (b8017d2 exofs: check for allocation failure in uri_store()) Merging jc_docs/docs-next (5c050fb docs: update the development process document) Merging trivial/for-next (527a136 btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID) CONFLICT (content): Merge conflict in drivers/video/backlight/88pm860x_bl.c CONFLICT (content): Merge conflict in drivers/scsi/ipr.c Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging pm/linux-next (2b06c9d Merge branch 'pm-sleep-next' into linux-next) Merging apm/for-next (f07bb36 x86, apm: Make on_cpu0() use workqueue instead of work_on_cpu()) Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls) CONFLICT (content): Merge conflict in kernel/audit_tree.c Merging edac/linux_next (a92cdec Merge branch 'devel' into next) Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next) CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c CONFLICT (content): Merge conflict in Documentation/edac.txt Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name) Merging dt-rh/for-next (ee67016 of: i2c: add support for wakeup-source property) Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices) Merging spi-mb/spi-next (4ef5eb4 Merge branch 'spi-drivers' into spi-next) CONFLICT (content): Merge conflict in drivers/mmc/host/mxs-mmc.c Merging tip/auto-latest (650470d Merge branch 'linus') CONFLICT (content): Merge conflict in arch/Kconfig Merging rcu/rcu/next (5e9c338 rcu: Shrink RCU based on number of CPUs) CONFLICT (content): Merge conflict in kernel/sched/core.c CONFLICT (content): Merge conflict in kernel/rcutree_plugin.h CONFLICT (content): Merge conflict in kernel/rcutree.h CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/Kconfig Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error) Merging kvm/linux-next (7de5bdc KVM: MMU: remove unnecessary check) CONFLICT (content): Merge conflict in arch/x86/kvm/i8259.c CONFLICT (content): Merge conflict in arch/s390/include/asm/processor.h Merging kvm-ppc/kvm-ppc-next (e9908a4 KVM: PPC: BookE: Support FPU on non-hv systems) CONFLICT (content): Merge conflict in include/linux/kvm.h CONFLICT (content): Merge conflict in arch/powerpc/kvm/e500_tlb.c CONFLICT (content): Merge conflict in arch/powerpc/include/asm/kvm_ppc.h Merging oprofile/for-next (61bccf1 oprofile: Remove 'WQ on CPUx, prefer CPUy' warning) 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 (e09f4b3 Merge branch 'stable/for-linus-3.7' into 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.org/pub/scm/linux/kernel/git/teigland/linux-dlm) Merging workqueues/for-next (227045e Merge branch 'for-3.6-fixes' into for-next) CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-taal.c CONFLICT (modify/delete): drivers/hid/hid-picolcd.c deleted in HEAD and modified in workqueues/for-next. Version workqueues/for-next of drivers/hid/hid-picolcd.c left in tree. $ git rm -f drivers/hid/hid-picolcd.c Merging drivers-x86/linux-next (973713e classmate-laptop: always call input_sync() after input_report_switch()) Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) Merging regmap/for-next (e9bfb35 Merge branch 'regmap-irq' into regmap-next) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (8fe4554 leds: leds-gpio: adopt pinctrl support) Merging driver-core/driver-core-next (6f586e6 driver-core: Shut up dev_dbg_reatelimited() without DEBUG) Applying: extcon: adc_jack: update for INIT_DELAYED_WORK_DEFERRABLE name change Merging tty/tty-next (23666a7 serial: mxs-auart: put the device in the error path) Merging usb/usb-next (58efc77 usb: renesas_usbhs: convert to devm_xxx()) CONFLICT (content): Merge conflict in drivers/usb/musb/tusb6010.c CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c Merging staging/staging-next (b84a9ce Staging: silicom: checkpatch cleanup: header tabs n spaces) CONFLICT (content): Merge conflict in drivers/staging/omap-thermal/omap-thermal-common.c Applying: HID: sensors: fix up for mfd_add_devices() API change Merging char-misc/char-misc-next (a4136b4 mei: don't print buffer as a string) Merging tmem/linux-next (15773b6 Merge branch 'stable/for-linus-3.6' into linux-next) Merging writeback/writeback-for-next (0e2f2b2 writeback: correct comment for move_expired_inodes()) 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 (2830c36 pinctrl/nomadik : add MC1_a_2 pin MC1 function group list) 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: Reimplement memblock allocation using reverse free area iterator) Merging remoteproc/for-next (4980f46 remoteproc/omap: set bootaddr support) Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails) Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) Merging gpio-lw/for-next (47047e9 Merge branch 'devel' into for-next) Merging arm-soc/for-next (7517e56 Merge branch 'next/boards' into for-next) CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c Merging ep93xx/ep93xx-for-next (e0a4119 Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging ixp4xx/next (1d2d793 ixp4xx: Declare MODULE_FIRMWARE usage) Merging msm/for-next (6fac210 ARM: msm: Allow 8960 and 8660 to compile together) Merging renesas/next (9e1b500 Merge remote-tracking branches 'origin/cleanup', 'origin/dt', 'origin/soc', 'origin/boards', 'origin/defconfig', 'origin/armadillo800eva-fixes', 'origin/fixes', 'origin/gpio' and 'origin/pmu/cleanup' into next) Merging samsung/for-next (d42d843 Merge branch 'next/dt-gscaler' into for-next) CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile Merging tegra/for-next (904e11a Merge branch 'for-3.7/maintainers' into for-next) CONFLICT (content): Merge conflict in drivers/usb/phy/tegra_usb_phy.c CONFLICT (modify/delete): arch/arm/mach-tegra/devices.h deleted in tegra/for-next and modified in HEAD. Version HEAD of arch/arm/mach-tegra/devices.h left in tree. CONFLICT (modify/delete): arch/arm/mach-tegra/devices.c deleted in tegra/for-next and modified in HEAD. Version HEAD of arch/arm/mach-tegra/devices.c left in tree. $ git rm -f arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h Merging kvmtool/master (e36e901 kvm tools: virtio-9p cleanup) Merging dma-mapping/dma-mapping-next (588eb1c Merge branch 'next-cleanup' into HEAD) Merging pwm/for-next (c5d0b8a pwm: add devm_pwm_get() and devm_pwm_put()) Merging dma-buf/for-next (55d512e Linux 3.6-rc5) Merging userns/for-next (1efdb69 userns: Convert ipc to use kuid and kgid where appropriate) Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS) Merging signal/for-next (196ea2e alpha: don't open-code trace_report_syscall_{enter,exit}) CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support) CONFLICT (modify/delete): arch/arm/mach-ux500/clock.c deleted in clk/clk-next and modified in HEAD. Version HEAD of arch/arm/mach-ux500/clock.c left in tree. $ git rm -f arch/arm/mach-ux500/clock.c Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf()) Merging scsi-post-merge/merge-base:master () $ git checkout akpm Applying: memory hotplug: reset pgdat->kswapd to NULL if creating kernel thread fails Applying: mm/ia64: fix a memory block size bug Applying: MAINTAINERS: fix TXT maintainer list and source repo path Applying: nbd: clear waiting_queue on shutdown Applying: slab: do ClearSlabPfmemalloc() for all pages of slab Applying: slab: fix starting index for finding another object Applying: slub: consider pfmemalloc_match() in get_partial_node() Applying: include/net/sock.h: squelch compiler warning in sk_rmem_schedule() Applying: pid-namespace: limit value of ns_last_pid to (0, max_pid) Applying: compiler.h: add __visible Applying: CRIS: Fix I/O macros Applying: drivers/scsi/ipr.c: missing unlock before a return 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: 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_device() 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 is being used Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver Applying: x86/mm/init.c: devmem_is_allowed() off by one Applying: x86 numa: don't check if node is NUMA_NO_NODE Applying: audit.h: replace defines with C stubs Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message 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: unicore32: select generic atomic64_t support Applying: readahead: fault retry breaks mmap file read random detection Applying: drivers/scsi/atp870u.c: fix bad use of udelay Applying: drivers/scsi/ipr.c: remove an unneeded check 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: vfs: increment iversion when a file is truncated Applying: fs: push rcu_barrier() from deactivate_locked_super() to filesystems Applying: mm/page_alloc.c: remove duplicate check Applying: mm: remove __GFP_NO_KSWAPD Applying: x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines Applying: x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn Applying: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix Applying: mm, x86, pat: rework linear pfn-mmap tracking Applying: mm: introduce arch-specific vma flag VM_ARCH_1 Applying: mm: kill vma flag VM_INSERTPAGE Applying: mm: kill vma flag VM_CAN_NONLINEAR Applying: mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file Applying: mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas Applying: mm: prepare VM_DONTDUMP for using in drivers Applying: mm: kill vma flag VM_RESERVED and mm->reserved_vm counter Applying: mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix Applying: mm: fix nonuniform page status when writing new file with small buffer Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix-fix Applying: mm/mmap.c: replace find_vma_prepare() with clearer find_vma_links() Applying: mm: compaction: update comment in try_to_compact_pages Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures Applying: mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures-fix Applying: mm: compaction: capture a suitable high-order page immediately when it is made available Applying: Revert "mm: mempolicy: Let vma_merge and vma_split handle vma->vm_policy linkages" Applying: mempolicy: remove mempolicy sharing Applying: mempolicy: fix a race in shared_policy_replace() Applying: mempolicy: fix refcount leak in mpol_set_shared_policy() Applying: mempolicy: fix a memory corruption by refcount imbalance in alloc_pages_vma() Applying: mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma-v2 Applying: mm: mmu_notifier: fix inconsistent memory between secondary MMU and host Applying: mm-mmu_notifier-fix-inconsistent-memory-between-secondary-mmu-and-host-fix Applying: mm: mmu_notifier: have mmu_notifiers use a global SRCU so they may safely schedule Applying: mm/mmu_notifier: init notifier if necessary Applying: mm/mmu_notifier: init notifier if necessary Applying: mm/vmscan: fix error number for failed kthread Applying: oom: remove deprecated oom_adj Applying: mm: hugetlb: add arch hook for clearing page flags before entering pool Applying: mm: adjust final #endif position in mm/internal.h Applying: thp: fix the count of THP_COLLAPSE_ALLOC Applying: thp: remove unnecessary check in start_khugepaged Applying: thp: move khugepaged_mutex out of khugepaged Applying: thp: remove unnecessary khugepaged_thread check Applying: thp: remove wake_up_interruptible in the exit path Applying: thp: remove some code depend on CONFIG_NUMA Applying: thp: merge page pre-alloc in khugepaged_loop into khugepaged_do_scan Applying: thp: release page in page pre-alloc path Applying: thp: introduce khugepaged_prealloc_page and khugepaged_alloc_page Applying: thp: remove khugepaged_loop Applying: thp: use khugepaged_enabled to remove duplicate code Applying: thp: remove unnecessary set_recommended_min_free_kbytes Applying: mm: fix potential anon_vma locking issue in mprotect() Applying: thp, x86: introduce HAVE_ARCH_TRANSPARENT_HUGEPAGE Applying: thp: remove assumptions on pgtable_t type Applying: thp: introduce pmdp_invalidate() Applying: thp: make MADV_HUGEPAGE check for mm->def_flags Applying: thp, s390: thp splitting backend for s390 Applying: thp, s390: thp pagetable pre-allocation for s390 Applying: thp, s390: disable thp for kvm host on s390 Applying: thp, s390: architecture backend for thp on s390 Applying: ipc/mqueue: remove unnecessary rb_init_node() calls Applying: rbtree: reference Documentation/rbtree.txt for usage instructions Applying: rbtree: empty nodes have no color Applying: rbtree-empty-nodes-have-no-color-fix Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c Applying: rbtree: move some implementation details from rbtree.h to rbtree.c Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field Applying: rbtree: performance and correctness test Applying: rbtree-performance-and-correctness-test-fix Applying: rbtree: break out of rb_insert_color loop after tree rotation Applying: rbtree: adjust root color in rb_insert_color() only when necessary Applying: rbtree: low level optimizations in rb_insert_color() Applying: rbtree: adjust node color in __rb_erase_color() only when necessary Applying: rbtree: optimize case selection logic in __rb_erase_color() Applying: rbtree: low level optimizations in __rb_erase_color() Applying: rbtree: coding style adjustments Applying: rbtree: optimize fetching of sibling node Applying: rbtree test: fix sparse warning about 64-bit constant Applying: rbtree: add __rb_change_child() helper function Applying: rbtree: place easiest case first in rb_erase() Applying: rbtree: handle 1-child recoloring in rb_erase() instead of rb_erase_color() Applying: rbtree: low level optimizations in rb_erase() Applying: rbtree: augmented rbtree test Applying: rbtree: faster augmented rbtree manipulation Applying: rbtree: remove prior augmented rbtree implementation Applying: rbtree: add RB_DECLARE_CALLBACKS() macro Applying: rbtree: add prio tree and interval tree tests Applying: mm: replace vma prio_tree with an interval tree Applying: kmemleak: use rbtree instead of prio tree Applying: prio_tree: remove Applying: rbtree: move augmented rbtree functionality to rbtree_augmented.h Applying: memory-hotplug: build zonelists when offlining pages Applying: mm: mmu_notifier: make the mmu_notifier srcu static Applying: mm: change enum migrate_mode with bitwise type Applying: mm: support MIGRATE_DISCARD Applying: mm-support-migrate_discard-fix Applying: mm: move all mmu notifier invocations to be done outside the PT lock Applying: mm-move-all-mmu-notifier-invocations-to-be-done-outside-the-pt-lock-fix Applying: mm: wrap calls to set_pte_at_notify with invalidate_range_start and invalidate_range_end Applying: frv: kill used but uninitialized variable Applying: score: select generic atomic64_t support Applying: drivers/misc/lis3lv02d: add generic DT matching code Applying: drivers/misc/lis3lv02d/lis3lv02d_spi.c: add DT matching table passthru code Applying: cross-arch: don't corrupt personality flags upon exec() Applying: tile: fix personality bits handling upon exec() Applying: kernel/sys.c: call disable_nonboot_cpus() in kernel_restart() Applying: lib: vsprintf: optimize division by 10 for small integers Applying: lib: vsprintf: optimize division by 10000 Applying: lib: vsprintf: optimize put_dec_trunc8() Applying: lib: vsprintf: fix broken comments Applying: lib/vsprintf: update documentation to cover all of %p[Mm][FR] Applying: MAINTAINERS: update gpio subsystem file list Applying: MAINTAINERS: add defconfig file to IMX section Applying: MAINTAINERS: Update gianfar_ptp after renaming Applying: drivers/video/backlight/pwm_bl.c: add device tree support for Low Threshold Brightness Applying: drivers/video/backlight/da9052_bl.c: use usleep_range() instead of msleep() for small sleeps Applying: drivers/video/backlight/ltv350qv.c: use usleep_range() instead of msleep() for small sleeps Applying: drivers/video/backlight/kb3886_bl.c: use usleep_range() instead of msleep() for small sleeps Applying: backlight: lp855x: add FAST bit description for LP8556 Applying: backlight: add Backlight driver for lm3630 chip Applying: backlight-add-backlight-driver-for-lm3630-chip-fix Applying: backlight: add new lm3639 backlight driver Applying: backlight-add-new-lm3639-backlight-driver-fix Applying: backlight: remove ProGear driver Applying: lib/parser.c: avoid overflow in match_number() Applying: lib-parserc-avoid-overflow-in-match_number-fix Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid 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-exists-checkpatch-fixes Applying: epoll: support for disabling items, and a self-test app Applying: drivers/rtc/rtc-isl1208.c: add support for the ISL1218 Applying: rtc-proc: permit the /proc/driver/rtc device to use other devices Applying: rtc: add Dallas DS2404 driver Applying: rtc-add-dallas-ds2404-driver-fix Applying: rtc: snvs: add Freescale rtc-snvs driver Applying: rtc: snvs: change timeout to use a fixed number of loop Applying: rtc: recycle id when unloading a rtc driver Applying: drivers/rtc/rtc-at91sam9.c: use module_platform_driver() macro Applying: rtc: tps65910: add RTC driver for TPS65910 PMIC RTC Applying: rtc: add MAX8907 RTC driver Applying: rtc: kconfig: remove unnecessary dependencies. Applying: drivers/rtc/rtc-jz4740.c: fix IRQ error check Applying: drivers/rtc/rtc-spear.c: fix several error checks Applying: rtc: rc5t583: add ricoh rc5t583 RTC driver Applying: drivers/rtc/rtc-coh901331.c: use clk_prepare_enable() and clk_disable_unprepare() Applying: fat: use accessor function for msdos_dir_entry 'start' Applying: fat (exportfs): move NFS support code Applying: fat (exportfs): fix dentry reconnection Applying: fs/fat: fix a checkpatch issue in namei_msdos.c Applying: fs/fat: fix some checkpatch issues in fat.h Applying: fs/fat: chang indentation of some comments in fat.h Applying: fs/fat: fix two checkpatch issues in cache.c Applying: fs/fat: fix some small checkpatch issues in dir.c Applying: fs/fat: fix all other checkpatch issues in dir.c Applying: fs-fat-fix-all-other-checkpatch-issues-in-dirc-fix Applying: fs/fat: fix checkpatch issues in fatent.c Applying: fat: no need to reset EOF in ent_put for FAT32 Applying: fat: simplify writeback_inode() Applying: fat-simplify-writeback_inode-checkpatch-fixes Applying: fat-simplify-writeback_inode-checkpatch-fixes-fix Applying: device_cgroup: add "deny_all" in dev_cgroup structure Applying: device_cgroup: introduce dev_whitelist_clean() Applying: device_cgroup: convert device_cgroup internally to policy + exceptions Applying: device_cgroup: rename whitelist to exception list Applying: coredump: move core dump functionality into its own file Applying: coredump: make core dump functionality optional Applying: fs: amended coredump-related sysctl functions Applying: coredump: update coredump-related headers Applying: proc: return -ENOMEM when inode allocation failed Applying: proc: no need to initialize proc_inode->fd in proc_get_inode() Applying: proc: use kzalloc instead of kmalloc and memset Applying: proc-use-kzalloc-instead-of-kmalloc-and-memset-fix Applying: proc_sysctl.c: use BUG_ON instead of BUG Applying: kdump: remove unneeded include Applying: ipc/sem.c: alternatives to preempt_disable() Applying: rapidio/tsi721: modify mport name assignment Applying: nbd: add set flags ioctl Applying: nbd: handle discard requests Applying: aoe: for performance support larger packet payloads Applying: aoe: kernel thread handles I/O completions for simple locking Applying: aoe: become I/O request queue handler for increased user control Applying: aoe: use a kernel thread for transmissions Applying: aoe: use packets that work with the smallest-MTU local interface Applying: aoe: failover remote interface based on aoe_deadsecs parameter Applying: aoe: do revalidation steps in order Applying: aoe: disallow unsupported AoE minor addresses Applying: aoe: associate frames with the AoE storage target Applying: aoe: increase net_device reference count while using it Applying: aoe: remove unused code and add cosmetic improvements Applying: aoe: update internal version number to 49 Applying: aoe: update copyright year in touched files Applying: aoe: update documentation with new URL and VM settings reference Applying: taskstats: cgroupstats_user_cmd() may leak on error Applying: lib/decompress.c add __init to decompress_method and data Merging akpm/master (637f21d lib/decompress.c add __init to decompress_method and data)
Attachment:
pgpVhbP_c2_v0.pgp
Description: PGP signature
