On Mon, Oct 12, 2015 at 10:30 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi all, > > Changes since 20151009: > > My fixes tree is empty again. > > The qcom tree gained a conflict against the arm-soc tree. > > I used the h8300 tree from next-20150828 since the current tree has been > rebased onto linux-next again :-( > > The battery tree still had its build failure so I used the version from > next-20150925. > > The jd_docs tree gained a conflict against Linus' tree. > > The tip tree gained a conflict against the crypto tree. > > The dwmw2-iommu tree gained a build failure for which I applied a fix > patch. > > Non-merge commits (relative to Linus' tree): 6262 > 4975 files changed, 261524 insertions(+), 107871 deletions(-) > With CLANG v3.7 I see this... LD init/built-in.o mm/built-in.o: In function `kmem_cache_alloc': (.text+0x754ec): undefined reference to `__compiletime_assert_3240' mm/built-in.o: In function `kmem_cache_alloc_bulk': (.text+0x758c1): undefined reference to `__compiletime_assert_3240' mm/built-in.o: In function `kmem_cache_alloc_trace': (.text+0x75ace): undefined reference to `__compiletime_assert_3240' mm/built-in.o: In function `__kmalloc': (.text+0x764a7): undefined reference to `__compiletime_assert_3240' mm/built-in.o: In function `__kmalloc_track_caller': (.text+0x76756): undefined reference to `__compiletime_assert_3240' mm/built-in.o: In function `kmem_cache_free': (.text+0x769d0): undefined reference to `__compiletime_assert_3565' mm/built-in.o: In function `kmem_cache_free_bulk': (.text+0x76caa): undefined reference to `__compiletime_assert_3565' make[2]: *** [vmlinux] Error 1 Any help appreciated. - Sedat - > ---------------------------------------------------------------------------- > > I have created today's linux-next tree at > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git > (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you > are tracking the linux-next tree using git, you should not use "git pull" > to do so as that will try to merge the new linux-next release with the > old one. You should use "git fetch" and checkout or reset to the new > master. > > You can see which trees have been included by looking in the Next/Trees > file in the source. There are also quilt-import.log and merge.log > files in the Next directory. Between each merge, the tree was built > with a ppc64_defconfig for powerpc and an allmodconfig for x86_64, > a multi_v7_defconfig for arm and a native build of tools/perf. After > the final fixups (if any), it is also built with powerpc allnoconfig > (32 and 64 bit), ppc44x_defconfig, allyesconfig (this fails its final > link) and pseries_le_defconfig and i386, sparc, sparc64 and arm defconfig. > > Below is a summary of the state of the merge. > > I am currently merging 228 trees (counting Linus' and 34 trees of patches > pending for Linus' tree). > > Stats about the size of the tree over time can be seen at > http://neuling.org/linux-next-size.html . > > Status of my local build tests will be at > http://kisskb.ellerman.id.au/linux-next . If maintainers want to give > advice about cross compilers/configs that work, we are always open to add > more builds. > > Thanks to Randy Dunlap for doing many randconfig builds. And to Paul > Gortmaker for triage and bug fixes. > > -- > Cheers, > Stephen Rothwell sfr@xxxxxxxxxxxxxxxx > > $ git checkout master > $ git reset --hard stable > Merging origin/master (25cb62b76430 Linux 4.3-rc5) > Merging fixes/master (25cb62b76430 Linux 4.3-rc5) > Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) > Merging arc-current/for-curr (049e6dde7e57 Linux 4.3-rc4) > Merging arm-current/fixes (868e87ccda24 ARM: make RiscPC depend on MMU) > Merging m68k-current/for-linus (95bc06ef049b m68k/defconfig: Update defconfigs for v4.3-rc1) > Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) > Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) > Merging powerpc-fixes/fixes (4108efb02daa cxl: Fix number of allocated pages in SPA) > Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) > Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave) > Merging net/master (9ef2e965e554 ipv6: drop frames with attached skb->sk in forwarding) > Merging ipsec/master (4e077237cfb6 xfrm: Fix state threshold configuration from userspace) > Merging ipvs/master (6ece90f9a13e netfilter: fix Kconfig dependencies for nf_dup_ipv{4,6}) > Merging sound-current/for-linus (601d62959d08 Merge tag 'asoc-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) > Merging pci-current/for-linus (1266963170f5 PCI: Prevent out of bounds access in numa_node override) > Merging wireless-drivers/master (de28a05ee28e Merge tag 'iwlwifi-for-kalle-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) > Merging driver-core.current/driver-core-linus (9ffecb102835 Linux 4.3-rc3) > Merging tty.current/tty-linus (0c5562716787 drivers/tty: require read access for controlling terminal) > Merging usb.current/usb-linus (72194739f546 usb: Add device quirk for Logitech PTZ cameras) > Merging usb-gadget-fixes/fixes (f5f6afa85aa8 usb: renesas_usbhs: Add support for R-Car H3) > Merging usb-serial-fixes/usb-linus (049e6dde7e57 Linux 4.3-rc4) > Merging staging.current/staging-linus (b1d562acc78f staging: speakup: fix speakup-r regression) > Merging char-misc.current/char-misc-linus (41ada9df7f34 mcb: Fix error handling in mcb_pci_probe()) > Merging input-current/for-linus (879f2fea8a5a Input: ads7846 - correct the value got from SPI) > Merging crypto-current/master (92b279070dd6 crypto: camellia_aesni_avx - Fix CPU feature checks) > Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) > Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) > Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr()) > Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue) > Merging kselftest-fixes/fixes (ae7858180510 selftests: exec: revert to default emit rule) > 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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) > Merging drm-intel-fixes/for-linux-next-fixes (049e6dde7e57 Linux 4.3-rc4) > Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) > Merging arc/for-next (65b8cd090715 ARC: smp: rework boot kick/wait code for non Halt-on-reset case) > Merging arm/for-next (4b07b838b432 Merge branches 'drm-dwhdmi-devel', 'drm-tda998x-devel2' and 'drm-armada-devel' into for-next) > Merging arm-perf/for-next/perf (6ff33f3902c3 Linux 4.3-rc1) > Merging arm-soc/for-next (de2d0516caa9 Merge branches 'next/fixes-non-critical', 'next/dt', 'next/defconfig' and 'next/drivers' into for-next) > Merging at91/at91-next (5ccea17e1ab3 Merge branch 'at91-4.4-defconfig' into at91-next) > Merging bcm2835/for-next (b2776bf7149b Linux 3.18) > Merging berlin/berlin/for-next (99c5d7234cf2 Merge branch 'berlin64/soc' into berlin/for-next) > Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) > Merging imx-mxs/for-next (e82731e47607 Merge branch 'imx/defconfig' into for-next) > Merging keystone/next (afef8d3343d1 Merge branch 'for_4.4/dts' into next) > Merging mvebu/for-next (9c607a2eb1ae Merge branch 'mvebu/dt' into mvebu/for-next) > Merging omap/for-next (9a5e3f27d1b8 ARM: dts: fix omap2+ address translation for pbias) > Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) > CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c > CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c > Merging qcom/qcom/for-next (1e2f070bd794 ARM: dts: msm8974: Add SCM firmware node) > CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig > Merging renesas/next (9e55098586e6 Merge branch 'heads/dt-for-v4.4' into next) > Merging rockchip/for-next (6d8f20eaef98 Merge branch 'v4.4-armsoc/drivers' into for-next) > Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) > Merging samsung/for-next (54565c4e1bbb Merge branch 'v4.4-next/dt-samsung' into for-next) > Merging samsung-krzk/for-next (13878355b88a Merge branch 'samsung-fixes' into for-next) > Merging sunxi/sunxi/for-next (88e817c8f647 Merge branches 'sunxi/dt-for-4.4' and 'sunxi/drivers-for-4.4' into sunxi/for-next) > Merging tegra/for-next (84529095fefd Merge branch for-4.4/defconfig into for-next) > Merging arm64/for-next/core (217d453d473c arm64: fix a migrating irq bug when hotplug cpu) > Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) > Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) > Merging cris/for-next (d81a922cf21f CRIS: Drop code related to obsolete or unused kconfigs) > Merging h8300/h8300-next (99bcfda85f66 Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time") > Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") > Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next) > Merging m68k/for-next (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address) > Merging m68knommu/for-next (a8dcf707ae27 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU) > Merging metag/for-next (3fe6942f0486 Documentation/features/vm: Meta2 is capable of THP) > Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header) > Merging mips/mips-for-linux-next (bdb232890472 Merge branch '4.3-fixes' into mips-for-linux-next) > Merging nios2/for-next (8840da98bfec nios2: Switch to generic __xchg()) > Merging parisc-hd/for-next (64291f7db5bd Linux 4.2) > Merging powerpc/next (2adc48a69186 powerpc: Add ppc64le_defconfig) > Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) > Merging fsl/next (4524cd093fa8 powerpc/t1023rdb/dts: set ifc nand chip select from 2 to 1) > Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) > Merging s390/features (2130eeefadb5 s390/sclp: avoid merged message output) > Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) > Merging tile/master (dfd51f97823e tile/jump_label: add jump label support for TILE-Gx) > Merging uml/linux-next (bdbac7d0e2b3 um: Fix kernel mode fault condition) > Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) > Merging xtensa/for_next (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing) > Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled) > Merging ceph/master (8dbd263de1cb ceph: improve readahead for file holes) > Merging cifs/for-next (c6fa8e6de3dc Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) > Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) > Merging ext3/for_next (d4eb6dee4712 ext4: Update EXT4_USE_FOR_EXT2 description) > Merging ext4/dev (1c4b54e369dc ext4: use private version of page_zero_new_buffers() for data=journal mode) > Merging f2fs/dev (d237bc0389e9 f2fs: set GFP_NOFS for grab_cache_page) > Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) > Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry) > Merging gfs2/for-next (491e94f79098 gfs2: Add missing else in trans_add_meta/data) > Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) > Merging nfs/linux-next (c6fa8e6de3dc Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) > Merging nfsd/nfsd-next (835241349597 sunrpc: avoid warning in gss_key_timeout) > Merging orangefs/for-next (548049495cb4 Orangefs: fix some checkpatch.pl complaints that had creeped in.) > Merging overlayfs/overlayfs-next (d9aa4e0bfb63 ovl: default permissions) > Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) > Merging v9fs/for-next (46cfbe8e037a 9p: trans_fd, bail out if recv fcall if missing) > Merging ubifs/linux-next (1cb8f9776c7d ubi: fastmap: Implement produce_free_peb()) > Merging xfs/for-next (1f93e4a96c91 Linux 4.3-rc2) > Merging file-locks/linux-next (128a37852234 fs: fix data races on inode->i_flctx) > Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root) > Merging pci/next (88641e14fd3c Merge branch 'pci/misc' into next) > Merging hid/for-next (369032a61d65 Merge branch 'for-4.3/upstream-fixes' into for-next) > Merging i2c/i2c/for-next (708ca4084126 i2c: rcar: clean up after refactoring) > Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define) > Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) > Merging hwmon-staging/hwmon-next (91cec9604f54 hwmon: (abx500) drop the use of IRQF_NO_SUSPEND) > Merging v4l-dvb/master (41a8f406dacd Merge branch 'missed' into to_next) > CONFLICT (content): Merge conflict in mm/Makefile > Merging kbuild/for-next (67a87abfc23e Merge branch 'kbuild/kconfig' into kbuild/for-next) > Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too) > Merging libata/for-next (75458f95afed Merge branch 'for-4.4' into for-next) > Merging pm/linux-next (cf8cc987e974 Merge branch 'pm-opp' into linux-next) > Merging idle/next (f05bd12f0e9c Merge branch 'cpuidle' into release) > Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) > Merging thermal/next (a353d85dc365 Merge branches 'thermal-core' and 'thermal-intel' of .git into next) > Merging thermal-soc/next (b840b6e65cbe thermal: ti-soc-thermal: add OMAP36xx support) > Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) > Merging dlm/next (b3a5bbfd780d dlm: print error from kernel_sendpage) > Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE) > Merging slave-dma/next (e1ec9fcc7fa5 Merge branches 'topic/dw', 'topic/idma', 'topic/ioatdma' and 'topic/of' into next) > Merging net-next/master (6bcfd7f8c288 tcp: fix RFS vs lockless listeners) > CONFLICT (content): Merge conflict in net/ipv6/xfrm6_output.c > CONFLICT (content): Merge conflict in net/ipv4/inet_connection_sock.c > CONFLICT (content): Merge conflict in drivers/net/usb/asix_common.c > Merging ipsec-next/master (c386578f1cdb xfrm: Let the flowcache handle its size by default.) > Merging ipvs-next/master (92240e8dc0d1 ipvs: Remove possibly unused variables from ip_vs_conn_net_{init,cleanup}) > Merging wireless-drivers-next/master (7e64e5e66af8 Merge tag 'iwlwifi-next-for-kalle-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) > Merging bluetooth/master (8c46dfe6bccc Bluetooth: Queue diagnostic messages together with HCI packets) > Merging rdma/for-next (070b39972320 IB/mlx4: Report checksum offload cap for RAW QP when query device) > Merging mtd/master (e5a5d92d9dc3 mxc_nand: fix copy_spare) > Merging l2-mtd/master (192db1caa253 mtd: nand_bbt: set the smallest size of bbt table) > Merging crypto/master (9ad92bdff706 hwrng: st - Improve FIFO size/depth description) > Merging drm/drm-next (d4070ff71363 Merge tag 'drm-intel-next-2015-09-11' of git://anongit.freedesktop.org/drm-intel into drm-next) > Applying: drm/fb-helper: merge fix for "Use -errno return in restore_mode_unlocked" > Merging drm-panel/drm/panel/for-next (a33ee95f8f45 drm/bridge: Put Kconfig entries in a separate menu) > Merging drm-intel/for-linux-next (261a27d11fa1 drm/i915: Partial revert of atomic watermark series) > CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c > Merging drm-tegra/drm/tegra/for-next (3fe2c7d4c85b gpu: host1x: Fix MLOCK's debug info) > Merging drm-misc/topic/drm-misc (c4354ad76a97 drm/<drivers>: Drop DRM_UNLOCKED from modeset drivers) > Merging drm-exynos/exynos-drm/for-next (7d9071a09502 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) > Merging drm-msm/msm-next (d248b61f6114 drm/msm/dsi: Introduce DSI configuration module) > Merging sound/for-next (e8bd577ae6df ALSA: firewire-digi00x: add support for MIDI ports for physical controls) > Merging sound-asoc/for-next (e30c9a99b132 Merge remote-tracking branch 'asoc/topic/topology' into asoc-next) > Merging modules/modules-next (5cfb203a304d modpost: abort if a module symbol is too long) > Merging input/next (aba54876bb38 Input: xpad - query wireless controller state at init) > Merging block/for-next (b2aaf7948ac3 Merge branch 'for-4.4/core' into for-next) > Merging device-mapper/for-next (0dd0bc231f5c dm: convert ffs to __ffs) > Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) > Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) > Merging mmc-uh/next (f264ecfaa770 mmc: core: Remove MMC_CLKGATE) > Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) > Merging md/for-next (c665249239c4 Fix adding of new disk with new reload code) > Merging mfd/for-mfd-next (006d2c2a7105 mfd: atmel-flexcom: Add a driver for Atmel Flexible Serial Communication Unit) > Merging backlight/for-backlight-next (7111c6c672fc backlight: adp8870: Remove unnecessary MODULE_ALIAS()) > Merging battery/master (6169588f69f8 Documentation: power: bq24257: Document exported sysfs entries) > $ git reset --hard HEAD^ > Merging next-20150925 version of battery > Merging omap_dss2/for-next (08bfb453f045 radeonfb: Deinline large functions) > Merging regulator/for-next (494fa9126950 Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/supply', 'regulator/topic/tps6105x' and 'regulator/topic/tps65023' into regulator-next) > Merging security/next (049e6dde7e57 Linux 4.3-rc4) > Merging integrity/next (72e1eed8abb1 integrity: prevent loading untrusted certificates on the IMA trusted keyring) > Merging selinux/next (7bd1c6fc9679 selinux: Use a kmem_cache for allocation struct file_security_struct) > Merging lblnet/next (b2776bf7149b Linux 3.18) > Merging watchdog/master (55f1dfb398d9 watchdog: iTCO: Fix dependencies on I2C) > Merging iommu/next (eea87ff7bd44 Merge branches 'iommu/fixes', 'x86/amd' and 'x86/vt-d' into next) > Merging dwmw2-iommu/master (0b9252a34858 iommu/vt-d: Implement page request handling) > Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer) > Merging jc_docs/docs-next (334bb79c18eb doc: Clarify that nmi_watchdog param is for hardlockups) > CONFLICT (content): Merge conflict in Documentation/Changes > Merging trivial/for-next (0c6cac7ab444 hwmon: applesmc: fix comment typos) > Merging audit/next (fdccf5752869 audit: audit_tree_match can be boolean) > Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) > Merging dt-rh/for-next (a13f18f59d26 Documentation: arm: Fix typo in the idle-states bindings examples) > Merging mailbox/mailbox-for-next (86e488adaab7 mailbox: arm_mhu: reduce txpoll_period from 10ms to 1 ms) > Merging spi/for-next (637370041cec Merge remote-tracking branch 'spi/topic/txx9' into spi-next) > Merging tip/auto-latest (2cbd844cc615 Merge branch 'x86/platform') > CONFLICT (content): Merge conflict in arch/x86/crypto/camellia_aesni_avx_glue.c > CONFLICT (content): Merge conflict in arch/x86/Makefile > CONFLICT (content): Merge conflict in arch/arm64/kernel/acpi.c > Merging clockevents/clockevents/next (0e4baaa9a11b clocksource/drivers/exynos_mct: Use container_of() instead of this_cpu_ptr()) > Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) > Merging edac-amd/for-next (df77345c5394 Merge branch 'edac-for-4.4' into for-next) > Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next) > Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) > Merging ftrace/for-next (37aea98b84c0 tracing: Add trace options for tracer options to instances) > Merging rcu/rcu/next (c3c7edcab39d documentation: Expand on scheduler/RCU deadlock requirements) > Merging kvm/linux-next (b7d2063177a5 iommu/vt-d: Add a command line parameter for VT-d posted-interrupts) > Merging kvm-arm/next (1f93e4a96c91 Linux 4.3-rc2) > Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) > Merging kvm-ppc-paulus/kvm-ppc-next (3eb4ee682542 KVM: PPC: Book3S: Take the kvm->srcu lock in kvmppc_h_logical_ci_load/store()) > Merging kvms390/next (feeb6eb53dad KVM: s390: switch to get_tod_clock() and fix STP sync races) > Merging xen-tip/linux-next (10e5d40c0b61 xen/balloon: Use the correct sizeof when declaring frame_list) > CONFLICT (content): Merge conflict in arch/x86/xen/p2m.c > Merging percpu/for-next (5a928541585b kernel: Remove unneeded return from void function) > Merging workqueues/for-next (874bbfe600a6 workqueue: make sure delayed work run in local cpu) > Merging drivers-x86/for-next (7d3777d10691 OLPC: Use %*ph specifier instead of passing direct values) > Merging chrome-platform/for-next (18800fc7a04e platform/chrome: Support reading/writing the vboot context) > Merging regmap/for-next (370f4455d3bb Merge remote-tracking branches 'regmap/topic/atomic', 'regmap/topic/debugfs', 'regmap/topic/irq', 'regmap/topic/irq-hdr' and 'regmap/topic/update-offload' into regmap-next) > Merging hsi/for-next (d9cb7d74c479 hsi: fix double kfree) > Merging leds/for-next (f51ef7763c0a Documentation: leds: update DT bindings for leds-bcm6328) > Merging ipmi/for-next (f22b7d0682d3 char: ipmi: Move MODULE_DEVICE_TABLE() to follow struct) > Merging driver-core/driver-core-next (dbe2256ddd8e driver-core: platform: Provide helpers for multi-driver modules) > Merging tty/tty-next (1a76eb5b0406 Documentation: improve line discipline method descriptions) > Merging usb/usb-next (d5f9e73309b7 USB: u132-hcd: Fix seperate word in printk message) > Merging usb-gadget/next (ec1f9d9f0138 usb: dwc2: gadget: parity fix in isochronous mode) > Merging usb-serial/usb-next (92944c4520ed USB: qcserial: update comment for Sierra Wireless MC7304/MC7354) > Merging staging/staging-next (17db84eba18e staging: wilc1000: avoid NULL pointer dereference on error) > Merging char-misc/char-misc-next (fab6266e82a8 fpga manager: add driver for socfpga fpga manager) > Merging extcon/extcon-next (aae35f970c26 extcon: Modify the id and name of external connector) > Merging kdbus/kdbus (fc87a0ace7e3 kdbus: create /sys/fs/kdbus with sysfs_create_mount_point()) > Merging cgroup/for-next (a3e72739b7a7 cgroup: fix too early usage of static_branch_disable()) > Applying: vmscan build fix > Merging scsi/for-next (15e3d5a285ab 3w-9xxx: don't unmap bounce buffered commands) > Merging target-updates/for-next (f71933438300 configfs: remove old API) > CONFLICT (content): Merge conflict in samples/Makefile > Applying: stm class: Use per-attribute show and store methods in configfs policy > Merging target-merge/for-next-merge (8edb1554f7c2 mpt3sas: Fix unprotected list lookup in v4.3-rc0 changes) > Merging pinctrl/for-next (0254cb138f0e Merge branch 'devel' into for-next) > Merging vhost/linux-next (d629f2b585cb virtio: introduce avail cache) > Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage) > Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) > Merging gpio/for-next (2db8aba860c7 gpio: pca953x: Add TI TCA9539 support) > Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) > Merging pwm/for-next (7e3b7dc76c41 pwm: Add MediaTek display PWM driver support) > Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) > Merging userns/for-next (4b75de861505 fs: Set the size of empty dirs to 0.) > Merging ktest/for-next (b953c0d234bc Linux 4.1) > Merging clk/clk-next (462e929ed168 clk: qcom: create virtual child device for TSENS) > Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) > Merging aio/master (6ff33f3902c3 Linux 4.3-rc1) > Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) > Merging kselftest/next (e2343596c9d6 selftests/pstore: add pstore test scripts going with reboot) > Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) > CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c > Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) > Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic) > Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next) > Merging coresight/next (4b46883661fe coresight: etm3x: adding documentation for sysFS's cpu interface) > CONFLICT (content): Merge conflict in Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x > Merging rtc/rtc-next (0c155bd0c179 rtc: stmp3xxx: unify register access macros) > Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) > Merging nvdimm/libnvdimm-for-next (538ea4aa4473 pmem, memremap: convert to numa aware allocations) > Applying: iommu/vt-d: fix for "Add intel_svm_{un,}bind_mm() functions" > Merging akpm-current/current (c3a0c7301db7 ipc/msg.c: use freezable blocking call) > CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile > CONFLICT (content): Merge conflict in mm/page_alloc.c > CONFLICT (content): Merge conflict in mm/failslab.c > CONFLICT (content): Merge conflict in drivers/usb/host/u132-hcd.c > $ git checkout -b akpm remotes/origin/akpm/master > Applying: net/ipv4/route.c: prevent oops > Applying: mips: add entry for new mlock2 syscall > Applying: sparc/sparc64: allocate sys_membarrier system call number > Applying: kernel.h: make abs() work with 64-bit types > Applying: Remove abs64() > Applying: remove-abs64-fix > Applying: remove-abs64-fix-fix > Applying: Documentation/sysctl/vm.txt: fix misleading code reference of overcommit_memory > Applying: pcnet32: use pci_set_dma_mask insted of pci_dma_supported > Applying: tw68-core: use pci_set_dma_mask insted of pci_dma_supported > Applying: saa7164: use pci_set_dma_mask insted of pci_dma_supported > Applying: saa7134: use pci_set_dma_mask insted of pci_dma_supported > Applying: cx88: use pci_set_dma_mask insted of pci_dma_supported > Applying: cx25821: use pci_set_dma_mask insted of pci_dma_supported > Applying: cx23885: use pci_set_dma_mask insted of pci_dma_supported > Applying: netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported > Applying: nouveau: don't call pci_dma_supported > Applying: sfc: don't call dma_supported > Applying: kaweth: remove ifdefed out call to dma_supported > Applying: usbnet: remove ifdefed out call to dma_supported > Applying: pci: remove pci_dma_supported > Applying: dma: remove external references to dma_supported > Applying: modpost: add flag -E for making section mismatches fatal > Applying: drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS > Merging akpm/master (a34e96e9c5f3 drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS) > -- > To unsubscribe from this list: send the line "unsubscribe linux-next" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
