* linux-next: Tree for Feb 1
From: Stephen Rothwell @ 2017-02-01 7:28 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170131:
Dropped tree: vfs-miklos (build failure and out of date)
The vfs-miklos tree still had its build failure, so I just dropped it
again for today.
The v4l-dvb tree still had its build failure so I used the version from
next-20170130.
The net-next tree gained a conflict against the char-misc.current tree.
The regulator tree gained a build failure so I used the version from
next-20170131.
The tip tree gained a conflict against the drm tree.
The char-misc tree gained a conflict against the driver-core tree.
Non-merge commits (relative to Linus' tree): 6458
7134 files changed, 269283 insertions(+), 136334 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 (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 254 trees (counting Linus' and 36 trees of bug
fix patches pending for the current merge release).
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
$ git checkout master
$ git reset --hard stable
Merging origin/master (f1774f46d49f Merge branch 'for-4.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (566cf877a1fc Linux 4.10-rc6)
Merging arm-current/fixes (228dbbfb5d77 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (a0615a16f7d0 powerpc/mm: Use the correct pointer when setting a 2MB pte)
Merging sparc/master (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (90427ef5d2a4 ipv6: fix flow labels when the traffic class is non-0)
Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
Merging netfilter/master (a47b70ea86bd ravb: unmap descriptors when freeing rings)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware)
Merging mac80211/master (115865fa0826 mac80211: don't try to sleep in rate_control_rate_init())
Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (672980c62c68 PCI/ASPM: Handle PCI-to-PCIe bridges as roots of PCIe hierarchies)
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (a3683e0c1410 Merge tag 'usb-serial-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (b17c1bba9cec staging: greybus: timesync: validate platform state callback)
Merging char-misc.current/char-misc-linus (433e19cf33d3 Drivers: hv: vmbus: finally fix hv_need_to_signal_on_read())
Merging input-current/for-linus (05e0be7c9007 Input: synaptics-rmi4 - fix reversed conditions in enable/disable_irq_wake)
Merging crypto-current/master (11e3b725cfc2 crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (bd00fdf198e2 vfio/spapr: fail tce_iommu_attach_group() when iommu_data is null)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging drm-intel-fixes/for-linux-next-fixes (566cf877a1fc Linux 4.10-rc6)
Merging drm-misc-fixes/for-linux-next-fixes (92c715fca907 drm/atomic: Fix double free in drm_atomic_state_default_clear)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
Merging arm/for-next (1ba318e23204 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (f6fbb582473b ARM: SoC: Document merges)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (dca8057e0936 Merge v4.11/dt64)
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (e514f82c67c1 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (f8e8eda32b4a Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (36dbd2631399 Merge branch 'omap-for-v4.11/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (9c96e7f72029 firmware: qcom: scm: Fix interrupted SCM calls)
Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (3ec3ba7ff83a Merge branch 'next/dt64' into for-next)
Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (49f6cba617fe arm64: handle sys and undef traps consistently)
Merging clk/clk-next (eaff16bc4988 clk: qcom: SDHCI enablement on Nexus 5X / 6P)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (bc53b7e567ab m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (bf0505dfeac3 MIPS: Fix special case in 64 bit IP checksumming.)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (5de769bbfdfc arch/openrisc/lib/memcpy.c: use correct OR1200 option)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (0d0a4bc2a6f7 powerpc/mm: unstub radix__vmemmap_remove_mapping())
Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (ba21d0ea2189 s390/dasd: correct inconsistent indenting)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (30b507051dd1 xtensa: update DMA-related Documentation/features entries)
Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (514f7d5f893f Merge branch 'for-next-next-v4.11-20170126' into for-next-20170126)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (81ddd8c0c5e1 cifs: initialize file_info_lock)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (70f16cef06b5 udf: allow implicit blocksize specification during mount)
Merging ext4/dev (2b3864b32403 ext4: do not polute the extents cache while shifting extents)
Merging f2fs/dev (9b0d4b59b911 f2fs: declare missing static function)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
Merging gfs2/for-next (aacee72061a3 GFS2: Reduce contention on gfs2_log_lock)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (566cf877a1fc Linux 4.10-rc6)
Merging nfsd/nfsd-next (42e24662a806 nfsd: special case truncates some more)
Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code)
Merging overlayfs/overlayfs-next (97e147358bea vfs: wrap write f_ops with file_{start,end}_write())
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (e0d76fa4475e xfs: prevent quotacheck from overloading inode lru)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (b12826c5188e Merge branch 'vfs-ovl' into next)
CONFLICT (content): Merge conflict in fs/read_write.c
CONFLICT (content): Merge conflict in fs/overlayfs/dir.c
CONFLICT (content): Merge conflict in fs/overlayfs/copy_up.c
$ git reset --hard HEAD^
Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
Merging pci/next (83a96ebd0efa Merge branch 'pci/host-thunder' into next)
Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
Merging hid/for-next (5fae1fbb3793 Merge branch 'for-4.10/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f4d9f6fbbf57 Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (248c3398aae1 hwmon: Relax name attribute validation for new APIs)
Merging jc_docs/docs-next (2069889ff78c docs/zh_CN: Add coding-style into docs build system)
Merging v4l-dvb/master (61e0654cf079 Merge branch 'patchwork' into to_next)
$ git reset --hard HEAD^
Merging next-20170130 version of v4l-dvb
Merging fbdev/fbdev-for-next (561eb9d09a93 fbdev: omap/lcd: Make callbacks optional)
Merging pm/linux-next (0ea7febc7c4f Merge branch 'acpi-ec' into linux-next)
CONFLICT (content): Merge conflict in arch/mips/configs/lemote2f_defconfig
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (7b09ae6042cd Merge branches 'ida-conversion' and 'for-rc' into next)
Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (f1225ee4c8fc swiotlb-xen: update dev_addr after swapping pages)
Merging net-next/master (624374a56419 Merge branch 'bgmac-phy-init')
CONFLICT (content): Merge conflict in drivers/net/hyperv/netvsc.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/macb.h
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (1995876a06bc xfrm: Add a dummy network device for napi.)
Merging netfilter-next/master (1a28ad74ebd8 netfilter: nf_tables: eliminate useless condition checks)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (7243a1af37a4 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (264e6777f958 Merge branch 'netvsc-enhancements')
Merging mac80211-next/master (228c8c6b1f43 wireless: define cipher/AKM suites using a macro)
Merging rdma/for-next (24dc831b77ec IB/core: Add inline function to validate port)
Merging rdma-leon/rdma-next (b4dfe5135f87 Merge branch 'topic/cma-tos' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging nand/nand/next (07f76443ef81 mtd: nand: mediatek: remove redundant dev_err call in mtk_nfc_probe())
Merging spi-nor/next (8bb6059f038c Documentation: mtk-quadspi: update DT bindings)
Merging crypto/master (7dede913fc2a crypto: vmx - disable preemption to enable vsx in aes_ctr.c)
Merging drm/drm-next (18566acac18f Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
CONFLICT (content): Merge conflict in include/drm/drm_connector.h
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c
Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays)
Merging drm-intel/for-linux-next (8adabb8928bc drm/i915: Pevent copying uninitialised garbage into vma->ggtt_view)
Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
Merging drm-misc/for-linux-next (059c7a5a748d Documentation/gpu: drm-mm.rst: fix formatting for struct vm_operations_struct)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
Merging sunxi/sunxi/for-next (e24f5ead1d61 Merge branch 'sunxi/dt64-for-4.11' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
Merging kspp/for-next/kspp (cbef16017c7d initify: Mark functions with the __unverified_nocapture attribute)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (fc28ab1882b5 sound: oss/ad1848: remove some dead code)
Merging sound-asoc/for-next (67f8cef57752 Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (7598d167df99 livepatch/module: print notice of TAINT_LIVEPATCH)
Merging input/next (73d8ef76006b Input: mousedev - stop offering PS/2 to userspace by default)
Merging block/for-next (c2e60b3a2602 Merge branch 'for-4.11/rq-refactor' into for-next)
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (3e05469d6088 mmc: block: restore NULL check when retrying)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (1b4c4139722b Documentation: move MD related doc into a separate dir)
Merging mfd/for-mfd-next (3d66c8abc13e mfd: cpcap: Add minimal support)
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (105ca48d8c7e Merge remote-tracking branches 'regulator/topic/rc5t583', 'regulator/topic/rn5t618', 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
$ git reset --hard HEAD^
Merging next-20170131 version of regulator
Merging security/next (710584b9daef Merge branch 'smack-for-4.11' of git://github.com/cschaufler/smack-next into next)
Merging integrity/next (07a77aadc4e8 ima: fix ima_d_path() possible race with rename)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging tpmdd/next (51ad73eff4fe tpm: add securityfs support for TPM 2.0 firmware event log)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (66452a2d5f8f Merge branches 'iommu/fixes', 'arm/exynos', 'arm/smmu', 'arm/core', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (62bc306e2083 audit: log 32-bit socketcalls)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (a51741ebe131 Documentation: usb: fix wrong documentation paths)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (3f87493930a0 Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (5bf728f02218 Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (1bd9900b8301 EDAC, amd64: Add x86cpuid sanity check during init)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (b9b0c831bed2 ftrace: Convert graph filter to use hash tables)
Merging rcu/rcu/next (19e4d983cda1 rcu: Place guard on rcu_all_qs() and rcu_note_context_switch() actions)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Applying: smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging kvm/linux-next (0b4c208d443b Revert "KVM: nested VMX: disable perf cpuid reporting")
Merging kvm-arm/next (9d93dc1c96ec arm/arm64: KVM: Get rid of KVM_MEMSLOT_INCOHERENT)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (050f23390f6b KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV)
Merging kvms390/next (a8c39dd77cb9 KVM: s390: Add debug logging to basic cpu model interface)
Merging xen-tip/linux-next (cc272163ea55 x86/xen: Fix APIC id mismatch warning on Intel)
Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (9eeda3897a85 platform/x86: add support for devices with Silead touchscreens)
CONFLICT (content): Merge conflict in drivers/platform/x86/intel_mid_powerbtn.c
CONFLICT (content): Merge conflict in drivers/platform/x86/fujitsu-laptop.c
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (8bb1de680dac tools/leds: Add led_hw_brightness_mon program)
Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
Merging driver-core/driver-core-next (64e90a8acb85 Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper())
Merging tty/tty-next (bc2be239feef serial: imx: Fix the CTS_B polarity in RS485 mode)
Merging usb/usb-next (4f8c483ab4e9 Merge tag 'phy-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (c528fcb116e6 USB: serial: keyspan_pda: fix receive sanity checks)
Merging usb-chipidea-next/ci-for-usb-next (30a9566a4f60 usb: chipidea: usb2: delete the redundant setting default DMA mask code)
Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
Merging staging/staging-next (203804300820 staging: vc04_services: Make vchi_msg_queue static)
CONFLICT (modify/delete): drivers/staging/greybus/timesync_platform.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/greybus/timesync_platform.c left in tree.
$ git rm -f drivers/staging/greybus/timesync_platform.c
Merging char-misc/char-misc-next (cadf8106661c doc: convert UIO howto from docbook to sphinx)
CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
Merging extcon/extcon-next (8ea227886002 extcon: arizona: Wait for any running HPDETs to complete on jack removal)
Merging slave-dma/next (69a875aef693 Merge branch 'for-linus' into next)
Merging cgroup/for-next (769a3d317959 Merge branch 'for-4.11' into for-next)
Merging scsi/for-next (2340d775b189 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (86e6828a8aed scsi: scsi_debug: Add OPTIMAL TRANSFER LENGTH GRANULARITY option.)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (300af14bdb28 qla2xxx: Disable out-of-order processing by default in firmware)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (ec4537a7d64f pci: drop link_reset)
Merging rpmsg/for-next (0f67041118b7 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (f334eae9c4e9 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/staging/greybus/gpio.c
Merging pinctrl/for-next (2039834c86f3 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (4651209c75d1 Merge branch 'for-4.11/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (68eb94f16227 proc: Better ownership of files for non-dumpable tasks in user namespaces)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (c440408cf690 random: convert get_random_int/long into get_random_u32/u64)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1e4c2830c369 selftest: cpufreq: Add special tests)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
Merging rtc/rtc-next (4c6106406eb1 rtc: sun6i: Fix compatibility with old DT binding)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (1f19b983a887 libnvdimm, namespace: fix pmem namespace leak, delete when size set to zero)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging extable/extable (24bf9bdef929 module.h: remove extable.h include now users have migrated)
Merging idr/idr-4.11 (39272ecab724 radix-tree: Store a pointer to the root in each node)
Merging akpm-current/current (7b482f2546e0 ipc/sem: add hysteresis)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Merging akpm/master (eb90a97049dd mm: clarify mm_struct.mm_{users,count} documentation)
^ permalink raw reply
* Re: linux-next: build failure after merge of the regulator tree
From: Mark Brown @ 2017-02-01 10:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel, Bhumika Goyal
In-Reply-To: <20170201134221.7a413d9b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
On Wed, Feb 01, 2017 at 01:42:21PM +1100, Stephen Rothwell wrote:
> Caused by commit
>
> 524d339a9d6b ("regulator: anatop-regulator: constify regulator_ops structure")
>
> I can only assume that this patch has been rebased since it was tested.
Discarded that commit.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* next-20170201 build: 3 failures 3 warnings (next-20170201)
From: Build bot for Mark Brown @ 2017-02-01 10:38 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170201
Git describe: next-20170201
Commit: 5f9e8892d9 Add linux-next specific files for 20170201
Build Time: 94 min 22 sec
Passed: 7 / 10 ( 70.00 %)
Failed: 3 / 10 ( 30.00 %)
Errors: 2
Warnings: 3
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
arm-allmodconfig
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : x86_64-allnoconfig
1 warnings 0 mismatches : arm64-allnoconfig
1 warnings 0 mismatches : arm-allnoconfig
2 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Errors summary: 2
2 ../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
1 ../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
Warnings Summary: 3
3 ../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
1 ../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:815:40: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
x86_64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches
Errors:
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 2 errors, 2 warnings, 0 section mismatches
Errors:
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
Warnings:
../drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:815:40: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm-multi_v4t_defconfig
x86_64-defconfig
arm-multi_v7_defconfig
arm-multi_v5_defconfig
arm64-defconfig
^ permalink raw reply
* Re: next-20170201 build: 3 failures 3 warnings (next-20170201)
From: Mark Brown @ 2017-02-01 10:56 UTC (permalink / raw)
To: Michael Zoran, Greg Kroah-Hartman
Cc: kernel-build-reports, linaro-kernel, linux-next
In-Reply-To: <E1cYsIh-0004Lj-OF@optimist>
[-- Attachment #1: Type: text/plain, Size: 694 bytes --]
On Wed, Feb 01, 2017 at 10:38:07AM +0000, Build bot for Mark Brown wrote:
Today's -next fails to build both arm and arm64 allmodconfigs due to:
> arm64-allmodconfig
> ../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
> arm-allmodconfig
> ../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
> ../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
caused by that driver being added.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* Re: next-20170201 build: 3 failures 3 warnings (next-20170201)
From: Greg Kroah-Hartman @ 2017-02-01 11:17 UTC (permalink / raw)
To: Mark Brown; +Cc: Michael Zoran, kernel-build-reports, linaro-kernel, linux-next
In-Reply-To: <20170201105627.pmx2c2wjfxjvnujq@sirena.org.uk>
On Wed, Feb 01, 2017 at 10:56:27AM +0000, Mark Brown wrote:
> On Wed, Feb 01, 2017 at 10:38:07AM +0000, Build bot for Mark Brown wrote:
>
> Today's -next fails to build both arm and arm64 allmodconfigs due to:
>
> > arm64-allmodconfig
> > ../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
>
> > arm-allmodconfig
> > ../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
> > ../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
>
> caused by that driver being added.
Doesn't look like vchi_msg_queue is ever exported for modules to use.
Michael, care to make up a patch for that?
Also, the build warning is odd, shouldn't the include files point to the
correct .h file for this?
thanks,
greg k-h
^ permalink raw reply
* Re: next-20170201 build: 3 failures 3 warnings (next-20170201)
From: Michael Zoran @ 2017-02-01 13:45 UTC (permalink / raw)
To: Greg Kroah-Hartman, Mark Brown
Cc: kernel-build-reports, linaro-kernel, linux-next
In-Reply-To: <20170201111752.GI13721@kroah.com>
On Wed, 2017-02-01 at 12:17 +0100, Greg Kroah-Hartman wrote:
> On Wed, Feb 01, 2017 at 10:56:27AM +0000, Mark Brown wrote:
> > On Wed, Feb 01, 2017 at 10:38:07AM +0000, Build bot for Mark Brown
> > wrote:
> >
> > Today's -next fails to build both arm and arm64 allmodconfigs due
> > to:
> >
> > > arm64-allmodconfig
> > > ../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error:
> > > implicit declaration of function 'vchi_msg_queue' [-
> > > Werror=implicit-function-declaration]
> > > arm-allmodconfig
> > > ../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error:
> > > implicit declaration of function 'vchi_msg_queue' [-
> > > Werror=implicit-function-declaration]
> > > ../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8:
> > > error: implicit declaration of function 'vchi_msg_queue' [-
> > > Werror=implicit-function-declaration]
> >
> > caused by that driver being added.
>
> Doesn't look like vchi_msg_queue is ever exported for modules to use.
> Michael, care to make up a patch for that?
>
> Also, the build warning is odd, shouldn't the include files point to
> the
> correct .h file for this?
>
This is because vchi_msg_queue was replaced with
vchi_queue_kernel_message and vchi_queue_user_message.
vchi_msg_queue was removed from the header and made static since it's
no longer needed by other modules.
The correct fix is to replace vchi_msg_queue with
vchi_queue_kernel_message in the two dependent drivers.
I should have a patch shortly, but I'm currently having some very slow
network issues.
^ permalink raw reply
* [PATCH] arm64: defconfig: resynchronize the defconfig
From: Timur Tabi @ 2017-02-01 20:46 UTC (permalink / raw)
To: Olof Johansson, linux-arm-kernel, Christopher Covington, sfr,
linux-next, linux-kernel
Defconfig files become unsynchronized over time as Kconfig entries are
added, removed, or changed. Making specific changes to the defconfig
becomes difficult as unrelated differences can interfere. This problem
is easily remedied:
make defconfig
make savedefconfig
cp defconfig arch/arm64/configs/defconfig
Signed-off-by: Timur Tabi <timur@codeaurora.org>
---
arch/arm64/configs/defconfig | 82 ++++++++++++++++++--------------------------
1 file changed, 34 insertions(+), 48 deletions(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 8ca89de..c5055c5 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -30,7 +30,6 @@ CONFIG_PROFILING=y
CONFIG_JUMP_LABEL=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
CONFIG_ARCH_SUNXI=y
CONFIG_ARCH_ALPINE=y
@@ -61,7 +60,6 @@ CONFIG_ARCH_XGENE=y
CONFIG_ARCH_ZX=y
CONFIG_ARCH_ZYNQMP=y
CONFIG_PCI=y
-CONFIG_PCI_MSI=y
CONFIG_PCI_IOV=y
CONFIG_PCI_AARDVARK=y
CONFIG_PCIE_RCAR=y
@@ -79,11 +77,10 @@ CONFIG_KSM=y
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_CMA=y
CONFIG_SECCOMP=y
-CONFIG_XEN=y
CONFIG_KEXEC=y
+CONFIG_XEN=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_COMPAT=y
-CONFIG_CPU_IDLE=y
CONFIG_HIBERNATION=y
CONFIG_ARM_CPUIDLE=y
CONFIG_CPU_FREQ=y
@@ -153,8 +150,8 @@ CONFIG_MTD_SPI_NOR=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_NBD=m
CONFIG_VIRTIO_BLK=y
-CONFIG_EEPROM_AT25=m
CONFIG_SRAM=y
+CONFIG_EEPROM_AT25=m
# CONFIG_SCSI_PROC_FS is not set
CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_SAS_ATA=y
@@ -166,8 +163,8 @@ CONFIG_AHCI_CEVA=y
CONFIG_AHCI_MVEBU=y
CONFIG_AHCI_XGENE=y
CONFIG_AHCI_QORIQ=y
-CONFIG_SATA_RCAR=y
CONFIG_SATA_SIL24=y
+CONFIG_SATA_RCAR=y
CONFIG_PATA_PLATFORM=y
CONFIG_PATA_OF_PLATFORM=y
CONFIG_NETDEVICES=y
@@ -189,11 +186,10 @@ CONFIG_RAVB=y
CONFIG_SMC91X=y
CONFIG_SMSC911X=y
CONFIG_STMMAC_ETH=m
-CONFIG_REALTEK_PHY=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=y
CONFIG_MESON_GXL_PHY=m
CONFIG_MICREL_PHY=y
-CONFIG_MDIO_BUS_MUX=y
-CONFIG_MDIO_BUS_MUX_MMIOREG=y
+CONFIG_REALTEK_PHY=m
CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m
CONFIG_USB_RTL8152=m
@@ -226,14 +222,14 @@ CONFIG_SERIAL_8250_UNIPHIER=y
CONFIG_SERIAL_OF_PLATFORM=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_MESON=y
+CONFIG_SERIAL_MESON_CONSOLE=y
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_TEGRA=y
CONFIG_SERIAL_SH_SCI=y
CONFIG_SERIAL_SH_SCI_NR_UARTS=11
CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_SERIAL_MESON=y
-CONFIG_SERIAL_MESON_CONSOLE=y
CONFIG_SERIAL_MSM=y
CONFIG_SERIAL_MSM_CONSOLE=y
CONFIG_SERIAL_XILINX_PS_UART=y
@@ -255,14 +251,14 @@ CONFIG_I2C_UNIPHIER_F=y
CONFIG_I2C_RCAR=y
CONFIG_I2C_CROS_EC_TUNNEL=y
CONFIG_SPI=y
-CONFIG_SPI_MESON_SPIFC=m
CONFIG_SPI_BCM2835=m
CONFIG_SPI_BCM2835AUX=m
+CONFIG_SPI_MESON_SPIFC=m
CONFIG_SPI_ORION=y
CONFIG_SPI_PL022=y
CONFIG_SPI_QUP=y
-CONFIG_SPI_SPIDEV=m
CONFIG_SPI_S3C64XX=y
+CONFIG_SPI_SPIDEV=m
CONFIG_SPMI=y
CONFIG_PINCTRL_SINGLE=y
CONFIG_PINCTRL_MAX77620=y
@@ -280,32 +276,29 @@ CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GPIO_MAX77620=y
CONFIG_POWER_RESET_MSM=y
-CONFIG_BATTERY_BQ27XXX=y
CONFIG_POWER_RESET_XGENE=y
CONFIG_POWER_RESET_SYSCON=y
+CONFIG_BATTERY_BQ27XXX=y
+CONFIG_SENSORS_ARM_SCPI=y
CONFIG_SENSORS_LM90=m
CONFIG_SENSORS_INA2XX=m
-CONFIG_SENSORS_ARM_SCPI=y
-CONFIG_THERMAL=y
-CONFIG_THERMAL_EMULATION=y
CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
CONFIG_CPU_THERMAL=y
-CONFIG_BCM2835_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
CONFIG_EXYNOS_THERMAL=y
CONFIG_WATCHDOG=y
-CONFIG_BCM2835_WDT=y
-CONFIG_RENESAS_WDT=y
CONFIG_S3C2410_WATCHDOG=y
CONFIG_MESON_GXBB_WATCHDOG=m
CONFIG_MESON_WATCHDOG=m
+CONFIG_RENESAS_WDT=y
+CONFIG_BCM2835_WDT=y
+CONFIG_MFD_CROS_EC=y
+CONFIG_MFD_CROS_EC_I2C=y
+CONFIG_MFD_HI655X_PMIC=y
CONFIG_MFD_MAX77620=y
-CONFIG_MFD_RK808=y
CONFIG_MFD_SPMI_PMIC=y
+CONFIG_MFD_RK808=y
CONFIG_MFD_SEC_CORE=y
-CONFIG_MFD_HI655X_PMIC=y
-CONFIG_REGULATOR=y
-CONFIG_MFD_CROS_EC=y
-CONFIG_MFD_CROS_EC_I2C=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_HI655X=y
@@ -332,9 +325,9 @@ CONFIG_DRM_RCAR_HDMI=y
CONFIG_DRM_RCAR_LVDS=y
CONFIG_DRM_RCAR_VSP=y
CONFIG_DRM_TEGRA=m
-CONFIG_DRM_VC4=m
CONFIG_DRM_PANEL_SIMPLE=m
CONFIG_DRM_I2C_ADV7511=m
+CONFIG_DRM_VC4=m
CONFIG_DRM_HISI_KIRIN=m
CONFIG_DRM_MESON=m
CONFIG_FB=y
@@ -349,26 +342,24 @@ CONFIG_SOUND=y
CONFIG_SND=y
CONFIG_SND_SOC=y
CONFIG_SND_BCM2835_SOC_I2S=m
-CONFIG_SND_SOC_RCAR=y
CONFIG_SND_SOC_SAMSUNG=y
+CONFIG_SND_SOC_RCAR=y
CONFIG_SND_SOC_AK4613=y
CONFIG_USB=y
CONFIG_USB_OTG=y
CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_XHCI_PLATFORM=y
-CONFIG_USB_XHCI_RCAR=y
-CONFIG_USB_EHCI_EXYNOS=y
CONFIG_USB_XHCI_TEGRA=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MSM=y
+CONFIG_USB_EHCI_EXYNOS=y
CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_OHCI_EXYNOS=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_EXYNOS=y
CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_USB_RENESAS_USBHS=m
CONFIG_USB_STORAGE=y
-CONFIG_USB_DWC2=y
CONFIG_USB_DWC3=y
+CONFIG_USB_DWC2=y
CONFIG_USB_CHIPIDEA=y
CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_CHIPIDEA_HOST=y
@@ -381,7 +372,6 @@ CONFIG_USB_RENESAS_USBHS_UDC=m
CONFIG_MMC=y
CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_ARMMMCI=y
-CONFIG_MMC_MESON_GX=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ACPI=y
CONFIG_MMC_SDHCI_PLTFM=y
@@ -389,6 +379,7 @@ CONFIG_MMC_SDHCI_OF_ARASAN=y
CONFIG_MMC_SDHCI_OF_ESDHC=y
CONFIG_MMC_SDHCI_CADENCE=y
CONFIG_MMC_SDHCI_TEGRA=y
+CONFIG_MMC_MESON_GX=y
CONFIG_MMC_SDHCI_MSM=y
CONFIG_MMC_SPI=y
CONFIG_MMC_SDHI=y
@@ -401,24 +392,23 @@ CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_SYSCON=y
-CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_CPU=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_RK808=m
CONFIG_RTC_DRV_S5M=y
CONFIG_RTC_DRV_DS3232=y
CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_S3C=y
CONFIG_RTC_DRV_PL031=y
CONFIG_RTC_DRV_SUN6I=y
-CONFIG_RTC_DRV_RK808=m
CONFIG_RTC_DRV_TEGRA=y
CONFIG_RTC_DRV_XGENE=y
-CONFIG_RTC_DRV_S3C=y
CONFIG_DMADEVICES=y
+CONFIG_DMA_BCM2835=m
CONFIG_MV_XOR_V2=y
CONFIG_PL330_DMA=y
-CONFIG_DMA_BCM2835=m
CONFIG_TEGRA20_APB_DMA=y
CONFIG_QCOM_BAM_DMA=y
CONFIG_QCOM_HIDMA_MGMT=y
@@ -431,18 +421,17 @@ CONFIG_VIRTIO_BALLOON=y
CONFIG_VIRTIO_MMIO=y
CONFIG_XEN_GNTDEV=y
CONFIG_XEN_GRANT_DEV_ALLOC=y
+CONFIG_COMMON_CLK_RK808=y
CONFIG_COMMON_CLK_SCPI=y
CONFIG_COMMON_CLK_CS2000_CP=y
CONFIG_COMMON_CLK_S2MPS11=y
-CONFIG_COMMON_CLK_PWM=y
-CONFIG_COMMON_CLK_RK808=y
CONFIG_CLK_QORIQ=y
+CONFIG_COMMON_CLK_PWM=y
CONFIG_COMMON_CLK_QCOM=y
CONFIG_MSM_GCC_8916=y
CONFIG_MSM_GCC_8994=y
CONFIG_MSM_MMCC_8996=y
CONFIG_HWSPINLOCK_QCOM=y
-CONFIG_MAILBOX=y
CONFIG_ARM_MHU=y
CONFIG_PLATFORM_MHU=y
CONFIG_BCM2835_MBOX=y
@@ -458,12 +447,14 @@ CONFIG_ARCH_TEGRA_132_SOC=y
CONFIG_ARCH_TEGRA_210_SOC=y
CONFIG_ARCH_TEGRA_186_SOC=y
CONFIG_EXTCON_USB_GPIO=y
+CONFIG_IIO=y
+CONFIG_EXYNOS_ADC=y
CONFIG_PWM=y
CONFIG_PWM_BCM2835=m
+CONFIG_PWM_MESON=m
CONFIG_PWM_ROCKCHIP=y
+CONFIG_PWM_SAMSUNG=y
CONFIG_PWM_TEGRA=m
-CONFIG_PWM_MESON=m
-CONFIG_COMMON_RESET_HI6220=y
CONFIG_PHY_RCAR_GEN3_USB2=y
CONFIG_PHY_HI6220_USB=y
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
@@ -471,11 +462,8 @@ CONFIG_PHY_ROCKCHIP_EMMC=y
CONFIG_PHY_XGENE=y
CONFIG_PHY_TEGRA_XUSB=y
CONFIG_ARM_SCPI_PROTOCOL=y
-CONFIG_ACPI=y
-CONFIG_IIO=y
-CONFIG_EXYNOS_ADC=y
-CONFIG_PWM_SAMSUNG=y
CONFIG_RASPBERRYPI_FIRMWARE=y
+CONFIG_ACPI=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
@@ -489,7 +477,6 @@ CONFIG_FUSE_FS=m
CONFIG_CUSE=m
CONFIG_OVERLAY_FS=m
CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
CONFIG_HUGETLBFS=y
CONFIG_CONFIGFS_FS=y
CONFIG_EFIVAR_FS=y
@@ -523,5 +510,4 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
CONFIG_CRYPTO_GHASH_ARM64_CE=y
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
-# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
CONFIG_CRYPTO_CRC32_ARM64=y
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply related
* mmotm 2017-02-01-15-35 uploaded
From: akpm @ 2017-02-01 23:36 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2017-02-01-15-35 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.10-rc6:
(patches marked "*" will be included in linux-next)
origin.patch
i-need-old-gcc.patch
* zswap-disable-changing-params-if-init-fails.patch
* kasan-respect-proc-sys-kernel-traceoff_on_warning.patch
* mm-sleeping-function-called-from-invalid-context-shmem_undo_range.patch
* jump-label-pass-kbuild_cflags-when-checking-for-asm-goto-support.patch
* mm-memory_hotplugc-check-start_pfn-in-test_pages_in_a_zone.patch
* base-memory-hotplug-fix-a-kernel-oops-in-show_valid_zones.patch
* scatterlist-dont-overflow-length-field.patch
* fs-break-out-of-iomap_file_buffered_write-on-fatal-signals.patch
* mm-fs-check-for-fatal-signals-in-do_generic_file_read.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* tracing-add-__print_flags_u64.patch
* dax-add-tracepoint-infrastructure-pmd-tracing.patch
* dax-update-maintainers-entries-for-fs-dax.patch
* dax-add-tracepoints-to-dax_pmd_load_hole.patch
* dax-add-tracepoints-to-dax_pmd_insert_mapping.patch
* mm-dax-make-pmd_fault-and-friends-to-be-the-same-as-fault.patch
* mm-dax-make-pmd_fault-and-friends-to-be-the-same-as-fault-v7.patch
* mm-dax-move-pmd_fault-to-take-only-vmf-parameter.patch
* dma-debug-add-comment-for-failed-to-check-map-error.patch
* prctl-implement-pr_get_endian-for-all-architectures.patch
* tools-vm-add-missing-makefile-rules.patch
* scripts-spellingtxt-add-several-more-common-spelling-mistakes.patch
* scripts-lindent-clean-up-and-optimize.patch
* scripts-checkstackpl-add-support-for-nios2.patch
* m32r-use-generic-currenth.patch
* m32r-fix-build-warning.patch
* debugobjects-track-number-of-kmem_cache_alloc-kmem_cache_free-done.patch
* debugobjects-scale-thresholds-with-of-cpus.patch
* debugobjects-reduce-contention-on-the-global-pool_lock.patch
* ocfs2-dlmglue-prepare-tracking-logic-to-avoid-recursive-cluster-lock.patch
* ocfs2-fix-deadlock-issue-when-taking-inode-lock-at-vfs-entry-points.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* kernel-watchdogc-do-not-hardcode-cpu-0-as-the-initial-thread.patch
mm.patch
* slub-do-not-merge-cache-if-slub_debug-contains-a-never-merge-flag.patch
* mm-slub-add-a-dump_stack-to-the-unexpected-gfp-check.patch
* tmpfs-change-shmem_mapping-to-test-shmem_aops.patch
* mm-throttle-show_mem-from-warn_alloc.patch
* mm-throttle-show_mem-from-warn_alloc-fix.patch
* mm-page_alloc-dont-convert-pfn-to-idx-when-merging.patch
* mm-page_alloc-avoid-page_to_pfn-when-merging-buddies.patch
* mm-vmallocc-use-rb_entry_safe.patch
* mm-trace-extract-compaction_status-and-zone_type-to-a-common-header.patch
* oom-trace-add-oom-detection-tracepoints.patch
* oom-trace-add-compaction-retry-tracepoint.patch
* userfaultfd-document-_ior-_iow.patch
* userfaultfd-correct-comment-about-uffd_feature_pagefault_flag_wp.patch
* userfaultfd-convert-bug-to-warn_on_once.patch
* userfaultfd-use-vma_is_anonymous.patch
* userfaultfd-non-cooperative-split-the-find_userfault-routine.patch
* userfaultfd-non-cooperative-add-ability-to-report-non-pf-events-from-uffd-descriptor.patch
* userfaultfd-non-cooperative-report-all-available-features-to-userland.patch
* userfaultfd-non-cooperative-add-fork-event.patch
* userfaultfd-non-cooperative-add-fork-event-build-warning-fix.patch
* userfaultfd-non-cooperative-dup_userfaultfd-use-mm_count-instead-of-mm_users.patch
* userfaultfd-non-cooperative-add-mremap-event.patch
* userfaultfd-non-cooperative-optimize-mremap_userfaultfd_complete.patch
* userfaultfd-non-cooperative-add-madvise-event-for-madv_dontneed-request.patch
* userfaultfd-non-cooperative-avoid-madv_dontneed-race-condition.patch
* userfaultfd-non-cooperative-wake-userfaults-after-uffdio_unregister.patch
* userfaultfd-hugetlbfs-add-copy_huge_page_from_user-for-hugetlb-userfaultfd-support.patch
* userfaultfd-hugetlbfs-add-hugetlb_mcopy_atomic_pte-for-userfaultfd-support.patch
* userfaultfd-hugetlbfs-add-__mcopy_atomic_hugetlb-for-huge-page-uffdio_copy.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix.patch
* userfaultfd-hugetlbfs-fix-__mcopy_atomic_hugetlb-retry-error-processing-fix-fix.patch
* userfaultfd-hugetlbfs-add-userfaultfd-hugetlb-hook.patch
* userfaultfd-hugetlbfs-allow-registration-of-ranges-containing-huge-pages.patch
* userfaultfd-hugetlbfs-add-userfaultfd_hugetlb-test.patch
* userfaultfd-hugetlbfs-userfaultfd_huge_must_wait-for-hugepmd-ranges.patch
* userfaultfd-hugetlbfs-gup-support-vm_fault_retry.patch
* userfaultfd-hugetlbfs-reserve-count-on-error-in-__mcopy_atomic_hugetlb.patch
* userfaultfd-hugetlbfs-uffd_feature_missing_hugetlbfs.patch
* userfaultfd-introduce-vma_can_userfault.patch
* userfaultfd-shmem-add-shmem_mcopy_atomic_pte-for-userfaultfd-support.patch
* userfaultfd-shmem-introduce-vma_is_shmem.patch
* userfaultfd-shmem-add-tlbflushh-header-for-microblaze.patch
* userfaultfd-shmem-use-shmem_mcopy_atomic_pte-for-shared-memory.patch
* userfaultfd-shmem-add-userfaultfd-hook-for-shared-memory-faults.patch
* userfaultfd-shmem-allow-registration-of-shared-memory-ranges.patch
* userfaultfd-shmem-add-userfaultfd_shmem-test.patch
* userfaultfd-shmem-lock-the-page-before-adding-it-to-pagecache.patch
* userfaultfd-shmem-avoid-a-lockup-resulting-from-corrupted-page-flags.patch
* userfaultfd-shmem-avoid-leaking-blocks-and-used-blocks-in-uffdio_copy.patch
* userfaultfd-hugetlbfs-uffd_feature_missing_shmem.patch
* userfaultfd-non-cooperative-selftest-introduce-userfaultfd_open.patch
* userfaultfd-non-cooperative-selftest-add-ufd-parameter-to-copy_page.patch
* userfaultfd-non-cooperative-selftest-add-test-for-fork-madvdontneed-and-remap-events.patch
* userfaultfd-selftest-test-uffdio_zeropage-on-all-memory-types.patch
* mm-mprotect-use-pmd_trans_unstable-instead-of-taking-the-pmd_lock.patch
* mm-vmscan-remove-unused-mm_vmscan_memcg_isolate.patch
* mm-vmscan-add-active-list-aging-tracepoint.patch
* mm-vmscan-add-active-list-aging-tracepoint-update.patch
* mm-vmscan-show-the-number-of-skipped-pages-in-mm_vmscan_lru_isolate.patch
* mm-vmscan-show-lru-name-in-mm_vmscan_lru_isolate-tracepoint.patch
* mm-vmscan-extract-shrink_page_list-reclaim-counters-into-a-struct.patch
* mm-vmscan-enhance-mm_vmscan_lru_shrink_inactive-tracepoint.patch
* mm-vmscan-add-mm_vmscan_inactive_list_is_low-tracepoint.patch
* trace-vmscan-postprocess-sync-with-tracepoints-updates.patch
* nfs-no-pg_private-waiters-remain-remove-waker.patch
* mm-un-export-wake_up_page-functions.patch
* mm-fix-filemapc-kernel-doc-warnings.patch
* mm-page_alloc-swap-likely-to-unlikely-as-code-logic-is-different-for-next_zones_zonelist.patch
* mm-compaction-add-vmstats-for-kcompactd-work.patch
* mm-page_alloc-skip-over-regions-of-invalid-pfns-where-possible.patch
* mmcompaction-serialize-waitqueue_active-checks.patch
* mm-bootmemc-cosmetic-improvement-of-code-readability.patch
* mm-fix-some-typos-in-mm-zsmallocc.patch
* mm-memblockc-trivial-code-refine-in-memblock_is_region_memory.patch
* mm-memblockc-check-return-value-of-memblock_reserve-in-memblock_virt_alloc_internal.patch
* mm-sparse-use-page_private-to-get-page-private-value.patch
* mm-memory_hotplug-set-magic-number-to-page-freelsit-instead-of-page-lrunext.patch
* powerpc-do-not-make-the-entire-heap-executable.patch
* mm-swap-fix-kernel-message-in-swap_info_get.patch
* mm-swap-add-cluster-lock.patch
* mm-swap-add-cluster-lock-v5.patch
* mm-swap-split-swap-cache-into-64mb-trunks.patch
* mm-swap-skip-read-ahead-for-unreferenced-swap-slots.patch
* mm-swap-allocate-swap-slots-in-batches.patch
* mm-swap-free-swap-slots-in-batch.patch
* mm-swap-add-cache-for-swap-slots-allocation.patch
* mm-swap-add-cache-for-swap-slots-allocation-fix.patch
* mm-swap-add-cache-for-swap-slots-allocation-fix-2.patch
* mm-swap-enable-swap-slots-cache-usage.patch
* mm-swap-skip-readahead-only-when-swap-slot-cache-is-enabled.patch
* mm-thp-add-new-defermadvise-defrag-option.patch
* writeback-use-rb_entry.patch
* mm-vmscan-do-not-count-freed-pages-as-pgdeactivate.patch
* mm-vmscan-cleanup-lru-size-claculations.patch
* mm-vmscan-consider-eligible-zones-in-get_scan_count.patch
* revert-mm-bail-out-in-shrink_inactive_list.patch
* mm-page_alloc-do-not-report-all-nodes-in-show_mem.patch
* mm-page_alloc-warn_alloc-print-nodemask.patch
* arch-mm-remove-arch-specific-show_mem.patch
* lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask.patch
* lib-show_memc-teach-show_mem-to-work-with-the-given-nodemask-checkpatch-fixes.patch
* mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath.patch
* mm-consolidate-gfp_nofail-checks-in-the-allocator-slowpath-fix.patch
* mm-oom-do-not-enfore-oom-killer-for-__gfp_nofail-automatically.patch
* mm-help-__gfp_nofail-allocations-which-do-not-trigger-oom-killer.patch
* mm-page_alloc-warn_alloc-nodemask-is-null-when-cpusets-are-disabled.patch
* mm-drop-zap_details-ignore_dirty.patch
* mm-drop-zap_details-check_swap_entries.patch
* mm-drop-unused-argument-of-zap_page_range.patch
* oom-reaper-use-madvise_dontneed-logic-to-decide-if-unmap-the-vma.patch
* mm-memblockc-remove-unnecessary-log-and-clean-up.patch
* zram-remove-obsolete-sysfs-attrs.patch
* mm-fix-linux-pagemaph-stray-kernel-doc-notation.patch
* z3fold-limit-first_num-to-the-actual-range-of-possible-buddy-indexes.patch
* mm-ksm-improve-deduplication-of-zero-pages-with-colouring.patch
* mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix.patch
* mm-ksm-improve-deduplication-of-zero-pages-with-colouring-fix-2.patch
* mm-oom-header-nodemask-is-null-when-cpusets-are-disabled.patch
* mm-oom-header-nodemask-is-null-when-cpusets-are-disabled-fix.patch
* mm-fix-type-width-of-section-to-from-pfn-conversion-macros.patch
* mm-devm_memremap_pages-use-multi-order-radix-for-zone_device-lookups.patch
* mm-introduce-struct-mem_section_usage-to-track-partial-population-of-a-section.patch
* mm-introduce-common-definitions-for-the-size-and-mask-of-a-section.patch
* mm-cleanup-sparse_init_one_section-return-value.patch
* mm-track-active-portions-of-a-section-at-boot.patch
* mm-track-active-portions-of-a-section-at-boot-fix.patch
* mm-track-active-portions-of-a-section-at-boot-fix-fix.patch
* mm-fix-register_new_memory-zone-type-detection.patch
* mm-convert-kmalloc_section_memmap-to-populate_section_memmap.patch
* mm-prepare-for-hot-add-remove-of-sub-section-ranges.patch
* mm-support-section-unaligned-zone_device-memory-ranges.patch
* mm-support-section-unaligned-zone_device-memory-ranges-fix.patch
* mm-support-section-unaligned-zone_device-memory-ranges-fix-2.patch
* mm-enable-section-unaligned-devm_memremap_pages.patch
* libnvdimm-pfn-dax-stop-padding-pmem-namespaces-to-section-alignment.patch
* mm-memory_hotplugc-unexport-__remove_pages.patch
* memblock-let-memblock_type_name-know-about-physmem-type.patch
* memblock-also-dump-physmem-list-within-__memblock_dump_all.patch
* memblock-embed-memblock-type-name-within-struct-memblock_type.patch
* userfaultfd-non-cooperative-rename-event_madvdontneed-to-event_remove.patch
* userfaultfd-non-cooperative-add-madvise-event-for-madv_remove-request.patch
* userfaultfd-non-cooperative-selftest-enable-remove-event-test-for-shmem.patch
* mm-vmscan-scan-dirty-pages-even-in-laptop-mode.patch
* mm-vmscan-kick-flushers-when-we-encounter-dirty-pages-on-the-lru.patch
* mm-vmscan-kick-flushers-when-we-encounter-dirty-pages-on-the-lru-fix.patch
* mm-vmscan-remove-old-flusher-wakeup-from-direct-reclaim-path.patch
* mm-vmscan-only-write-dirty-pages-that-the-scanner-has-seen-twice.patch
* mm-vmscan-move-dirty-pages-out-of-the-way-until-theyre-flushed.patch
* mm-page_alloc-split-buffered_rmqueue.patch
* mm-page_alloc-split-buffered_rmqueue-fix.patch
* mm-page_alloc-split-alloc_pages_nodemask.patch
* mm-page_alloc-drain-per-cpu-pages-from-workqueue-context.patch
* mm-page_alloc-only-use-per-cpu-allocator-for-irq-safe-requests.patch
* mm-fs-reduce-fault-page_mkwrite-and-pfn_mkwrite-to-take-only-vmf.patch
* mm-fs-reduce-fault-page_mkwrite-and-pfn_mkwrite-to-take-only-vmf-fix.patch
* mm-fix-comments-for-mmap_init.patch
* zram-remove-waitqueue-for-io-done.patch
* zswap-allow-initialization-at-boot-without-pool.patch
* zswap-clear-compressor-or-zpool-param-if-invalid-at-init.patch
* mm-page_alloc-remove-redundant-checks-from-alloc-fastpath.patch
* mm-page_alloc-dont-check-cpuset-allowed-twice-in-fast-path.patch
* mm-page_alloc-use-static-global-work_struct-for-draining-per-cpu-pages.patch
* zswap-dont-param_set_charp-while-holding-spinlock.patch
* mmfsdax-change-pmd_fault-to-huge_fault.patch
* mmfsdax-change-pmd_fault-to-huge_fault-fix.patch
* mm-x86-add-support-for-pud-sized-transparent-hugepages.patch
* dax-support-for-transparent-pud-pages-for-device-dax.patch
* z3fold-make-pages_nr-atomic.patch
* z3fold-fix-header-size-related-issues.patch
* z3fold-extend-compaction-function.patch
* z3fold-use-per-page-spinlock.patch
* z3fold-add-kref-refcounting.patch
* z3fold-add-kref-refcounting-checkpatch-fixes.patch
* mm-migration-make-isolate_movable_page-return-int-type.patch
* mm-migration-make-isolate_movable_page-always-defined.patch
* hwpoison-soft-offlining-for-non-lru-movable-page.patch
* mm-hotplug-enable-memory-hotplug-for-non-lru-movable-pages.patch
* uprobes-split-thps-before-trying-replace-them.patch
* mm-introduce-page_vma_mapped_walk.patch
* mm-fix-handling-pte-mapped-thps-in-page_referenced.patch
* mm-fix-handling-pte-mapped-thps-in-page_idle_clear_pte_refs.patch
* mm-rmap-check-all-vmas-that-pte-mapped-thp-can-be-part-of.patch
* mm-convert-page_mkclean_one-to-use-page_vma_mapped_walk.patch
* mm-convert-try_to_unmap_one-to-use-page_vma_mapped_walk.patch
* mm-ksm-convert-write_protect_page-to-use-page_vma_mapped_walk.patch
* mm-uprobes-convert-__replace_page-to-use-page_vma_mapped_walk.patch
* mm-convert-page_mapped_in_vma-to-use-page_vma_mapped_walk.patch
* mm-drop-page_check_address_transhuge.patch
* mm-convert-remove_migration_pte-to-use-page_vma_mapped_walk.patch
* mm-convert-remove_migration_pte-to-use-page_vma_mapped_walk-checkpatch-fixes.patch
* mm-call-vm_munmap-in-munmap-syscall-instead-of-using-open-coded-version.patch
* userfaultfd-non-cooperative-add-event-for-memory-unmaps.patch
* userfaultfd-non-cooperative-add-event-for-exit-notification.patch
* userfaultfd-mcopy_atomic-return-enoent-when-no-compatible-vma-found.patch
* userfaultfd_copy-return-enospc-in-case-mm-has-gone.patch
* mm-alloc_contig_range-allow-to-specify-gfp-mask.patch
* mm-cma_alloc-allow-to-specify-gfp-mask.patch
* mm-wire-up-gfp-flag-passing-in-dma_alloc_from_contiguous.patch
* mm-madvise-fail-with-enomem-when-splitting-vma-will-hit-max_map_count.patch
* mm-cma-print-allocation-failure-reason-and-bitmap-status.patch
* vmalloc-back-of-when-the-current-is-killed.patch
* mm-vmscan-do-not-pass-reclaimed-slab-to-vmpressure.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* kasan-drain-quarantine-of-memcg-slab-objects.patch
* kasan-add-memcg-kmem_cache-test.patch
* frv-pci-frv-fix-build-warning.patch
* proc-use-rb_entry.patch
* proc-less-code-duplication-in-proc-cmdline.patch
* uapi-mqueueh-add-missing-linux-typesh-include.patch
* iopoll-include-linux-ktimeh-instead-of-linux-hrtimerh.patch
* mm-add-arch-independent-testcases-for-rodata.patch
* compiler-gcch-added-a-new-macro-to-wrap-gcc-attribute.patch
* m68k-replaced-gcc-specific-macros-with-ones-from-compilerh.patch
* notifier-simplify-expression.patch
* lib-add-module-support-to-crc32-tests.patch
* lib-add-module-support-to-glob-tests.patch
* lib-add-module-support-to-atomic64-tests.patch
* find_bit-micro-optimise-find_next__bit.patch
* find_bit-micro-optimise-find_next__bit-v2.patch
* linux-kernelh-fix-div_round_closest-to-support-negative-divisors.patch
* linux-kernelh-fix-div_round_closest-to-support-negative-divisors-fix.patch
* rbtree-use-designated-initializers.patch
* lib-add-config_test_sort-to-enable-self-test-of-sort.patch
* lib-add-config_test_sort-to-enable-self-test-of-sort-fix.patch
* lib-update-lz4-compressor-module.patch
* lib-decompress_unlz4-change-module-to-work-with-new-lz4-module-version.patch
* crypto-change-lz4-modules-to-work-with-new-lz4-module-version.patch
* fs-pstore-fs-squashfs-change-usage-of-lz4-to-work-with-new-lz4-version.patch
* lib-lz4-remove-back-compat-wrappers.patch
* lib-test_sort-make-it-explicitly-non-modular.patch
* checkpatch-warn-on-embedded-function-names.patch
* checkpatch-warn-on-logging-continuations.patch
* checkpatch-update-logfunctions.patch
* checkpatch-add-another-old-address-for-the-fsf.patch
* autofs-remove-wrong-comment.patch
* autofs-fix-typo-in-documentation.patch
* autofs-fix-wrong-ioctl-documentation-regarding-devid.patch
* autofs-update-ioctl-documentation-regarding-struct-autofs_dev_ioctl.patch
* autofs-add-command-enum-macros-for-root-dir-ioctls.patch
* autofs-remove-duplicated-autofs_dev_ioctl_size-definition.patch
* autofs-take-more-care-to-not-update-last_used-on-path-walk.patch
* hfs-fix-fix-hfs_readdir.patch
* hfs-atomically-read-inode-size.patch
* hfsplus-atomically-read-inode-size.patch
* fs-reiserfs-atomically-read-inode-size.patch
* exit-fix-the-setns-pr_set_child_subreaper-interaction.patch
* proc-kcore-update-physical-address-for-kcore-ram-and-text.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-use-get_user_pages_unlocked.patch
* fs-affs-remove-reference-to-affs_parent_ino.patch
* fs-affs-add-validation-block-function.patch
* fs-affs-make-affs-exportable.patch
* fs-affs-use-octal-for-permissions.patch
* fs-affs-add-prefix-to-some-functions.patch
* fs-affs-nameic-forward-declarations-clean-up.patch
* fs-affs-make-export-work-with-cold-dcache.patch
* fs-affs-make-export-work-with-cold-dcache-fix.patch
* config-android-recommended-disable-aio-support.patch
* config-android-base-enable-hardened-usercopy-and-kernel-aslr.patch
* fonts-keep-non-sparc-fonts-listed-together.patch
* scripts-gdb-add-lx-fdtdump-command.patch
* initramfs-finish-fput-before-accessing-any-binary-from-initramfs.patch
* ipc-semc-avoid-using-spin_unlock_wait.patch
* ipc-sem-add-hysteresis.patch
* ipc-mqueue-add-missing-sparse-annotation.patch
linux-next.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
* fs-add-i_blocksize.patch
* fs-add-i_blocksize-fix.patch
* nilfs2-use-nilfs_btree_node_size.patch
* nilfs2-use-i_blocksize.patch
* scripts-spellingtxt-add-swith-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-swithc-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-user-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-union-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-an-one-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-partiton-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-aligment-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-algined-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-efective-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-varible-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-embeded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-againt-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-neded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-unneded-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-intialization-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-initialiazation-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-intialised-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-comsumer-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-disbled-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overide-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overrided-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-configuartion-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-applys-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-explictely-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-omited-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-disassocation-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-deintialized-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overwritting-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-overwriten-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-therfore-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-followings-pattern-and-fix-typo-instances.patch
* scripts-spellingtxt-add-some-typo-words.patch
* lib-vsprintfc-remove-%z-support.patch
* checkpatchpl-warn-against-using-%z.patch
* checkpatchpl-warn-against-using-%z-fix.patch
* mm-add-new-mmgrab-helper.patch
* mm-add-new-mmget-helper.patch
* mm-use-mmget_not_zero-helper.patch
* mm-clarify-mm_structmm_userscount-documentation.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* linux-next: manual merge of the net-next tree with Linus' tree
From: Stephen Rothwell @ 2017-02-02 1:49 UTC (permalink / raw)
To: David Miller, Networking; +Cc: linux-next, linux-kernel, Yotam Gigi
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/cls_matchall.c
between commit:
fd62d9f5c575 ("net/sched: matchall: Fix configuration race")
from Linus' tree and commit:
ec2507d2a306 ("net/sched: cls_matchall: Fix error path")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/sched/cls_matchall.c
index b12bc2abea93,fcecf5aac666..000000000000
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@@ -118,19 -141,24 +118,24 @@@ static int mall_set_parms(struct net *n
struct tcf_exts e;
int err;
- tcf_exts_init(&e, TCA_MATCHALL_ACT, 0);
+ err = tcf_exts_init(&e, TCA_MATCHALL_ACT, 0);
+ if (err)
+ return err;
err = tcf_exts_validate(net, tp, tb, est, &e, ovr);
if (err < 0)
- return err;
+ goto errout;
if (tb[TCA_MATCHALL_CLASSID]) {
- f->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]);
- tcf_bind_filter(tp, &f->res, base);
+ head->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]);
+ tcf_bind_filter(tp, &head->res, base);
}
- tcf_exts_change(tp, &f->exts, &e);
+ tcf_exts_change(tp, &head->exts, &e);
return 0;
+ errout:
+ tcf_exts_destroy(&e);
+ return err;
}
static int mall_change(struct net *net, struct sk_buff *in_skb,
@@@ -162,39 -194,43 +167,44 @@@
return -EINVAL;
}
- f = kzalloc(sizeof(*f), GFP_KERNEL);
- if (!f)
+ new = kzalloc(sizeof(*new), GFP_KERNEL);
+ if (!new)
return -ENOBUFS;
- tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0);
- err = tcf_exts_init(&f->exts, TCA_MATCHALL_ACT, 0);
++ err = tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0);
+ if (err)
+ goto err_exts_init;
if (!handle)
handle = 1;
- f->handle = handle;
- f->flags = flags;
+ new->handle = handle;
+ new->flags = flags;
- err = mall_set_parms(net, tp, f, base, tb, tca[TCA_RATE], ovr);
+ err = mall_set_parms(net, tp, new, base, tb, tca[TCA_RATE], ovr);
if (err)
- goto errout;
+ goto err_set_parms;
if (tc_should_offload(dev, tp, flags)) {
- err = mall_replace_hw_filter(tp, f, (unsigned long) f);
+ err = mall_replace_hw_filter(tp, new, (unsigned long) new);
if (err) {
if (tc_skip_sw(flags))
- goto errout;
+ goto err_replace_hw_filter;
else
err = 0;
}
}
- *arg = (unsigned long) f;
- rcu_assign_pointer(head->filter, f);
-
+ *arg = (unsigned long) head;
+ rcu_assign_pointer(tp->root, new);
+ if (head)
+ call_rcu(&head->rcu, mall_destroy_rcu);
return 0;
- errout:
+ err_replace_hw_filter:
+ err_set_parms:
- tcf_exts_destroy(&f->exts);
++ tcf_exts_destroy(&new->exts);
+ err_exts_init:
- kfree(f);
+ kfree(new);
return err;
}
^ permalink raw reply
* linux-next: manual merge of the block tree with the vfs tree
From: Stephen Rothwell @ 2017-02-02 2:44 UTC (permalink / raw)
To: Jens Axboe, Al Viro; +Cc: linux-next, linux-kernel, Christoph Hellwig
Hi Jens,
Today's linux-next merge of the block tree got a conflict in:
drivers/block/nbd.c
between commit:
c9f2b6aeb922 ("[nbd] pass iov_iter to nbd_xmit()")
from the vfs tree and commit:
09fc54ccc427 ("nbd: move request validity checking into nbd_send_cmd")
aebf526b53ae ("block: fold cmd_type into the REQ_OP_ space")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/block/nbd.c
index 48132b0530fe,0be84a3cb6d7..000000000000
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@@ -265,17 -275,32 +262,32 @@@ static int nbd_send_cmd(struct nbd_devi
u32 type;
u32 tag = blk_mq_unique_tag(req);
+ iov_iter_kvec(&from, WRITE | ITER_KVEC, &iov, 1, sizeof(request));
+
- if (req_op(req) == REQ_OP_DISCARD)
+ switch (req_op(req)) {
+ case REQ_OP_DISCARD:
type = NBD_CMD_TRIM;
- else if (req_op(req) == REQ_OP_FLUSH)
+ break;
+ case REQ_OP_FLUSH:
type = NBD_CMD_FLUSH;
- else if (rq_data_dir(req) == WRITE)
+ break;
+ case REQ_OP_WRITE:
type = NBD_CMD_WRITE;
- else
+ break;
+ case REQ_OP_READ:
type = NBD_CMD_READ;
+ break;
+ default:
+ return -EIO;
+ }
+
+ if (rq_data_dir(req) == WRITE &&
+ (nbd->flags & NBD_FLAG_READ_ONLY)) {
+ dev_err_ratelimited(disk_to_dev(nbd->disk),
+ "Write on read-only\n");
+ return -EIO;
+ }
- memset(&request, 0, sizeof(request));
- request.magic = htonl(NBD_REQUEST_MAGIC);
request.type = htonl(type);
if (type != NBD_CMD_FLUSH) {
request.from = cpu_to_be64((u64)blk_rq_pos(req) << 9);
^ permalink raw reply
* linux-next: build warning after merge of the akpm-current tree
From: Stephen Rothwell @ 2017-02-02 6:49 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Dave Jiang, Matthew Wilcox
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (powerpc
ppc64_defconfig and x86_64 allmodconfig) produced this warning:
fs/ext4/file.c:279:1: warning: 'ext4_dax_huge_fault' defined but not used [-Wunused-function]
ext4_dax_huge_fault(struct vm_fault *vmf)
^
Introduced by commit
80a841811260 ("mm,fs,dax: change ->pmd_fault to ->huge_fault")
Looks like the replacement in ext4_dax_vm_ops may be incorrect?
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for Feb 2
From: Stephen Rothwell @ 2017-02-02 7:21 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170201:
Dropped tree: vfs-miklos (build failure and out of date)
The vfs-miklos tree still had its build failure, so I just dropped it
again for today.
The v4l-dvb tree still had its build failure so I used the version from
next-20170130.
The net-next tree gained a conflict against Linus' tree.
The block tree gained a conflict against the vfs tree.
The regulator tree gained a build failure so I used the version from
next-20170131.
Non-merge commits (relative to Linus' tree): 6591
7242 files changed, 275702 insertions(+), 138958 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 (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 254 trees (counting Linus' and 36 trees of bug
fix patches pending for the current merge release).
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
$ git checkout master
$ git reset --hard stable
Merging origin/master (6d04dfc89660 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (566cf877a1fc Linux 4.10-rc6)
Merging arm-current/fixes (228dbbfb5d77 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (a0615a16f7d0 powerpc/mm: Use the correct pointer when setting a 2MB pte)
Merging sparc/master (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (6d04dfc89660 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
Merging netfilter/master (a47b70ea86bd ravb: unmap descriptors when freeing rings)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware)
Merging mac80211/master (115865fa0826 mac80211: don't try to sleep in rate_control_rate_init())
Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (030305d69fc6 PCI/ASPM: Handle PCI-to-PCIe bridges as roots of PCIe hierarchies)
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (a3683e0c1410 Merge tag 'usb-serial-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (d07830db1bdb USB: serial: pl2303: add ATEN device ID)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (b17c1bba9cec staging: greybus: timesync: validate platform state callback)
Merging char-misc.current/char-misc-linus (433e19cf33d3 Drivers: hv: vmbus: finally fix hv_need_to_signal_on_read())
Merging input-current/for-linus (601bbbe05173 Input: uinput - fix crash when mixing old and new init style)
Merging crypto-current/master (11e3b725cfc2 crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (2da64d20a0b2 vfio/spapr: Fix missing mutex unlock when creating a window)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging drm-intel-fixes/for-linux-next-fixes (566cf877a1fc Linux 4.10-rc6)
Merging drm-misc-fixes/for-linux-next-fixes (92c715fca907 drm/atomic: Fix double free in drm_atomic_state_default_clear)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (575746e2f79d ARCv2: IDU-intc: mask all common interrupts by default)
Merging arm/for-next (1ba318e23204 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (f6fbb582473b ARM: SoC: Document merges)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (dca8057e0936 Merge v4.11/dt64)
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (e514f82c67c1 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (f8e8eda32b4a Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (36dbd2631399 Merge branch 'omap-for-v4.11/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (9c96e7f72029 firmware: qcom: scm: Fix interrupted SCM calls)
Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (3ec3ba7ff83a Merge branch 'next/dt64' into for-next)
Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (49f6cba617fe arm64: handle sys and undef traps consistently)
Merging clk/clk-next (eaff16bc4988 clk: qcom: SDHCI enablement on Nexus 5X / 6P)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (bc53b7e567ab m68k/defconfig: amcore board defconfig tuning)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (26eb4aa9a48a Merge branch '4.10-fixes' into mips-for-linux-next)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (5de769bbfdfc arch/openrisc/lib/memcpy.c: use correct OR1200 option)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (0d0a4bc2a6f7 powerpc/mm: unstub radix__vmemmap_remove_mapping())
Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (ba21d0ea2189 s390/dasd: correct inconsistent indenting)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6e72293ab0e9 xtensa: fix noMMU build on cores with MMU)
Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (514f7d5f893f Merge branch 'for-next-next-v4.11-20170126' into for-next-20170126)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (f339620a6d00 CIFS: Allow to switch on encryption with seal mount option)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (70f16cef06b5 udf: allow implicit blocksize specification during mount)
Merging ext4/dev (224efa5c34a9 ext4: fix data corruption in data=journal mode)
Merging f2fs/dev (9b0d4b59b911 f2fs: declare missing static function)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
Merging gfs2/for-next (aacee72061a3 GFS2: Reduce contention on gfs2_log_lock)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (566cf877a1fc Linux 4.10-rc6)
Merging nfsd/nfsd-next (42e24662a806 nfsd: special case truncates some more)
Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code)
Merging overlayfs/overlayfs-next (97e147358bea vfs: wrap write f_ops with file_{start,end}_write())
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (e0d76fa4475e xfs: prevent quotacheck from overloading inode lru)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (b12826c5188e Merge branch 'vfs-ovl' into next)
CONFLICT (content): Merge conflict in fs/read_write.c
CONFLICT (content): Merge conflict in fs/overlayfs/dir.c
CONFLICT (content): Merge conflict in fs/overlayfs/copy_up.c
$ git reset --hard HEAD^
Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
Merging pci/next (83a96ebd0efa Merge branch 'pci/host-thunder' into next)
Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
Merging hid/for-next (5fae1fbb3793 Merge branch 'for-4.10/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f4d9f6fbbf57 Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (248c3398aae1 hwmon: Relax name attribute validation for new APIs)
Merging jc_docs/docs-next (028f25332c4f docs: Convert the regulator docbook to RST)
Merging v4l-dvb/master (61e0654cf079 Merge branch 'patchwork' into to_next)
$ git reset --hard HEAD^
Merging next-20170130 version of v4l-dvb
Merging fbdev/fbdev-for-next (561eb9d09a93 fbdev: omap/lcd: Make callbacks optional)
Merging pm/linux-next (0ea7febc7c4f Merge branch 'acpi-ec' into linux-next)
CONFLICT (content): Merge conflict in arch/mips/configs/lemote2f_defconfig
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (7b09ae6042cd Merge branches 'ida-conversion' and 'for-rc' into next)
Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (f1225ee4c8fc swiotlb-xen: update dev_addr after swapping pages)
Merging net-next/master (62e13097c46c net: phy: broadcom: rehook BCM54612E specific init)
CONFLICT (content): Merge conflict in net/sched/cls_matchall.c
CONFLICT (content): Merge conflict in drivers/net/hyperv/netvsc.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/macb.h
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (1995876a06bc xfrm: Add a dummy network device for napi.)
Merging netfilter-next/master (1a28ad74ebd8 netfilter: nf_tables: eliminate useless condition checks)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (7243a1af37a4 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (264e6777f958 Merge branch 'netvsc-enhancements')
Merging mac80211-next/master (228c8c6b1f43 wireless: define cipher/AKM suites using a macro)
Merging rdma/for-next (24dc831b77ec IB/core: Add inline function to validate port)
Merging rdma-leon/rdma-next (05fde561e028 Merge branch 'topic/core-for-4.11' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging nand/nand/next (07f76443ef81 mtd: nand: mediatek: remove redundant dev_err call in mtk_nfc_probe())
Merging spi-nor/next (8bb6059f038c Documentation: mtk-quadspi: update DT bindings)
Merging crypto/master (7dede913fc2a crypto: vmx - disable preemption to enable vsx in aes_ctr.c)
Merging drm/drm-next (18566acac18f Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
CONFLICT (content): Merge conflict in include/drm/drm_connector.h
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.c
Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays)
Merging drm-intel/for-linux-next (18566acac18f Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
Merging drm-misc/for-linux-next (4078f5757144 drm/vc4: Add DSI driver)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
Merging sunxi/sunxi/for-next (e24f5ead1d61 Merge branch 'sunxi/dt64-for-4.11' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
Merging kspp/for-next/kspp (ffa3140e4264 initify: Mark functions with the __unverified_nocapture attribute)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (fc28ab1882b5 sound: oss/ad1848: remove some dead code)
Merging sound-asoc/for-next (67f8cef57752 Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (7598d167df99 livepatch/module: print notice of TAINT_LIVEPATCH)
Merging input/next (5ec69524d430 Input: joydev - use clamp() macro)
Merging block/for-next (feacec9897f8 Merge branch 'for-4.11/next' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (15f5ace6cf7f mmc: core: switch to ida_simple_ functions in block.c)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (1b4c4139722b Documentation: move MD related doc into a separate dir)
Merging mfd/for-mfd-next (197ac6d28fce MAINTAINERS: Add include/dt-bindings/mfd to MFD entry)
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (105ca48d8c7e Merge remote-tracking branches 'regulator/topic/rc5t583', 'regulator/topic/rn5t618', 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
$ git reset --hard HEAD^
Merging next-20170131 version of regulator
Merging security/next (20f482ab9e0f ima: allow to check MAY_APPEND)
Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging tpmdd/next (3b7b3428eff7 tpm: add securityfs support for TPM 2.0 firmware event log)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (66452a2d5f8f Merge branches 'iommu/fixes', 'arm/exynos', 'arm/smmu', 'arm/core', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (62bc306e2083 audit: log 32-bit socketcalls)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (8cf4664332d3 dt-bindings: power: reset: qnap-poweroff: Drop reference to pm_power_off)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (3f87493930a0 Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (5bf728f02218 Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (1bd9900b8301 EDAC, amd64: Add x86cpuid sanity check during init)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (b9b0c831bed2 ftrace: Convert graph filter to use hash tables)
Merging rcu/rcu/next (ea27eef0c920 lockdep: Use "WARNING" tag on lockdep splats)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Applying: smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging kvm/linux-next (0b4c208d443b Revert "KVM: nested VMX: disable perf cpuid reporting")
Merging kvm-arm/next (9d93dc1c96ec arm/arm64: KVM: Get rid of KVM_MEMSLOT_INCOHERENT)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (050f23390f6b KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV)
Merging kvms390/next (a8c39dd77cb9 KVM: s390: Add debug logging to basic cpu model interface)
Merging xen-tip/linux-next (cc272163ea55 x86/xen: Fix APIC id mismatch warning on Intel)
Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (9eeda3897a85 platform/x86: add support for devices with Silead touchscreens)
CONFLICT (content): Merge conflict in drivers/platform/x86/intel_mid_powerbtn.c
CONFLICT (content): Merge conflict in drivers/platform/x86/fujitsu-laptop.c
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (8bb1de680dac tools/leds: Add led_hw_brightness_mon program)
Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
Merging driver-core/driver-core-next (64e90a8acb85 Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper())
Merging tty/tty-next (bc2be239feef serial: imx: Fix the CTS_B polarity in RS485 mode)
Merging usb/usb-next (4f8c483ab4e9 Merge tag 'phy-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (c528fcb116e6 USB: serial: keyspan_pda: fix receive sanity checks)
Merging usb-chipidea-next/ci-for-usb-next (30a9566a4f60 usb: chipidea: usb2: delete the redundant setting default DMA mask code)
Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
Merging staging/staging-next (203804300820 staging: vc04_services: Make vchi_msg_queue static)
CONFLICT (modify/delete): drivers/staging/greybus/timesync_platform.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/greybus/timesync_platform.c left in tree.
$ git rm -f drivers/staging/greybus/timesync_platform.c
Merging char-misc/char-misc-next (cadf8106661c doc: convert UIO howto from docbook to sphinx)
CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
Merging extcon/extcon-next (8ea227886002 extcon: arizona: Wait for any running HPDETs to complete on jack removal)
Merging slave-dma/next (69a875aef693 Merge branch 'for-linus' into next)
Merging cgroup/for-next (769a3d317959 Merge branch 'for-4.11' into for-next)
Merging scsi/for-next (2340d775b189 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (86e6828a8aed scsi: scsi_debug: Add OPTIMAL TRANSFER LENGTH GRANULARITY option.)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (300af14bdb28 qla2xxx: Disable out-of-order processing by default in firmware)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (ec4537a7d64f pci: drop link_reset)
Merging rpmsg/for-next (5029eb953682 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (f334eae9c4e9 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/staging/greybus/gpio.c
Merging pinctrl/for-next (2039834c86f3 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (4651209c75d1 Merge branch 'for-4.11/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (93faccbbfa95 fs: Better permission checking for submounts)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (c440408cf690 random: convert get_random_int/long into get_random_u32/u64)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1e4c2830c369 selftest: cpufreq: Add special tests)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
Merging rtc/rtc-next (4c6106406eb1 rtc: sun6i: Fix compatibility with old DT binding)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (1f19b983a887 libnvdimm, namespace: fix pmem namespace leak, delete when size set to zero)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging extable/extable (24bf9bdef929 module.h: remove extable.h include now users have migrated)
Merging idr/idr-4.11 (39272ecab724 radix-tree: Store a pointer to the root in each node)
Merging akpm-current/current (a45b7bed123e ipc/mqueue: add missing sparse annotation)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Merging akpm/master (baf780ec544e mm: clarify mm_struct.mm_{users,count} documentation)
^ permalink raw reply
* RE: linux-next: manual merge of the net-next tree with Linus' tree
From: Yotam Gigi @ 2017-02-02 8:40 UTC (permalink / raw)
To: Stephen Rothwell, David Miller, Networking
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20170202124944.6c3fd4f4@canb.auug.org.au>
>-----Original Message-----
>From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] On
>Behalf Of Stephen Rothwell
>Sent: Thursday, February 02, 2017 3:50 AM
>To: David Miller <davem@davemloft.net>; Networking <netdev@vger.kernel.org>
>Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Yotam Gigi
><yotamg@mellanox.com>
>Subject: linux-next: manual merge of the net-next tree with Linus' tree
>
>Hi all,
>
>Today's linux-next merge of the net-next tree got a conflict in:
>
> net/sched/cls_matchall.c
>
>between commit:
>
> fd62d9f5c575 ("net/sched: matchall: Fix configuration race")
>
>from Linus' tree and commit:
>
> ec2507d2a306 ("net/sched: cls_matchall: Fix error path")
>
>from the net-next tree.
>
>I fixed it up (see below) and can carry the fix as necessary. This
>is now fixed as far as linux-next is concerned, but any non trivial
>conflicts should be mentioned to your upstream maintainer when your tree
>is submitted for merging. You may also want to consider cooperating
>with the maintainer of the conflicting tree to minimise any particularly
>complex conflicts.
Looks good. Thanks!
>
>--
>Cheers,
>Stephen Rothwell
>
>diff --cc net/sched/cls_matchall.c
>index b12bc2abea93,fcecf5aac666..000000000000
>--- a/net/sched/cls_matchall.c
>+++ b/net/sched/cls_matchall.c
>@@@ -118,19 -141,24 +118,24 @@@ static int mall_set_parms(struct net *n
> struct tcf_exts e;
> int err;
>
>- tcf_exts_init(&e, TCA_MATCHALL_ACT, 0);
>+ err = tcf_exts_init(&e, TCA_MATCHALL_ACT, 0);
>+ if (err)
>+ return err;
> err = tcf_exts_validate(net, tp, tb, est, &e, ovr);
> if (err < 0)
>- return err;
>+ goto errout;
>
> if (tb[TCA_MATCHALL_CLASSID]) {
> - f->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]);
> - tcf_bind_filter(tp, &f->res, base);
> + head->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]);
> + tcf_bind_filter(tp, &head->res, base);
> }
>
> - tcf_exts_change(tp, &f->exts, &e);
> + tcf_exts_change(tp, &head->exts, &e);
>
> return 0;
>+ errout:
>+ tcf_exts_destroy(&e);
>+ return err;
> }
>
> static int mall_change(struct net *net, struct sk_buff *in_skb,
>@@@ -162,39 -194,43 +167,44 @@@
> return -EINVAL;
> }
>
> - f = kzalloc(sizeof(*f), GFP_KERNEL);
> - if (!f)
> + new = kzalloc(sizeof(*new), GFP_KERNEL);
> + if (!new)
> return -ENOBUFS;
>
>- tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0);
> - err = tcf_exts_init(&f->exts, TCA_MATCHALL_ACT, 0);
>++ err = tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0);
>+ if (err)
>+ goto err_exts_init;
>
> if (!handle)
> handle = 1;
> - f->handle = handle;
> - f->flags = flags;
> + new->handle = handle;
> + new->flags = flags;
>
> - err = mall_set_parms(net, tp, f, base, tb, tca[TCA_RATE], ovr);
> + err = mall_set_parms(net, tp, new, base, tb, tca[TCA_RATE], ovr);
> if (err)
>- goto errout;
>+ goto err_set_parms;
>
> if (tc_should_offload(dev, tp, flags)) {
> - err = mall_replace_hw_filter(tp, f, (unsigned long) f);
> + err = mall_replace_hw_filter(tp, new, (unsigned long) new);
> if (err) {
> if (tc_skip_sw(flags))
>- goto errout;
>+ goto err_replace_hw_filter;
> else
> err = 0;
> }
> }
>
> - *arg = (unsigned long) f;
> - rcu_assign_pointer(head->filter, f);
> -
> + *arg = (unsigned long) head;
> + rcu_assign_pointer(tp->root, new);
> + if (head)
> + call_rcu(&head->rcu, mall_destroy_rcu);
> return 0;
>
>- errout:
>+ err_replace_hw_filter:
>+ err_set_parms:
> - tcf_exts_destroy(&f->exts);
>++ tcf_exts_destroy(&new->exts);
>+ err_exts_init:
> - kfree(f);
> + kfree(new);
> return err;
> }
>
^ permalink raw reply
* next-20170202 build: 4 failures 7 warnings (next-20170202)
From: Build bot for Mark Brown @ 2017-02-02 10:23 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170202
Git describe: next-20170202
Commit: c356cf7a65 Add linux-next specific files for 20170202
Build Time: 94 min 58 sec
Passed: 6 / 10 ( 60.00 %)
Failed: 4 / 10 ( 40.00 %)
Errors: 4
Warnings: 7
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allnoconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
arm-allnoconfig
../mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
../mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
arm-allmodconfig
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : x86_64-allnoconfig
1 warnings 0 mismatches : arm64-allnoconfig
1 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
5 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Errors summary: 4
2 ../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
1 ../mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
1 ../mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
1 ../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
Warnings Summary: 7
3 ../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
1 ../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/ext4/file.c:279:1: warning: 'ext4_dax_huge_fault' defined but not used [-Wunused-function]
1 ../fs/cifs/smb2ops.c:2008:16: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t {aka unsigned int}' [-Wformat=]
1 ../fs/cifs/smb2ops.c:2008:16: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'size_t {aka unsigned int}' [-Wformat=]
1 ../fs/cifs/cifs_debug.h:55:24: warning: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'size_t {aka unsigned int}' [-Wformat=]
1 ../drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:815:40: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
x86_64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 1 errors, 1 warnings, 0 section mismatches
Errors:
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
Warnings:
../fs/ext4/file.c:279:1: warning: 'ext4_dax_huge_fault' defined but not used [-Wunused-function]
-------------------------------------------------------------------------------
arm-allnoconfig : FAIL, 2 errors, 1 warnings, 0 section mismatches
Errors:
../mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
../mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 2 errors, 5 warnings, 0 section mismatches
Errors:
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
Warnings:
../fs/cifs/cifs_debug.h:55:24: warning: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'size_t {aka unsigned int}' [-Wformat=]
../fs/cifs/smb2ops.c:2008:16: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'size_t {aka unsigned int}' [-Wformat=]
../fs/cifs/smb2ops.c:2008:16: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t {aka unsigned int}' [-Wformat=]
../drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:815:40: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm-multi_v4t_defconfig
x86_64-defconfig
arm-multi_v7_defconfig
arm-multi_v5_defconfig
arm64-defconfig
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Peter Zijlstra @ 2017-02-02 15:55 UTC (permalink / raw)
To: Ross Zwisler
Cc: Mike Galbraith, Sachin Sant, Matt Fleming, Michael Ellerman,
linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, LKML
In-Reply-To: <CAOxpaSW_GnndoxLBPtyTrqPJ9XOWvgXOQNDf8D+6OohWeObn5Q@mail.gmail.com>
On Tue, Jan 31, 2017 at 10:22:47AM -0700, Ross Zwisler wrote:
> On Tue, Jan 31, 2017 at 4:48 AM, Mike Galbraith <efault@gmx.de> wrote:
> > On Tue, 2017-01-31 at 16:30 +0530, Sachin Sant wrote:
Could some of you test this? It seems to cure things in my (very)
limited testing.
---
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 96e4ccc..b773821 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5609,7 +5609,7 @@ static void migrate_tasks(struct rq *dead_rq)
{
struct rq *rq = dead_rq;
struct task_struct *next, *stop = rq->stop;
- struct rq_flags rf, old_rf;
+ struct rq_flags rf;
int dest_cpu;
/*
@@ -5628,7 +5628,9 @@ static void migrate_tasks(struct rq *dead_rq)
* class method both need to have an up-to-date
* value of rq->clock[_task]
*/
+ rq_pin_lock(rq, &rf);
update_rq_clock(rq);
+ rq_unpin_lock(rq, &rf);
for (;;) {
/*
@@ -5641,7 +5643,7 @@ static void migrate_tasks(struct rq *dead_rq)
/*
* pick_next_task assumes pinned rq->lock.
*/
- rq_pin_lock(rq, &rf);
+ rq_repin_lock(rq, &rf);
next = pick_next_task(rq, &fake_task, &rf);
BUG_ON(!next);
next->sched_class->put_prev_task(rq, next);
@@ -5670,13 +5672,6 @@ static void migrate_tasks(struct rq *dead_rq)
continue;
}
- /*
- * __migrate_task() may return with a different
- * rq->lock held and a new cookie in 'rf', but we need
- * to preserve rf::clock_update_flags for 'dead_rq'.
- */
- old_rf = rf;
-
/* Find suitable destination for @next, with force if needed. */
dest_cpu = select_fallback_rq(dead_rq->cpu, next);
@@ -5685,7 +5680,6 @@ static void migrate_tasks(struct rq *dead_rq)
raw_spin_unlock(&rq->lock);
rq = dead_rq;
raw_spin_lock(&rq->lock);
- rf = old_rf;
}
raw_spin_unlock(&next->pi_lock);
}
^ permalink raw reply related
* Re: linux-next: Tree for Feb 2 (drivers/md/dm.c)
From: Randy Dunlap @ 2017-02-02 17:58 UTC (permalink / raw)
To: Stephen Rothwell, linux-next
Cc: linux-kernel, dm, Mike Snitzer, Alasdair G Kergon
In-Reply-To: <20170202182117.73e354f1@canb.auug.org.au>
On 02/01/17 23:21, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20170201:
>
on x86_64:
drivers/built-in.o: In function `dm_blk_ioctl':
dm.c:(.text+0x1a5121): undefined reference to `scsi_verify_blk_ioctl'
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_BSGLIB is not set
--
~Randy
^ permalink raw reply
* Re: linux-next: Tree for Feb 2 (drivers/md/dm.c)
From: Mike Snitzer @ 2017-02-02 18:29 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, linux-kernel, dm, Alasdair G Kergon,
hch
In-Reply-To: <8a8224e7-4c90-7fa7-9960-fc04fe658014@infradead.org>
On Thu, Feb 02 2017 at 12:58pm -0500,
Randy Dunlap <rdunlap@infradead.org> wrote:
> On 02/01/17 23:21, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20170201:
> >
>
> on x86_64:
>
> drivers/built-in.o: In function `dm_blk_ioctl':
> dm.c:(.text+0x1a5121): undefined reference to `scsi_verify_blk_ioctl'
Are you trying to say that this happens using a certain .config?
Also, not sure why you didn't cc Christoph (or Jens) seeing as these
changes are _not_ staged in linux-next by linux-dm.git.
^ permalink raw reply
* Re: [dm-devel] linux-next: Tree for Feb 2 (drivers/md/dm.c)
From: Christoph Hellwig @ 2017-02-02 18:44 UTC (permalink / raw)
To: Mike Snitzer
Cc: Randy Dunlap, Stephen Rothwell, linux-kernel, hch, dm, linux-next,
Alasdair G Kergon, Paolo Bonzini
In-Reply-To: <20170202182916.GA26910@redhat.com>
On Thu, Feb 02, 2017 at 01:29:16PM -0500, Mike Snitzer wrote:
> Are you trying to say that this happens using a certain .config?
>
> Also, not sure why you didn't cc Christoph (or Jens) seeing as these
> changes are _not_ staged in linux-next by linux-dm.git.
No changes to dm caused this, it was me making the SCSI ioctl / request
code optional. The tree apparently has nothing pulling in the SCSI
ioctls (SCSI, IDE, virtio, cciss, target, cdrom, etc). It turns
out DM calls the SCSI ioctl verification functions, despite never
actually using SCSIO ioctls directly, which looks very odd (and which is
why I missed it).
Git-blame for these lines pointes to ... me. Heh. But I just moved the
code around, before that every target had a copy of it. The original
calls seem to come from:
ec8013bedd ("dm: do not forward ioctls from logical volumes to the
underlying device"),
The trivial fix would be to add a select of the SCSI_REQUEST symbol
to dm, but my gut feeling teels me the call is simply wrong, and
should be removed and instead all ioctls on DM devices that don't
map to a full underlying devices should be rejected.
^ permalink raw reply
* Re: [dm-devel] linux-next: Tree for Feb 2 (drivers/md/dm.c)
From: Paolo Bonzini @ 2017-02-02 20:19 UTC (permalink / raw)
To: Christoph Hellwig, Mike Snitzer
Cc: Randy Dunlap, Stephen Rothwell, linux-kernel, dm, linux-next,
Alasdair G Kergon
In-Reply-To: <20170202184409.GA27869@infradead.org>
On 02/02/2017 10:44, Christoph Hellwig wrote:
> ec8013bedd ("dm: do not forward ioctls from logical volumes to the
> underlying device"),
>
> The trivial fix would be to add a select of the SCSI_REQUEST symbol
> to dm, but my gut feeling teels me the call is simply wrong, and
> should be removed and instead all ioctls on DM devices that don't
> map to a full underlying devices should be rejected.
I would certainly be fine with that. It would not be surprising if
something broke, but a middle ground could be to allow all ioctls if you
have CAP_SYS_RAWIO and none if you don't.
Paolo
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Matt Fleming @ 2017-02-02 22:01 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Ross Zwisler, Mike Galbraith, Sachin Sant, Michael Ellerman,
linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, LKML
In-Reply-To: <20170202155506.GX6515@twins.programming.kicks-ass.net>
On Thu, 02 Feb, at 04:55:06PM, Peter Zijlstra wrote:
> On Tue, Jan 31, 2017 at 10:22:47AM -0700, Ross Zwisler wrote:
> > On Tue, Jan 31, 2017 at 4:48 AM, Mike Galbraith <efault@gmx.de> wrote:
> > > On Tue, 2017-01-31 at 16:30 +0530, Sachin Sant wrote:
>
>
> Could some of you test this? It seems to cure things in my (very)
> limited testing.
I haven't tested it but this looks like the correct fix to me.
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
^ permalink raw reply
* linux-next: manual merge of the powerpc tree with the powerpc-fixes tree
From: Stephen Rothwell @ 2017-02-02 22:04 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, PowerPC
Cc: linux-next, linux-kernel, Anton Blanchard
Hi all,
Today's linux-next merge of the powerpc tree got a conflict in:
arch/powerpc/Kconfig
between commit:
f2574030b0e3 ("powerpc: Revert the initial stack protector support")
from the powerpc-fixes tree and commit:
d6c569b99558 ("powerpc/64: Move HAVE_CONTEXT_TRACKING from pseries to common Kconfig")
from the powerpc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/Kconfig
index a46d1c0d14d3,33f5b8380a7d..000000000000
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -164,9 -164,11 +164,10 @@@ config PP
select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE
select HAVE_ARCH_HARDENED_USERCOPY
select HAVE_KERNEL_GZIP
- select HAVE_CC_STACKPROTECTOR
+ select HAVE_CONTEXT_TRACKING if PPC64
config GENERIC_CSUM
- def_bool CPU_LITTLE_ENDIAN
+ def_bool n
config EARLY_PRINTK
bool
^ permalink raw reply
* Re: linux-next: build failure after merge of the v4l-dvb tree
From: Stephen Rothwell @ 2017-02-02 22:24 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, linux-kernel, Sean Young
In-Reply-To: <20170131115505.3f8c769b@canb.auug.org.au>
Hi Mauro,
On Tue, 31 Jan 2017 11:55:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the v4l-dvb tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from arch/arm/mach-omap2/pdata-quirks.c:15:0:
> arch/arm/mach-omap2/pdata-quirks.c:536:49: error: 'rx51_lirc_data' undeclared here (not in a function)
> OF_DEV_AUXDATA("nokia,n900-ir", 0, "n900-ir", &rx51_lirc_data),
> ^
> include/linux/of_platform.h:52:21: note: in definition of macro 'OF_DEV_AUXDATA'
> .platform_data = _pdata }
> ^
>
> Caused by commit
>
> a92def1becf3 ("[media] ir-rx51: port to rc-core")
>
> I have used the v4l-dvb tree from next-20170130 for today.
I am still getting this error.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the regulator tree
From: Stephen Rothwell @ 2017-02-02 22:30 UTC (permalink / raw)
To: Mark Brown; +Cc: Liam Girdwood, linux-next, linux-kernel, Bhumika Goyal
In-Reply-To: <20170201100343.yv5e66pxkdmlnoxm@sirena.org.uk>
Hi Mark,
On Wed, 1 Feb 2017 10:03:43 +0000 Mark Brown <broonie@kernel.org> wrote:
>
> On Wed, Feb 01, 2017 at 01:42:21PM +1100, Stephen Rothwell wrote:
>
> > Caused by commit
> >
> > 524d339a9d6b ("regulator: anatop-regulator: constify regulator_ops structure")
> >
> > I can only assume that this patch has been rebased since it was tested.
>
> Discarded that commit.
The patch is still there ...
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the vfs-miklos tree with the overlayfs tree and build failure
From: Stephen Rothwell @ 2017-02-02 22:34 UTC (permalink / raw)
To: Miklos Szeredi; +Cc: linux-next, linux-kernel, Amir Goldstein
In-Reply-To: <20170131111656.3e77663b@canb.auug.org.au>
Hi Miklos,
On Tue, 31 Jan 2017 11:16:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs-miklos tree got a conflict in:
>
> fs/read_write.c
>
> between commit:
>
> 97e147358bea ("vfs: wrap write f_ops with file_{start,end}_write()")
>
> from the overlayfs tree and various duplicated patches between v4.10-rc1
> and the vfs-miklos tree.
>
> Please clean up the vfs-miklos tree.
>
> I fixed it up (I just used the former) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
>
> I then got this build failure from my arm multi_v7_defconfig build:
>
> In file included from /home/sfr/next/next/include/linux/seq_file.h:10:0,
> from /home/sfr/next/next/include/linux/pinctrl/consumer.h:17,
> from /home/sfr/next/next/include/linux/pinctrl/devinfo.h:21,
> from /home/sfr/next/next/include/linux/device.h:24,
> from /home/sfr/next/next/include/linux/dma-mapping.h:6,
> from /home/sfr/next/next/arch/arm/kernel/asm-offsets.c:16:
> /home/sfr/next/next/include/linux/fs.h:2566:19: error: redefinition of 'do_clone
> _file_range'
> static inline int do_clone_file_range(struct file *file_in, loff_t pos_in,
> ^
> /home/sfr/next/next/include/linux/fs.h:1743:19: note: previous definition of 'do_clone_file_range' was here
> static inline int do_clone_file_range(struct file *file_in, loff_t pos_in,
> ^
>
> so I decided to just drop the vfs-miklos tree for today.
This mess is still there ...
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the v4l-dvb tree
From: Mauro Carvalho Chehab @ 2017-02-02 22:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Sean Young
In-Reply-To: <20170203092446.7e86e8af@canb.auug.org.au>
Em Fri, 3 Feb 2017 09:24:46 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> Hi Mauro,
>
> On Tue, 31 Jan 2017 11:55:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the v4l-dvb tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > In file included from arch/arm/mach-omap2/pdata-quirks.c:15:0:
> > arch/arm/mach-omap2/pdata-quirks.c:536:49: error: 'rx51_lirc_data' undeclared here (not in a function)
> > OF_DEV_AUXDATA("nokia,n900-ir", 0, "n900-ir", &rx51_lirc_data),
> > ^
> > include/linux/of_platform.h:52:21: note: in definition of macro 'OF_DEV_AUXDATA'
> > .platform_data = _pdata }
> > ^
> >
> > Caused by commit
> >
> > a92def1becf3 ("[media] ir-rx51: port to rc-core")
> >
> > I have used the v4l-dvb tree from next-20170130 for today.
>
> I am still getting this error.
Gah, forgot to push the fix on the -next branch. Should be ok now.
Regards,
Mauro
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox