Hi all, Changes since 20150223: The hid tree gained a conflict against Linus' tree. The drm-misc tree gained a build failure for which I applied a merge fix patch. Non-merge commits (relative to Linus' tree): 1108 718 files changed, 18557 insertions(+), 17357 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 206 trees (counting Linus' and 30 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 (c517d838eb7d Linux 4.0-rc1) 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 (23be7fdafa50 ARM: 8305/1: DMA: Fix kzalloc flags in __iommu_alloc_buffer()) Merging m68k-current/for-linus (4436820a98cd m68k/defconfig: Enable Ethernet bridging) 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 (c59c961ca511 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) Merging net/master (d720d8cec563 net: compat: Ignore MSG_CMSG_COMPAT in compat_sys_{send, recv}msg) Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in xfrm_lookup()) Merging sound-current/for-linus (70372a7566b5 ALSA: pcm: Don't leave PREPARED state after draining) Merging pci-current/for-linus (c517d838eb7d Linux 4.0-rc1) Merging wireless-drivers/master (aeb2d2a4c0ae rtlwifi: Remove logging statement that is no longer needed) Merging driver-core.current/driver-core-linus (c517d838eb7d Linux 4.0-rc1) Merging tty.current/tty-linus (c517d838eb7d Linux 4.0-rc1) Merging usb.current/usb-linus (c517d838eb7d Linux 4.0-rc1) Merging usb-gadget-fixes/fixes (a0456399fb07 usb: gadget: configfs: don't NUL-terminate (sub)compatible ids) Merging usb-serial-fixes/usb-linus (a6f0331236fa USB: cp210x: add ID for RUGGEDCOM USB Serial Console) Merging staging.current/staging-linus (c517d838eb7d Linux 4.0-rc1) Merging char-misc.current/char-misc-linus (c517d838eb7d Linux 4.0-rc1) Merging input-current/for-linus (4c971aa78314 Merge branch 'next' into for-linus) Merging crypto-current/master (96692a7305c4 crypto: tcrypt - do not allocate iv on stack for aead speed tests) Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging devicetree-current/devicetree/merge (6b1271de3723 of/unittest: Overlays with sub-devices tests) Merging rr-fixes/fixes (f47689345931 lguest: update help text.) 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 (cf6f0af9fbdd drm/i915: Dell Chromebook 11 has PWM backlight) 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 (06f34e1c28f3 ARC: fix page address calculation if PAGE_OFFSET != LINUX_LINK_BASE) Merging arm/for-next (42203614b435 Merge branch 'devel-stable' into for-next) Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1) Merging arm-soc/for-next (d88d6cfc912e ARM: mm: Remove Kconfig symbol CACHE_PL310) Merging bcm2835/for-next (b2776bf7149b Linux 3.18) Merging berlin/berlin/for-next (c517d838eb7d Linux 4.0-rc1) Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) Merging imx-mxs/for-next (395ae1400a35 Merge branch 'imx/defconfig' into for-next) Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) Merging mvebu/for-next (444fdf947de3 ARM: mvebu: Add Device Tree description of SDHCI for Armada 388 RD) Merging omap/for-next (5cb1e109eee0 Merge tag 'omap-for-v3.20/dt-pt3-v2' into for-next) Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) Merging renesas/next (b2cb094d275e Merge branch 'heads/soc-fixes-for-v3.19' into next) Merging samsung/for-next (aeb011501873 Merge branch 'v3.20-samsung-defconfig-2' into for-next) Merging sunxi/sunxi/for-next (50997798fb8a Merge branch 'sunxi/fixes-for-4.0' into sunxi/for-next) Merging tegra/for-next (794345d409ad Merge branch for-3.20/arm64 into for-next) Merging arm64/for-next/core (d476d94f180a arm64: compat: Remove incorrect comment in compat_siginfo) 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 (9987c19ed9a7 CRIS: Whitespace cleanup) Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) Merging ia64/next (a6b8978c54b7 pstore: Fix sprintf format specifier in pstore_dump()) Merging m68k/for-next (4436820a98cd m68k/defconfig: Enable Ethernet bridging) Merging m68knommu/for-next (c517d838eb7d Linux 4.0-rc1) Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) Merging microblaze/next (a01d37d914f9 microblaze: Remove *.dtb files in make clean) Merging mips/mips-for-linux-next (64b139f97c01 MIPS: OCTEON: irq: add CIB and other fixes) Merging nios2/nios2-next (d16d2be111a6 nios2: add kgdb support) Merging parisc-hd/for-next (bfa76d495765 Linux 3.19) Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible) Merging powerpc-mpe/next (a6130ed253a9 cxl: Add missing return statement after handling AFU errror) Merging fsl/next (0dc294f717d4 powerpc/mm: bail out early when flushing TLB page) Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) Merging s390/features (42d19952a90d s390/traps: panic() instead of die() on translation exception) CONFLICT (content): Merge conflict in arch/s390/kernel/early.c Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) Merging tile/master (740e1433f50e tile: change MAINTAINERS website from tilera.com to ezchip.com) Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization) Merging btrfs/next (a742994aa2e2 Btrfs: don't remove extents and xattrs when logging new names) Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) CONFLICT (content): Merge conflict in net/ceph/ceph_common.c CONFLICT (content): Merge conflict in net/ceph/auth_x.c CONFLICT (content): Merge conflict in include/linux/ceph/libceph.h 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 CONFLICT (content): Merge conflict in fs/ceph/inode.c Merging cifs/for-next (5a090583c3fc Update negotiate protocol for SMB3.1 dialect) 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 (6981498d7956 udf: remove bool assignment to 0/1) Merging ext4/dev (6f30b7e37a82 ext4: fix indirect punch hole corruption) Merging f2fs/dev (db3ecdee1cf0 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds) 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/for-next (76514aeef65e GFS2: Allocate reservation during splice_write) Merging jfs/jfs-next (648695c74811 jfs: Deletion of an unnecessary check before the function call "unload_nls") Merging nfs/linux-next (c517d838eb7d Linux 4.0-rc1) Merging nfsd/nfsd-next (a1d1e9be5a1d svcrpc: fix memory leak in gssp_accept_sec_context_upcall) 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 (b388e6a7a6ba UBI: fix missing brace control flow) Merging xfs/for-next (c517d838eb7d Linux 4.0-rc1) Merging file-locks/linux-next (b2b89ebfc0f0 Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux) Merging vfs/for-next (ca160d0085b6 kill struct filename.separate) Merging pci/next (c517d838eb7d Linux 4.0-rc1) Merging hid/for-next (ca2f29b3d39e Merge branch 'for-4.1/upstream' into for-next) CONFLICT (content): Merge conflict in drivers/iio/common/hid-sensors/hid-sensor-trigger.c Merging i2c/i2c/for-next (c517d838eb7d Linux 4.0-rc1) Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6) Merging hwmon-staging/hwmon-next (9248faef66cd hwmon: (ibmpex) Allow format string checking) Merging v4l-dvb/master (48b777c0833b Merge branch 'patchwork' into to_next) Merging kbuild/for-next (8d18d1d514d1 Merge branch 'kbuild/kconfig' into kbuild/for-next) Merging kconfig/for-next (bfa76d495765 Linux 3.19) Merging libata/for-next (d85aa1624b05 Merge branch 'for-3.19-fixes' into for-next) Merging pm/linux-next (c517d838eb7d Linux 4.0-rc1) Merging idle/next (210109f4a19a Merge branches 'turbostat', 'sfi' and 'cpuidle' into release) Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) Merging thermal/next (4531fa1684bb thermal: exynos: fix: Check if data->tmu_read callback is present before read) Merging thermal-soc/next (c517d838eb7d Linux 4.0-rc1) Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) 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 (771bd4f095dd Merge branch 'fixes' into next) Merging net-next/master (5e3d31896b87 Merge branch 'be2net-next') Merging ipsec-next/master (ff660f75be36 Merge branch 'stmmac-pci') Merging wireless-drivers-next/master (d53071143aa5 Merge ath-next from ath.git) Merging bluetooth/master (03f310efd4b1 Bluetooth: Remove unnecessary queue_monitor_skb() function) Merging infiniband/for-next (147d1da951cf Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib' and 'srp' into for-next) Merging mtd/master (eb928d40a93f Merge JFFS2 updates from David Woodhouse) Merging l2-mtd/master (eb928d40a93f Merge JFFS2 updates from David Woodhouse) Merging crypto/master (db71f29a1c32 crypto: testmgr - mark rfc4106(gcm(aes)) as fips_allowed) Merging drm/drm-next (45ee2dbc65cb Merge branch 'drm-next-3.20' of git://people.freedesktop.org/~agd5f/linux into drm-next) Merging drm-panel/drm/panel/for-next (23923ebaac52 drm: Remove unused DRM_MODE_OBJECT_BRIDGE) Merging drm-intel/for-linux-next (e489e38e3f88 drm/i915: gen5+ can have FBC with multiple pipes) Merging drm-tegra/drm/tegra/for-next (07d05cbf60ed drm/tegra: dc: Move more code into ->init()) Merging drm-misc/topic/drm-misc (9590552893e2 drm/atomic-helpers: make mode_set hooks optional) Applying: drm/atomic-helper: fix for Rename commmit_post/pre_planes Merging sound/for-next (72f770c6acde Merge branch 'topic/timestamp' into for-next) Merging sound-asoc/for-next (9c208ed74c76 Merge remote-tracking branches 'asoc/fix/rsnd', 'asoc/fix/rt5670' and 'asoc/fix/samsung' into asoc-linus) Merging modules/modules-next (9cc019b8c94f module: Replace over-engineered nested sleep) Merging virtio/virtio-next (5b40a7daf518 virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.) Merging input/next (290b799c390d Input: psmouse - use IS_ENABLED instead of homegrown code) Merging block/for-next (434c26478166 Merge branch 'for-3.20/core' into for-next) Merging device-mapper/for-next (762143713731 dm: remove unnecessary wrapper around blk_lld_busy) Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) Merging mmc-uh/next (802ea9d8645d Merge tag 'dm-3.20-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm) Merging kgdb/kgdb-next (dd8f30cc0550 kgdb, docs: Fix <para> pdfdocs build errors) Merging md/for-next (26ac107378c4 md/raid5: Fix livelock when array is both resyncing and degraded.) Merging mfd/for-mfd-next (0a65fbf64dad mfd: intel_soc_pmic: Add missing error check for devm_kzalloc) Merging backlight/for-backlight-next (1926469377bb backlight: da9052_bl: Terminate da9052_wled_ids array with empty element) Merging battery/master (9e23e22cd61a power: ltc2941-battery-gauge: Fix typo in conversion formula (58 instead of 85)) Merging omap_dss2/for-next (d6c2152b3efd Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next) Merging regulator/for-next (264d8de777a4 Merge remote-tracking branches 'regulator/fix/da9210' and 'regulator/fix/rk808' into regulator-linus) Merging security/next (04f81f0154e4 cipso: don't use IPCB() to locate the CIPSO IP option) Merging integrity/next (7bea7ff67e0c ima: /proc/keys is now mandatory) Merging selinux/next (387fb779789d selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()) Merging lblnet/next (b2776bf7149b Linux 3.18) Merging watchdog/master (b08c144e3a10 watchdog: bcm47xx_wdt.c: allow enabling on BCM5301X arch) CONFLICT (content): Merge conflict in drivers/watchdog/Makefile Merging iommu/next (a20cc76b9efa Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next) Merging dwmw2-iommu/master (1860e379875d Linux 3.15) Merging vfio/next (6140a8f56238 vfio-pci: Add device request interface) Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) Merging jc_docs/docs-next (52e68924dfa8 Documentation: Fix the wrong command `echo -1 > set_ftrace_pid` for cleaning the filter.) Merging trivial/for-next (edb0ec0725bb kexec, Kconfig: spell "architecture" properly) Merging audit/next (5b28255278dd audit: reduce mmap_sem hold for mm->exe_file) Merging devicetree/devicetree/next (fca8ba4ee24d of/unittest: Remove obsolete code) Merging dt-rh/for-next (3c3c8e3618b0 Merge remote-tracking branch 'grant/devicetree/next' into for-next) Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) Merging spi/for-next (4f16c3cd0b66 Merge remote-tracking branch 'spi/fix/ti-qspi' into spi-linus) Merging tip/auto-latest (3cf6be48c376 Merge branch 'timers/core') Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer) CONFLICT (add/add): Merge conflict in drivers/clocksource/rockchip_timer.c CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/Kconfig Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks) Merging edac-amd/for-next (30263b4052c6 EDAC, mv64x60_edac: Fix an error code in probe()) 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 (c19565fc83e6 Merge branch 'for-next/ftrace/core' into trace/for-next) Merging rcu/rcu/next (b52e22f3021d Merge with c8bcfbf1b744 (rcu: Process offlining and onlining only at grace-period start)) Merging kvm/linux-next (4ff6f8e61eb7 KVM: emulate: fix CMPXCHG8B on 32-bit hosts) Merging kvm-arm/next (4b990589952f KVM: Remove unused config symbol) Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD) Merging kvms390/next (de8e5d744051 KVM: Disable compat ioctl for s390) Merging xen-tip/linux-next (a2e75bc2ee20 xenbus: Add proper handling of XS_ERROR from Xenbus for transactions.) 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 (c57c0fa4bc9c toshiba_acpi: Cleanup GPL header) Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) Merging regmap/for-next (48bbdbb173fa Merge remote-tracking branch 'regmap/fix/irq' into regmap-linus) Merging hsi/for-next (f034125dfdae HSI: nokia-modem: fix error return code) Merging leds/for-next (ffe2428614d2 leds: flash: remove stray include directive) Merging ipmi/for-next (3a31f945b709 ipmi: Remove incorrect use of seq_has_overflowed) Merging driver-core/driver-core-next (c517d838eb7d Linux 4.0-rc1) Merging tty/tty-next (c517d838eb7d Linux 4.0-rc1) Merging usb/usb-next (c517d838eb7d Linux 4.0-rc1) Merging usb-gadget/next (c517d838eb7d Linux 4.0-rc1) Merging usb-serial/usb-next (3e264ffc831e USB: mos7840: remove unused code) Merging staging/staging-next (c517d838eb7d Linux 4.0-rc1) Merging char-misc/char-misc-next (c517d838eb7d Linux 4.0-rc1) Merging cgroup/for-next (8abba61bcfd4 Merge branch 'for-3.19-fixes' into for-next) Merging scsi/for-next (cad8000836ef Merge branch 'misc' into for-next) Merging target-updates/for-next (aa04dae454d0 target: Set LBPWS10 bit in Logical Block Provisioning EVPD) Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) Merging pinctrl/for-next (c517d838eb7d Linux 4.0-rc1) Merging vhost/linux-next (4fe00489e61c vhost: drop hard-coded num_buffers size) 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 (2f97c20e5f7c gpio: tps65912: fix wrong container_of arguments) Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition) Merging pwm/for-next (b65af27ad89d pwm: tegra: Use NSEC_PER_SEC) Merging dma-buf/for-next (817bd7253291 dma-buf: cleanup dma_buf_export() to make it easily extensible) Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable) Merging clk/clk-next (ec02ace8ca0a clk: Only recalculate the rate if needed) Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) 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 kselftest/next (6ddf898c23d6 selftests/exec: Check if the syscall exists and bail if not) Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) Merging luto-misc/next (82bbadb13ef4 x86, entry: Remove int_check_syscall_exit_work) Merging access_once/linux-next (c5b19946eb76 kernel: Fix sparse warning for ACCESS_ONCE) Merging livepatching/for-next (0937e3b025f7 livepatch: simplify disable error path) Merging akpm-current/current (d07b956c650a scripts/gdb: Add infrastructure) CONFLICT (content): Merge conflict in scripts/module-common.lds CONFLICT (add/add): Merge conflict in scripts/Makefile.kasan CONFLICT (content): Merge conflict in mm/vmscan.c CONFLICT (content): Merge conflict in mm/swap.c CONFLICT (content): Merge conflict in mm/slub.c CONFLICT (content): Merge conflict in mm/slab_common.c CONFLICT (modify/delete): mm/filemap_xip.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of mm/filemap_xip.c left in tree. CONFLICT (content): Merge conflict in lib/Makefile CONFLICT (content): Merge conflict in kernel/fork.c CONFLICT (content): Merge conflict in init/Kconfig CONFLICT (content): Merge conflict in include/linux/mm.h CONFLICT (content): Merge conflict in fs/notify/fanotify/fanotify.c CONFLICT (content): Merge conflict in drivers/rtc/Makefile CONFLICT (content): Merge conflict in drivers/block/zram/zram_drv.c CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable.h CONFLICT (content): Merge conflict in arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/kernel/time.c CONFLICT (content): Merge conflict in arch/mips/include/asm/pgtable-bits.h CONFLICT (add/add): Merge conflict in Documentation/kasan.txt $ git rm -f mm/filemap_xip.c Applying: fix bad merge in akpm-current Applying: fix another bad merge in akpm-current $ git checkout -b akpm remotes/origin/akpm/master Applying: ocfs2: use 64bit variables to track heartbeat time Applying: lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text Applying: drivers/w1/w1_int.c: call put_device if device_register fails Applying: mm: add strictlimit knob Merging akpm/master (2e34ea6cab7b mm: add strictlimit knob)
Attachment:
pgp0KuwrySRfD.pgp
Description: OpenPGP digital signature
