Hi all,
Please do not add any material destined for v3.21 to your linux-next
included trees until after v3.20-rc1 has been released.
Changes since 20150212:
The mips tree gained a conflict against Linus' tree.
Non-merge commits (relative to Linus' tree): 4418
4081 files changed, 183203 insertions(+), 92585 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 [email protected]
$ git checkout master
$ git reset --hard stable
Merging origin/master (8494bcf5b7c4 Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block)
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 (8e6480667246 ARM: 8299/1: mm: ensure local active ASID is marked as allocated on rollover)
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 (9672723973f1 bridge: netfilter: Move sysctl-specific error code inside #ifdef)
Merging ipsec/master (ac37e2515c1a xfrm: release dst_orig in case of error in xfrm_lookup())
Merging sound-current/for-linus (0b444af8daf9 ALSA: seq: potential out of bounds in do_control())
Merging pci-current/for-linus (feb28979c137 of/pci: Remove duplicate kfree in of_pci_get_host_bridge_resources())
Merging wireless-drivers/master (aeb2d2a4c0ae rtlwifi: Remove logging statement that is no longer needed)
Merging driver-core.current/driver-core-linus (26bc420b59a3 Linux 3.19-rc6)
Merging tty.current/tty-linus (ec6f34e5b552 Linux 3.19-rc5)
Merging usb.current/usb-linus (e36f014edff7 Linux 3.19-rc7)
Merging usb-gadget-fixes/fixes (0df8fc37f6e4 usb: phy: never defer probe in non-OF case)
Merging usb-serial-fixes/usb-linus (a6f0331236fa USB: cp210x: add ID for RUGGEDCOM USB Serial Console)
Merging staging.current/staging-linus (e36f014edff7 Linux 3.19-rc7)
Merging char-misc.current/char-misc-linus (e36f014edff7 Linux 3.19-rc7)
Merging input-current/for-linus (4ba24fef3eb3 Merge branch 'next' into for-linus)
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 devicetree-current/devicetree/merge (6b1271de3723 of/unittest: Overlays with sub-devices tests)
Merging rr-fixes/fixes (dc4515ea26d6 scsi: always increment reference count)
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 (bfa76d495765 Linux 3.19)
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 (091f56be10ef ARC: Fix earlycon build breakage)
Merging arm/for-next (df9ab9771c64 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1)
Merging arm-soc/for-next (b02637dba07b arm-soc: document merges)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih410.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/stih407-family.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3288.dtsi
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
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 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 (feeddcd9c17b Merge branch 'mvebu/dt' into mvebu/for-next)
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 (16e8c17e18d6 Merge branch 'sunxi/clocks-for-3.20' into sunxi/for-next)
CONFLICT (content): Merge conflict in drivers/mmc/host/sunxi-mmc.c
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 (5b88ad97214a CRIS: Whitespace cleanup)
CONFLICT (content): Merge conflict in arch/cris/include/asm/uaccess.h
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 (21b30ca5da14 arch: m68k: 68360: config: Remove unused function)
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 (a6719600310f Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux into mips-for-linux-next)
CONFLICT (content): Merge conflict in arch/mips/pci/pcie-octeon.c
CONFLICT (content): Merge conflict in arch/mips/pci/pci-octeon.c
CONFLICT (content): Merge conflict in arch/mips/pci/pci-bcm1480.c
CONFLICT (content): Merge conflict in arch/mips/kernel/elf.c
Merging nios2/nios2-next (a3248d609bd4 nios2: fix unhandled signals)
Merging parisc-hd/for-next (b2776bf7149b Linux 3.18)
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 (f4dce5c9364f s390/cacheinfo: coding style changes)
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 unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization)
Merging btrfs/next (eb710b152003 Btrfs: Remove unnecessary placeholder in btrfs_err_code)
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 (0a545e3a7494 [SMB3] 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 (d7e9b1b7b9ab ext4: change to use setup_timer() instead of init_timer())
Merging f2fs/dev (1a118ccfd60f f2fs: use spinlock for segmap_lock instead of rwlock)
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 (278702074ff7 GFS2: Fix crash during ACL deletion in acl max entry check in gfs2_set_acl())
Merging jfs/jfs-next (648695c74811 jfs: Deletion of an unnecessary check before the function call "unload_nls")
Merging nfs/linux-next (54d7e72a7586 SUNRPC: Fix a compile error when #undef CONFIG_PROC_FS)
Merging nfsd/nfsd-next (0ab39de6b341 nfsd: fix comparison in fh_fsid_match())
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 (8168b9bba6a8 UBI: block: Fix checking for NULL instead of IS_ERR())
Merging xfs/for-next (bad962662dbc Merge branch 'xfs-misc-fixes-for-3.20-4' into for-next)
Merging file-locks/linux-next (8116bf4cb62d locks: update comments that refer to inode->i_flock)
Merging vfs/for-next (c55c3f626bf1 Merge branch 'lazytime' into for-next)
CONFLICT (content): Merge conflict in fs/configfs/configfs_internal.h
Merging pci/next (cb8e92d8e4d9 Merge branch 'pci/misc' into next)
Merging hid/for-next (dc5439f4c356 Merge branch 'for-3.20/wacom' into for-next)
Merging i2c/i2c/for-next (19aadd29d23c Merge branch 'i2c/for-3.20' into i2c/for-next)
Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6)
Merging hwmon-staging/hwmon-next (dd378b1bcaa0 hwmon: (tmp102) add hibernation callbacks)
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 (389a8d43d647 Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools')
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 (31908f45a583 Thermal/int340x_thermal: remove unused uuids.)
Merging thermal-soc/next (6c247393cfdd thermal: exynos: Add TMU support for Exynos7 SoC)
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 (8addce135904 Merge branch 'for-linus' into next)
Merging net-next/master (855e7e7174ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux)
Merging ipsec-next/master (ff660f75be36 Merge branch 'stmmac-pci')
Merging wireless-drivers-next/master (d53071143aa5 Merge ath-next from ath.git)
Merging bluetooth/master (0bafabbc782f Bluetooth: Enhance error codes pair device command)
Merging infiniband/for-next (43c6116573ca Revert "IB/core: Add support for extended query device caps")
Merging mtd/master (97bf6af1f928 Linux 3.19-rc1)
Merging l2-mtd/master (72f55d74bd12 mtd: hisilicon: add device tree binding documentation)
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
Merging crypto/master (db71f29a1c32 crypto: testmgr - mark rfc4106(gcm(aes)) as fips_allowed)
Merging drm/drm-next (96abd10ecc2e 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 (46efa4abe571 drm/i915: Clamp efficient frequency to valid range)
Merging drm-tegra/drm/tegra/for-next (31f40f86526b drm/tegra: Use correct relocation target offsets)
Merging drm-misc/topic/core-stuff (eb2ed66fe56f drm/irq: Don't disable vblank interrupts when already disabled)
Merging sound/for-next (0b444af8daf9 ALSA: seq: potential out of bounds in do_control())
Merging sound-asoc/for-next (0537b9a230df Merge remote-tracking branches 'asoc/fix/intel', 'asoc/fix/rsnd', 'asoc/fix/rt286' and 'asoc/fix/sta32x' into asoc-linus)
Merging modules/modules-next (9cc019b8c94f module: Replace over-engineered nested sleep)
Merging virtio/virtio-next (d9bab50aa46c lguest: remove NOTIFY call and eventfd facility.)
Merging input/next (de3748f66f21 Input: adi - remove an unnecessary check)
Merging block/for-next (434c26478166 Merge branch 'for-3.20/core' into for-next)
Merging device-mapper/for-next (a4afe76b2b92 dm: inherit QUEUE_FLAG_SG_GAPS flags from underlying queues)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (017210d1c0dc mmc: sdhci-s3c: solve problem with sleeping in atomic context)
Merging kgdb/kgdb-next (c7d9ebf81c45 kdb: Fix off by one error in kdb_cpu())
Merging md/for-next (dfe15ac1c6ad md: wakeup thread upon rdev_dec_pending())
Merging mfd/for-mfd-next (bb400d2120bd mfd: rtsx_usb: Defer autosuspend while card exists)
Merging backlight/for-backlight-next (3d6969a641d0 MAINTAINERS: Remove my name from Backlight subsystem)
Merging battery/master (24727b45b484 power_supply: 88pm860x: Fix leaked power supply on probe fail)
Merging omap_dss2/for-next (d6c2152b3efd Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next)
Merging regulator/for-next (5a4eff8e1d1d Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/rpm', 'regulator/topic/rt5033' and 'regulator/topic/tps65023' into regulator-next)
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 (6eb4e2b41b26 SELinux: fix error code in policydb_init())
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (b08c144e3a10 watchdog: bcm47xx_wdt.c: allow enabling on BCM5301X arch)
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 (2fded7f44b8f audit: remove vestiges of vers_ops)
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 (83a068bb05fc Merge remote-tracking branch 'spi/topic/xilinx' into spi-next)
Merging tip/auto-latest (be00467d2161 Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (4c8305221193 clocksource: Driver for Conexant Digicolor SoC timer)
CONFLICT (content): Merge conflict in drivers/clocksource/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 (c0135d07b013 rcu: Clear need_qs flag to prevent splat)
Merging kvm/linux-next (6557bada461a KVM: ia64: drop kvm.h from installed user headers)
CONFLICT (content): Merge conflict in arch/arm64/kvm/sys_regs.c
CONFLICT (content): Merge conflict in arch/arm64/kvm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/kvm/mmu.c
CONFLICT (content): Merge conflict in arch/arm/kvm/Kconfig
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 (b7928606d545 Merge remote-tracking branches 'regmap/topic/ac97', 'regmap/topic/doc' and 'regmap/topic/smbus' into regmap-next)
Merging hsi/for-next (67e9a2ce6e07 hsi: nokia-modem: fix uninitialized device pointer)
Merging leds/for-next (c6e71f813f72 leds: leds-gpio: Pass on error codes unmodified)
Merging ipmi/for-next (43475c9dc47a ipmi: Use is_visible callback for conditional sysfs entries)
Merging driver-core/driver-core-next (adf305f77878 sysfs: fix warning when creating a sysfs group without attributes)
Merging tty/tty-next (c09babfab7ae serial: 8250: Fix UART_BUG_TXEN workaround)
Merging usb/usb-next (4d4bac4499e9 Merge tag 'usb-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next)
Merging usb-gadget/next (9298b4aad37e usb: musb: fix device hotplug behind hub)
Merging usb-serial/usb-next (3e264ffc831e USB: mos7840: remove unused code)
Merging staging/staging-next (533e80b1ea70 staging: lustre: lustre: libcfs: define symbols as static)
Merging char-misc/char-misc-next (5fb31cd839c2 coresight: fix function etm_writel_cp14() parameter order)
CONFLICT (content): Merge conflict in drivers/char/virtio_console.c
CONFLICT (content): Merge conflict in drivers/char/mem.c
Merging cgroup/for-next (8abba61bcfd4 Merge branch 'for-3.19-fixes' into for-next)
Merging scsi/for-next (4fa3d28c8b88 Merge branch 'misc-next' into for-next)
Merging target-updates/for-next (72859d91d933 iscsi-target: Avoid IN_LOGOUT failure case for iser-target)
CONFLICT (content): Merge conflict in drivers/vhost/scsi.c
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging pinctrl/for-next (f724e05baaf0 sh-pfc: emev2 - Fix mangled author name)
Merging vhost/linux-next (ac26e40d1c8a vhost/net: fix up num_buffers endian-ness)
CONFLICT (content): Merge conflict in drivers/vhost/net.c
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 (0a4a3529df40 gpio: kconfig: replace PPC_OF with PPC)
Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition)
Merging pwm/for-next (8d6cc0738540 pwm: Remove unnecessary check before of_node_put())
Merging dma-buf/for-next (4eb2440ed60f reservation: Remove shadowing local variable 'ret')
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 (73e0e496afda clkdev: Always allocate a struct clk and call __clk_get() w/ CCF)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/io.c
CONFLICT (modify/delete): arch/arm/mach-omap2/cclock3xxx_data.c deleted in clk/clk-next and modified in HEAD. Version HEAD of arch/arm/mach-omap2/cclock3xxx_data.c left in tree.
$ git rm -f arch/arm/mach-omap2/cclock3xxx_data.c
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 (188c901941ef Merge branch 'leds-fixes-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds)
Merging access_once/linux-next (c5b19946eb76 kernel: Fix sparse warning for ACCESS_ONCE)
Merging livepatching/for-next (f638f4dc0880 livepatch: add missing newline to error message)
Merging akpm-current/current (d07b956c650a scripts/gdb: Add infrastructure)
CONFLICT (content): Merge conflict in scripts/module-common.lds
CONFLICT (content): Merge conflict in mm/swap.c
CONFLICT (content): Merge conflict in mm/slab_common.c
CONFLICT (content): Merge conflict in mm/slab.h
CONFLICT (content): Merge conflict in mm/mprotect.c
CONFLICT (content): Merge conflict in mm/memcontrol.c
CONFLICT (content): Merge conflict in lib/Makefile
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (content): Merge conflict in include/linux/swapops.h
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in include/linux/mm.h
CONFLICT (content): Merge conflict in include/linux/memcontrol.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable_64.h
$ git checkout -b akpm remotes/origin/akpm/master
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: 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
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: MAINTAINERS: fix spelling mistake & remove trailing WS
Applying: ocfs2: prepare some interfaces used in append direct io
Applying: ocfs2: add functions to add and remove inode in orphan dir
Applying: ocfs2-add-functions-to-add-and-remove-inode-in-orphan-dir-fix
Applying: ocfs2: add orphan recovery types in ocfs2_recover_orphans
Applying: ocfs2: implement ocfs2_direct_IO_write
Applying: ocfs2-implement-ocfs2_direct_io_write-fix
Applying: ocfs2: allocate blocks in ocfs2_direct_IO_get_blocks
Applying: ocfs2: do not fallback to buffer I/O write if appending
Applying: ocfs2: complete the rest request through buffer io
Applying: ocfs2: wait for orphan recovery first once append O_DIRECT write crash
Applying: ocfs2: set append dio as a ro compat feature
Applying: ocfs2: use 64bit variables to track heartbeat time
Applying: powerpc: drop _PAGE_FILE and pte_file()-related helpers
Applying: lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
Applying: lib/Kconfig: use bool instead of boolean
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
Merging akpm/master (a3ea935f5fca mm: add strictlimit knob)
2015-02-13, 16:56:15 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Please do not add any material destined for v3.21 to your linux-next
> included trees until after v3.20-rc1 has been released.
>
> Changes since 20150212:
Hi Stephen,
Your conflict resolution in
8fe7fba50596 "Merge branch 'akpm-current/current'"
for mm/memory.c looks a bit off. I get flooded with these messages:
BUG: non-zero nr_pmds on freeing mm: 4
and fixed it with:
diff --git a/mm/memory.c b/mm/memory.c
index 450e4952c5ef..802adda2b0b6 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3350,7 +3350,6 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
smp_wmb(); /* See comment in __pte_alloc */
spin_lock(&mm->page_table_lock);
- mm_inc_nr_pmds(mm);
#ifndef __ARCH_HAS_4LEVEL_HACK
if (!pud_present(*pud)) {
mm_inc_nr_pmds(mm);
references:
http://www.spinics.net/lists/linux-mm/msg84294.html
dc6c9a35b66b "mm: account pmd page tables to the process"
[CC'ed Kirill A. Shutemov]
Thanks
--
Sabrina
On 02/12/15 21:56, Stephen Rothwell wrote:
> Hi all,
>
> Please do not add any material destined for v3.21 to your linux-next
> included trees until after v3.20-rc1 has been released.
>
> Changes since 20150212:
on x86_64, when
# CONFIG_NFS_FS is not set
CONFIG_NFSD=y
# CONFIG_NFSD_V3 is not set
# CONFIG_NFSD_V4 is not set
In file included from ../include/linux/linkage.h:4:0,
from ../include/linux/preempt.h:9,
from ../include/linux/spinlock.h:50,
from ../include/linux/mmzone.h:7,
from ../include/linux/gfp.h:5,
from ../include/linux/slab.h:14,
from ../fs/nfsd/nfsctl.c:7:
../fs/nfsd/xdr4.h: In function 'set_change_info':
../fs/nfsd/xdr4.h:633:13: error: 'struct svc_fh' has no member named 'fh_pre_saved'
BUG_ON(!fhp->fh_pre_saved);
^
../include/linux/compiler.h:164:42: note: in definition of macro 'unlikely'
# define unlikely(x) __builtin_expect(!!(x), 0)
^
../fs/nfsd/xdr4.h:633:2: note: in expansion of macro 'BUG_ON'
BUG_ON(!fhp->fh_pre_saved);
^
In file included from ../fs/nfsd/pnfs.h:8:0,
from ../fs/nfsd/nfsctl.c:24:
../fs/nfsd/xdr4.h:634:21: error: 'struct svc_fh' has no member named 'fh_post_saved'
cinfo->atomic = fhp->fh_post_saved;
^
../fs/nfsd/xdr4.h:637:28: error: 'struct svc_fh' has no member named 'fh_pre_change'
cinfo->before_change = fhp->fh_pre_change;
^
../fs/nfsd/xdr4.h:638:27: error: 'struct svc_fh' has no member named 'fh_post_change'
cinfo->after_change = fhp->fh_post_change;
^
../fs/nfsd/xdr4.h:639:31: error: 'struct svc_fh' has no member named 'fh_pre_ctime'
cinfo->before_ctime_sec = fhp->fh_pre_ctime.tv_sec;
^
../fs/nfsd/xdr4.h:640:32: error: 'struct svc_fh' has no member named 'fh_pre_ctime'
cinfo->before_ctime_nsec = fhp->fh_pre_ctime.tv_nsec;
^
../fs/nfsd/xdr4.h:641:30: error: 'struct svc_fh' has no member named 'fh_post_attr'
cinfo->after_ctime_sec = fhp->fh_post_attr.ctime.tv_sec;
^
../fs/nfsd/xdr4.h:642:31: error: 'struct svc_fh' has no member named 'fh_post_attr'
cinfo->after_ctime_nsec = fhp->fh_post_attr.ctime.tv_nsec;
^
--
~Randy
On Fri, Feb 13, 2015 at 04:56:15PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Please do not add any material destined for v3.21 to your linux-next
> included trees until after v3.20-rc1 has been released.
>
> Changes since 20150212:
>
> The mips tree gained a conflict against Linus' tree.
>
> Non-merge commits (relative to Linus' tree): 4418
> 4081 files changed, 183203 insertions(+), 92585 deletions(-)
>
> ----------------------------------------------------------------------------
>
I see a number of runtime failures with this version.
It affects alpha, mips64, ppc64, and x86_64.
Symptom is always the same. There are lots of
BUG: non-zero nr_pmds on freeing mm: X (where X is 1..4)
messages in the log, and the affected VMs don't reboot.
I don't see the problem in curent mainline, nor in mmotm.
Bisect points to "Merge branch 'akpm-current/current'",
which isn't really helpful.
Not sure if this is a bad merge resolution, so just take this
as a heads-up for now.
Guenter
Hi Guenter,
On Fri, 13 Feb 2015 10:54:28 -0800 Guenter Roeck <[email protected]> wrote:
>
> I see a number of runtime failures with this version.
> It affects alpha, mips64, ppc64, and x86_64.
> Symptom is always the same. There are lots of
>
> BUG: non-zero nr_pmds on freeing mm: X (where X is 1..4)
>
> messages in the log, and the affected VMs don't reboot.
>
> I don't see the problem in curent mainline, nor in mmotm.
> Bisect points to "Merge branch 'akpm-current/current'",
> which isn't really helpful.
>
> Not sure if this is a bad merge resolution, so just take this
> as a heads-up for now.
Yours is the second report overnight (see attached). Almost certainly
a bad merge resolution on my part (its a bit hard when Andrew get part
of his patch set merged by Linus :-()
I will fix up the merge on Monday (unless Andrew gets more stuff merged
or updates mmotm for me).
Sorry about that.
--
Cheers,
Stephen Rothwell [email protected]
On 02/12/15 21:56, Stephen Rothwell wrote:
> Hi all,
>
> Please do not add any material destined for v3.21 to your linux-next
> included trees until after v3.20-rc1 has been released.
>
> Changes since 20150212:
on i386: when CONFIG_I2C is not enabled:
../drivers/iio/magnetometer/ak8975.c: In function 'ak8975_who_i_am':
../drivers/iio/magnetometer/ak8975.c:393:2: error: implicit declaration of function 'i2c_smbus_read_i2c_block_data' [-Werror=implicit-function-declaration]
ret = i2c_smbus_read_i2c_block_data(client, AK09912_REG_WIA1,
^
../drivers/iio/magnetometer/ak8975.c: In function 'ak8975_set_mode':
../drivers/iio/magnetometer/ak8975.c:431:2: error: implicit declaration of function 'i2c_smbus_write_byte_data' [-Werror=implicit-function-declaration]
ret = i2c_smbus_write_byte_data(data->client,
^
../drivers/iio/magnetometer/ak8975.c: In function 'wait_conversion_complete_gpio':
../drivers/iio/magnetometer/ak8975.c:555:2: error: implicit declaration of function 'i2c_smbus_read_byte_data' [-Werror=implicit-function-declaration]
ret = i2c_smbus_read_byte_data(client, data->def->ctrl_regs[ST1]);
^
../drivers/iio/magnetometer/ak8975.c: In function 'ak8975_read_axis':
../drivers/iio/magnetometer/ak8975.c:650:2: error: implicit declaration of function 'i2c_smbus_read_word_data' [-Werror=implicit-function-declaration]
ret = i2c_smbus_read_word_data(client, data->def->data_regs[index]);
^
../drivers/iio/magnetometer/ak8975.c: At top level:
../drivers/iio/magnetometer/ak8975.c:846:1: warning: data definition has no type or storage class [enabled by default]
module_i2c_driver(ak8975_driver);
^
../drivers/iio/magnetometer/ak8975.c:846:1: error: type defaults to 'int' in declaration of 'module_i2c_driver' [-Werror=implicit-int]
../drivers/iio/magnetometer/ak8975.c:846:1: warning: parameter names (without types) in function declaration [enabled by default]
../drivers/iio/magnetometer/ak8975.c:837:26: warning: 'ak8975_driver' defined but not used [-Wunused-variable]
static struct i2c_driver ak8975_driver = {
^
cc1: some warnings being treated as errors
make[4]: *** [drivers/iio/magnetometer/ak8975.o] Error 1
--
~Randy
On 02/13/15 16:32, Randy Dunlap wrote:
> On 02/12/15 21:56, Stephen Rothwell wrote:
>> Hi all,
>>
>> Please do not add any material destined for v3.21 to your linux-next
>> included trees until after v3.20-rc1 has been released.
>>
>> Changes since 20150212:
>
> on i386: when CONFIG_I2C is not enabled:
Caused by AK09911 selecting AK8975 but AK09911 does not depend on I2C.
> ../drivers/iio/magnetometer/ak8975.c: In function 'ak8975_who_i_am':
> ../drivers/iio/magnetometer/ak8975.c:393:2: error: implicit declaration of function 'i2c_smbus_read_i2c_block_data' [-Werror=implicit-function-declaration]
> ret = i2c_smbus_read_i2c_block_data(client, AK09912_REG_WIA1,
> ^
> ../drivers/iio/magnetometer/ak8975.c: In function 'ak8975_set_mode':
> ../drivers/iio/magnetometer/ak8975.c:431:2: error: implicit declaration of function 'i2c_smbus_write_byte_data' [-Werror=implicit-function-declaration]
> ret = i2c_smbus_write_byte_data(data->client,
> ^
> ../drivers/iio/magnetometer/ak8975.c: In function 'wait_conversion_complete_gpio':
> ../drivers/iio/magnetometer/ak8975.c:555:2: error: implicit declaration of function 'i2c_smbus_read_byte_data' [-Werror=implicit-function-declaration]
> ret = i2c_smbus_read_byte_data(client, data->def->ctrl_regs[ST1]);
> ^
> ../drivers/iio/magnetometer/ak8975.c: In function 'ak8975_read_axis':
> ../drivers/iio/magnetometer/ak8975.c:650:2: error: implicit declaration of function 'i2c_smbus_read_word_data' [-Werror=implicit-function-declaration]
> ret = i2c_smbus_read_word_data(client, data->def->data_regs[index]);
> ^
> ../drivers/iio/magnetometer/ak8975.c: At top level:
> ../drivers/iio/magnetometer/ak8975.c:846:1: warning: data definition has no type or storage class [enabled by default]
> module_i2c_driver(ak8975_driver);
> ^
> ../drivers/iio/magnetometer/ak8975.c:846:1: error: type defaults to 'int' in declaration of 'module_i2c_driver' [-Werror=implicit-int]
> ../drivers/iio/magnetometer/ak8975.c:846:1: warning: parameter names (without types) in function declaration [enabled by default]
> ../drivers/iio/magnetometer/ak8975.c:837:26: warning: 'ak8975_driver' defined but not used [-Wunused-variable]
> static struct i2c_driver ak8975_driver = {
> ^
> cc1: some warnings being treated as errors
> make[4]: *** [drivers/iio/magnetometer/ak8975.o] Error 1
>
>
--
~Randy
Hi Stephen,
On 02/13/2015 03:37 PM, Stephen Rothwell wrote:
> Hi Guenter,
>
> On Fri, 13 Feb 2015 10:54:28 -0800 Guenter Roeck <[email protected]> wrote:
>>
>> I see a number of runtime failures with this version.
>> It affects alpha, mips64, ppc64, and x86_64.
>> Symptom is always the same. There are lots of
>>
>> BUG: non-zero nr_pmds on freeing mm: X (where X is 1..4)
>>
>> messages in the log, and the affected VMs don't reboot.
>>
>> I don't see the problem in curent mainline, nor in mmotm.
>> Bisect points to "Merge branch 'akpm-current/current'",
>> which isn't really helpful.
>>
>> Not sure if this is a bad merge resolution, so just take this
>> as a heads-up for now.
>
> Yours is the second report overnight (see attached). Almost certainly
> a bad merge resolution on my part (its a bit hard when Andrew get part
> of his patch set merged by Linus :-()
>
And now Fengguang's tests caught it as well.
> I will fix up the merge on Monday (unless Andrew gets more stuff merged
> or updates mmotm for me).
>
> Sorry about that.
>
No worries. Good news is that test coverage is getting better.
Guenter