Hi all, Changes since 20150116: The i2c tree lost its build failure. The net-next tree gained a build failure so I used the version from next-20150116 for today. The luto-misc tree gained a conflict against the tip tree. The akpm-current tree gained two build failures for which I added fix patches. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 3428 3316 files changed, 110203 insertions(+), 57548 deletions(-) ---------------------------------------------------------------------------- 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" and checkout or reset to the new master. 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 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 234 trees (counting Linus' and 32 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . 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. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (ec6f34e5b552 Linux 3.19-rc5) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (a16c5f99a28c kbuild: Fix removal of the debian/ directory) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (2d9ed7406fd2 ARM: 8255/1: perf: Prevent wraparound during overflow) Merging m68k-current/for-linus (f27bd5bfeda5 m68k: Wire up execveat) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) Merging powerpc-merge-mpe/fixes (a87e810f61b4 powerpc: Work around gcc bug in current_thread_info()) Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) Merging net/master (2061dcd6bff8 net: sctp: fix race for one-to-many sockets in sendmsg's auto associate) Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode_session6.) Merging sound-current/for-linus (6455931186bf ALSA: usb-audio: Add mic volume fix quirk for Logitech Webcam C210) Merging pci-current/for-linus (d63e2e1f3df9 sparc/PCI: Clip bridge windows to fit in upstream windows) Merging wireless-drivers/master (781f51d4c203 Merge tag 'iwlwifi-for-kalle-2015-01-13' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging driver-core.current/driver-core-linus (72392ed0eb6f kernfs: Fix kernfs_name_compare) Merging tty.current/tty-linus (31ec77aca72e serial: samsung: Add the support for Exynos5433 SoC) Merging usb.current/usb-linus (f8359dae68bd Merge tag 'fixes-for-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) Merging usb-gadget-fixes/fixes (39e60635a015 usb: dwc3: gadget: Stop TRB preparation after limit is reached) Merging usb-serial-fixes/usb-linus (04f9c6e6d175 usb: serial: handle -ENODEV quietly in generic_submit_read_urb) Merging staging.current/staging-linus (a307d1d6d4cf staging: vt6655: fix sparse warning: argument type) Merging char-misc.current/char-misc-linus (7b7c54914f73 mcb: mcb-pci: Only remap the 1st 0x200 bytes of BAR 0) Merging input-current/for-linus (029b18361921 Input: uinput - fix ioctl nr overflow for UI_GET_SYSNAME/VERSION) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (3e14dcf7cb80 crypto: add missing crypto module aliases) Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap) Merging rr-fixes/fixes (574732c73d15 param: initialize store function to NULL if not available.) Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe()) Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test) Merging drm-intel-fixes/for-linux-next-fixes (226e5ae9e5f9 drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES) Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) Merging arc/for-next (5840adceb962 arc: Remove unused prepare_to_copy()) Merging arm/for-next (6aa99fe6afee Merge branches 'fixes', 'l2c' (early part), 'misc' and 'sa1100' into for-next) Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1) Merging arm-soc/for-next (bca0d2e77e37 arm-soc: document merges) Merging bcm2835/for-next (b2776bf7149b Linux 3.18) Merging berlin/berlin/for-next (8553bf8fd181 Merge branch 'berlin/dt' into berlin/for-next) Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging imx-mxs/for-next (bc8127e027df Merge branch 'imx/defconfig' into for-next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile Merging ixp4xx/next (19f949f52599 Linux 3.8) Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) Merging mvebu/for-next (411e0175c248 Merge branch 'mvebu/defconfig' into mvebu/for-next) Merging omap/for-next (0ccb4d1d525a Merge branch 'omap-for-v3.20/cleanup' into for-next) Merging omap-pending/for-next (99d076b74745 MAINTAINERS: add maintainer for OMAP hwmod data) Merging renesas/next (c20c776cff55 Merge branch 'heads/sh73a0-multiplatform-for-v3.20' into next) CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile Merging samsung/for-next (9663ad71912b Merge branch 'v3.20-next/update-samsung' into for-next) Merging sunxi/sunxi/for-next (ca735dafe21d Merge branches 'sunxi/dt-for-3.20' and 'sunxi/core-for-3.20' into sunxi/for-next) Merging tegra/for-next (4fd40ac71480 Merge branch for-3.20/soc into for-next) Merging arm64/for-next/core (6083fe74b7bf arm64: respect mem= for EFI) Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) Merging cris/for-next (79a8480adf0e CRIS: Fix missing NR_CPUS in menuconfig) Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) Merging ia64/next (0fd2468fd035 Merge branch 'misc-3.19' into next) Merging m68k/for-next (87511d09206d m68k/atari: Remove obsolete IRQ_TYPE_*) Merging m68knommu/for-next (8d84d4aaf311 arch: m68k: 68360: config: Remove unused function) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (132d5dfc0469 microblaze: whitespace fix) Merging mips/mips-for-linux-next (5500c246d920 Merge branch '3.19-fixes' into mips-for-linux-next) Merging nios2/nios2-next (1b0f44923e18 nios2: Use preempt_schedule_irq) Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) Merging parisc-hd/for-next (b2776bf7149b Linux 3.18) Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible) Merging powerpc-mpe/next (9a4fc4eaf111 powerpc/kvm: Create proper names for the kvm_host_state PMU fields) Merging fsl/next (76f3e2929bb6 powerpc/config: Enable memory driver) Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging s390/features (725908110a1f s390: add SMT support) Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (b9f705758a4f tile: enable sparse checks for get/put_user) Merging uml/next (989e59fa41c5 um: Include generic barrier.h) CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization) Merging btrfs/next (1edb647bb954 Btrfs: remove non-sense btrfs_error_discard_extent() function) Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) CONFLICT (content): Merge conflict in net/ceph/auth_x.c CONFLICT (content): Merge conflict in fs/ceph/super.h CONFLICT (content): Merge conflict in fs/ceph/super.c CONFLICT (content): Merge conflict in fs/ceph/snap.c Merging cifs/for-next (cac8894b8ed7 cifs: use memzero_explicit to clear stack buffer) Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) Merging ecryptfs/next (e7a823be2adc Merge tag 'linux-kselftest-3.19-rc-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) Merging ext3/for_next (c38fda3fe816 jbd: drop jbd_ENOSYS debug) Merging ext4/dev (4033d19d28ab ext4: add optimization for the lazytime mount option) Merging f2fs/dev (3857cef8022d f2fs: update memory footprint information) Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) CONFLICT (content): Merge conflict in fs/fscache/object.c Merging fuse/for-next (9759bd518994 fuse: add memory barrier to INIT) Merging gfs2/master (3566c9647678 GFS2: fix sprintf format specifier) Merging jfs/jfs-next (e1f1fe798d2f jfs: get rid of homegrown endianness helpers) Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) Merging nfs/linux-next (ec6f34e5b552 Linux 3.19-rc5) Merging nfsd/nfsd-next (0ec016e3e02f nfsd4: tweak rd_dircount accounting) Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) Merging overlayfs/overlayfs-next (4330397e4e8a ovl: discard independent cursor in readdir()) Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) Merging ubifs/linux-next (f38aed975c0c UBI: Fix invalid vfree()) Merging xfs/for-next (ad7df6e858ef Merge branch 'xfs-sb-logging-rework' into for-next) Merging file-locks/linux-next (3d8e560de4a0 locks: consolidate NULL i_flctx checks in locks_remove_file) Merging vfs/for-next (88174fd2c8fb kill d_validate()) Merging pci/next (75f30c3d9949 Merge branches 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-rcar' and 'pci/host-tegra' into next) Merging hid/for-next (88cbbe74e88b Merge branch 'for-3.20/wacom' into for-next) Merging i2c/i2c/for-next (789d10deed25 Merge branch 'i2c/for-current' into i2c/for-next) Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro) Merging hwmon-staging/hwmon-next (9dc9845ac3f8 hwmon: (ina2xx) Add ina231 compatible string) Merging v4l-dvb/master (2ea3258b238c Merge branch 'patchwork' into to_next) Merging kbuild/for-next (5ea04a1a0860 Merge branch 'kbuild/kbuild' into kbuild/for-next) Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) Merging libata/for-next (8ce20e750623 Merge branch 'for-3.19-fixes' into for-next) Merging pm/linux-next (794c3a0a9380 Merge branches 'acpi-pm', 'acpi-processor' and 'acpi-video') Merging idle/next (f7c0e22f2d14 Merge branch 'turbostat' into release) CONFLICT (content): Merge conflict in arch/x86/include/uapi/asm/msr-index.h Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) Merging thermal/next (f67744c4d91e Merge branch 'thermal-soc' of .git into next) Merging thermal-soc/next (1813d8087469 thermal: rcar: Spelling/grammar: s/drier use .../driver uses ...s/) Merging ieee1394/for-next (d737d7da8e7e firewire: sbp2: replace card lock by target lock) Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) Merging slave-dma/next (d8a69543bc46 Merge branch 'topic/slave_caps_device_control_fix_rebased' into next) Merging net-next/master (88340160f3ad ip_tunnel: Create percpu gro_cell) $ git reset --hard HEAD^ Merging next-20150116 version of net-next Merging ipsec-next/master (78890ed75494 csiostor:fix sparse warnings) Merging wireless-drivers-next/master (d0c102f70aec b43legacy: Remove unused b43legacy_radio_set_tx_iq()) CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/mvm/scan.c Merging bluetooth/master (88340160f3ad ip_tunnel: Create percpu gro_cell) CONFLICT (content): Merge conflict in drivers/net/wireless/ath/wil6210/cfg80211.c $ git reset --hard HEAD^ Merging next-20150116 version of bluetooth Merging infiniband/for-next (a7cfef21e3d0 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma', 'odp' and 'srp' into for-next) Merging mtd/master (97bf6af1f928 Linux 3.19-rc1) Merging l2-mtd/master (69a559e75512 nandsim: remove unused STATE_DATAOUT_STATUS_M and OPT_SMARTMEDIA) Merging crypto/master (b2c3f7cdad76 crypto: qat - don't need qat_auth_state struct) Merging drm/drm-next (426959c94553 drm: fix mismerge in drm_crtc.c) CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c Merging drm-panel/drm/panel/for-next (2d0853a33fda drm/panel: sharp: lq101r1sx01: Remove unneeded include) Merging drm-intel/for-linux-next (6f34cc393f64 i915: reuse %ph to dump small buffers) Merging drm-tegra/drm/tegra/for-next (7e0180e3570c drm/tegra: gem: Check before freeing CMA memory) Merging drm-misc/topic/core-stuff (2535ef6ae303 next: drm/atomic: Use copy_from_user to copy 64 bit data from user space) Merging sound/for-next (53c098bfc5b6 ALSA: add Studio Evolution SE6X support) Merging sound-asoc/for-next (f3ec1b8506f9 Merge remote-tracking branches 'asoc/topic/wm8804', 'asoc/topic/wm8960', 'asoc/topic/wm8988' and 'asoc/topic/xtfpga' into asoc-next) Merging modules/modules-next (97bf6af1f928 Linux 3.19-rc1) Merging virtio/virtio-next (97bf6af1f928 Linux 3.19-rc1) Merging input/next (7b2171d7c43e Input: cyapa - add acpi device id support) Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) Merging block/for-next (d7b582d95118 Merge branch 'for-3.20/drivers' into for-next) Merging device-mapper/for-next (6a55c9861326 block: keep established cmd_flags when cloning into a blk-mq request) Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) Merging mmc-uh/next (09062c888b89 mmc: dw_mmc: Power on vqmmc in MMC_POWER_ON, not MMC_POWER_UP) Merging kgdb/kgdb-next (c7d9ebf81c45 kdb: Fix off by one error in kdb_cpu()) Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) Merging md/for-next (f851b60db0fd md: Check MD_RECOVERY_RUNNING as well as ->sync_thread.) Merging mfd/for-mfd-next (a3b63979f8a3 mfd: rtsx: Add func to split u32 into register) Merging backlight/for-backlight-next (3d6969a641d0 MAINTAINERS: Remove my name from Backlight subsystem) Merging battery/master (b3040ccbad76 power: max17042: Constify struct regmap_config) Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) Merging omap_dss2/for-next (7efc436cd45c Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next) Merging regulator/for-next (4311c370311a Merge remote-tracking branches 'regulator/topic/pfuze100', 'regulator/topic/rk808', 'regulator/topic/rt5033' and 'regulator/topic/tps65023' into regulator-next) Merging security/next (bb31f607a090 Merge tag 'keys-next-fixes-20150114' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) Merging integrity/next (63a0eb7891bd ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met) Merging selinux/next (0307dadc924d selinux: add security in-core xattr support for pstore and debugfs) Merging lblnet/next (d8ec26d7f828 Linux 3.13) Merging watchdog/master (e0c3e00f4045 watchdog: drop owner assignment from platform_drivers) Merging iommu/next (2c0ee8b85aae iommu/rockchip: Drop owner assignment from platform_drivers) Merging dwmw2-iommu/master (1860e379875d Linux 3.15) Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU) Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) Merging jc_docs/docs-next (174236285cf8 Merge branch 'doc/sp-update' into docs-next) Merging trivial/for-next (231821d4c3fa dynamic_debug: fix comment) Merging audit/next (0f7e94ee40d0 Merge branch 'next' into upstream for v3.19) Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) Merging devicetree/devicetree/next (c46ca3c8310b of: Delete unnecessary check before calling "of_node_put()") Merging dt-rh/for-next (e94fbe607f8c dt-bindings: use isil prefix for Intersil in vendor-prefixes.txt) Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) Merging spi/for-next (2cdb41c84a4e Merge remote-tracking branches 'spi/topic/sirf' and 'spi/topic/st-ssc' into spi-next) Merging tip/auto-latest (4692b98fe5dc Merge branch 'x86/ras') Merging clockevents/clockevents/next (81428bbe1d8a clocksource: marco: Rename marco to atlas7) Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) Merging edac-amd/for-next (a4972b1b9a04 edac: i5100_edac: Remove unused i5100_recmema_dm_buf_id) Merging irqchip/irqchip/for-next (91d117921216 irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type) Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) Merging ftrace/for-next (d716ff71dd12 tracing: Remove taking of trace_types_lock in pipe files) Merging rcu/rcu/next (0cf8c85d7791 rcu_tree: Avoid touching rnp->completed when a new GP is started) Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) Merging kvm/linux-next (bab5bb398273 kvm: x86: Remove kvm_make_request from lapic.c) Merging kvm-arm/next (bab5bb398273 kvm: x86: Remove kvm_make_request from lapic.c) Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD) Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) Merging xen-tip/linux-next (2e917175e1ef xen: Speed up set_phys_to_machine() by using read-only mappings) Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying()) Merging workqueues/for-next (b5b3ab523e31 Merge branch 'for-3.19-fixes' into for-next) Merging drivers-x86/for-next (200db647112d platform/x86/acerhdf: Still depends on THERMAL) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) Merging regmap/for-next (270ded427d7b Merge remote-tracking branch 'regmap/topic/core' into regmap-next) Merging hsi/for-next (67e9a2ce6e07 hsi: nokia-modem: fix uninitialized device pointer) Merging leds/for-next (452bc149947b leds: leds-mc13783: Use of_get_child_by_name() instead of refcount hack) Merging ipmi/for-next (1421c935df15 ipmi: Fix compile warning with tv_usec) Merging driver-core/driver-core-next (ec6f34e5b552 Linux 3.19-rc5) Merging tty/tty-next (61b6b7fbda1b Merge 3.19-rc5 into tty-next) Merging usb/usb-next (1d97869198a3 usb: host: drop owner assignment from platform_drivers) Merging usb-gadget/next (fe198e34a44c usb: musb: debugfs: improve copy_from_user() argument) CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/bdc/bdc_ep.c CONFLICT (content): Merge conflict in drivers/usb/dwc2/gadget.c Merging usb-serial/usb-next (b7392d2247cf Linux 3.19-rc2) Merging staging/staging-next (ef4c65351a3d staging: rtl8723au: hal: Removed spaces before semicolon) Merging char-misc/char-misc-next (3542f6b1836d Merge 3.19-rc5 into char-misc-next) Merging cgroup/for-next (f3ba53802eff cgroup: add dummy css_put() for !CONFIG_CGROUPS) Merging scsi/for-next (cbd5bdf0a2fd Merge branch 'misc' into for-next) Merging target-updates/for-next (97bf6af1f928 Linux 3.19-rc1) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) Merging pinctrl/for-next (bcb9c0ee5465 Merge branch 'devel' into for-next) Merging vhost/linux-next (ecc043c31dbd virtio_pci: add module param to force legacy mode) Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) Merging gpio/for-next (00380f987010 Merge branch 'devel' into for-next) Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition) Merging pwm/for-next (39e046f2c1dd pwm: atmel-hlcdc: add at91sam9x5 and sama5d3 errata handling) Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning) Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) Merging ktest/for-next (17150fef4ab1 ktest: Add back "tail -1" to kernelrelease make) Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging clk/clk-next (d6643da05e39 clk: Skip fetching index for single parent clocks) Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL) Merging kselftest/next (97bf6af1f928 Linux 3.19-rc1) Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c) CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c Merging luto-misc/next (d4812e169de4 x86, mce: Get rid of TIF_MCE_NOTIFY and associated mce tricks) CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c Merging access_once/linux-next (1d513bde0145 kernel: Fix sparse warning for ACCESS_ONCE) Merging livepatching/for-next (99590ba565a2 livepatch: fix deferred module patching order) Merging akpm-current/current (16cfffc93532 ipc,sem: use current->state helpers) Applying: mm: drop vm_ops->remap_pages and generic_file_remap_pages() stub fix $ git checkout -b akpm remotes/origin/akpm/master Applying: drivers/gpio/gpio-zevio.c: fix build Applying: rtc: isl12022: deprecate use of isl in compatible string for isil Applying: rtc: isl12057: deprecate use of isl in compatible string for isil Applying: staging: iio: isl29028: deprecate use of isl in compatible string for isil Applying: arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix Applying: MAINTAINERS: add git url entry for UIO Applying: mm: fix XIP fault vs truncate race Applying: mm-fix-xip-fault-vs-truncate-race-fix Applying: mm-fix-xip-fault-vs-truncate-race-fix-fix Applying: mm: allow page fault handlers to perform the COW Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix-3 Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix Applying: vfs,ext2: introduce IS_DAX(inode) Applying: dax,ext2: replace XIP read and write with DAX I/O Applying: dax,ext2: replace ext2_clear_xip_target with dax_clear_blocks Applying: dax,ext2: replace the XIP page fault handler with the DAX page fault handler CONFLICT (content): Merge conflict in mm/filemap_xip.c Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-2 Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-3 Applying: dax,ext2: replace xip_truncate_page with dax_truncate_page Applying: dax: replace XIP documentation with DAX documentation Applying: vfs: remove get_xip_mem Applying: ext2: remove ext2_xip_verify_sb() Applying: ext2: remove ext2_use_xip Applying: ext2: remove xip.c and xip.h Applying: vfs,ext2: remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX Applying: ext2: remove ext2_aops_xip Applying: ext2: get rid of most mentions of XIP in ext2 Applying: dax: add dax_zero_page_range Applying: dax-add-dax_zero_page_range-fix Applying: ext4: add DAX functionality Applying: ext4-add-dax-functionality-fix Applying: brd: rename XIP to DAX Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Merging akpm/master (27c52752f63c mm: add strictlimit knob) Applying: mm: account pmd page tables to the process fix
Attachment:
pgpyUL5zWK8LN.pgp
Description: OpenPGP digital signature
