Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: Tree for Nov 6
@ 2019-11-06  8:03 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2019-11-06  8:03 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 41063 bytes --]

Hi all,

Changes since 20191105:

The scsi-fixes tree gained a conflict against Linus' tree.

The net-next tree still had its build failure for which I applied a patch.

The drm tree lost its build failure.

The kspp tree gained a conflict against the tip tree.

The akpm-current tree lost its build failure.

Non-merge commits (relative to Linus' tree): 8410
 7614 files changed, 335176 insertions(+), 141450 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, an allmodconfig 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. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 310 trees (counting Linus' and 78 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 (26bc67213424 Merge tag 'for-linus-2019-11-05' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux)
Merging fixes/master (54ecb8f7028c Linux 5.4-rc1)
Merging kbuild-current/fixes (d6d5df1db6e9 Linux 5.4-rc5)
Merging arc-current/for-curr (5effc09c4907 ARC: perf: Accommodate big-endian CPU)
Merging arm-current/fixes (39f4d4410484 Merge branch 'misc' into fixes)
Merging arm-soc-fixes/arm/fixes (3a82cd448489 Merge tag 'imx-fixes-5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes)
Merging arm64-fixes/for-next/fixes (1cf45b8fdbb8 arm64: apply ARM64_ERRATUM_843419 workaround for Brahma-B53 core)
Merging m68k-current/for-linus (0f1979b402df m68k: Remove ioremap_fullcache())
Merging powerpc-fixes/fixes (7d6475051fb3 powerpc/powernv: Fix CPU idle to be called with IRQs disabled)
Merging s390-fixes/fixes (a99d8080aaf3 Linux 5.4-rc6)
Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (3d1e5039f5f8 dccp: do not leak jiffies on the wire)
Merging bpf/master (7de086909365 powerpc/bpf: Fix tail call implementation)
Merging ipsec/master (68ce6688a5ba net: sched: taprio: Fix potential integer overflow in taprio_set_picos_per_byte)
Merging netfilter/master (774e4d34dbeb Merge branch 'master' of git://blackhole.kfki.hu/nf)
Merging ipvs/master (c24b75e0f923 ipvs: move old_secure_tcp into struct netns_ipvs)
Merging wireless-drivers/master (3d206e6899a0 iwlwifi: fw api: support new API for scan config cmd)
Merging mac80211/master (1fab1b89e2e8 nl80211: fix validation of mesh path nexthop)
Merging rdma-fixes/for-rc (b681a0529968 RDMA/hns: Prevent memory leaks of eq->buf_list)
Merging sound-current/for-linus (9a11ba7388f1 ALSA: hda: hdmi - add Tigerlake support)
Merging sound-asoc-fixes/for-linus (339f690afb5d Merge branch 'asoc-5.4' into asoc-linus)
Merging regmap-fixes/for-linus (da0c9ea146cb Linux 5.4-rc2)
Merging regulator-fixes/for-linus (51e53e6f6be8 Merge branch 'regulator-5.4' into regulator-linus)
Merging spi-fixes/for-linus (3482f557c303 Merge branch 'spi-5.4' into spi-linus)
Merging pci-current/for-linus (54ecb8f7028c Linux 5.4-rc1)
Merging driver-core.current/driver-core-linus (d6d5df1db6e9 Linux 5.4-rc5)
Merging tty.current/tty-linus (d6d5df1db6e9 Linux 5.4-rc5)
Merging usb.current/usb-linus (a99d8080aaf3 Linux 5.4-rc6)
Merging usb-gadget-fixes/fixes (f3fb802efaef usb: cdns3: gadget: Don't manage pullups)
Merging usb-serial-fixes/usb-linus (bc25770f00d3 USB: serial: ti_usb_3410_5052: clean up serial data access)
Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue)
Merging phy/fixes (54ecb8f7028c Linux 5.4-rc1)
Merging staging.current/staging-linus (fe4c59394ede Merge tag 'iio-fixes-for-5.4b' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (9d55499d8da4 intel_th: pci: Add Jasper Lake PCH support)
Merging soundwire-fixes/fixes (7b47ad3322d1 soundwire: slave: fix scanf format)
Merging thunderbolt-fixes/fixes (747125db6dcd thunderbolt: Drop unnecessary read when writing LC command in Ice Lake)
Merging input-current/for-linus (310ca2a61c41 Input: synaptics-rmi4 - remove unused result_bits mask)
Merging crypto-current/master (f703964fc668 crypto: arm/aes-ce - add dependency on AES library)
Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible)
Merging vfio-fixes/for-linus (95f89e090618 vfio/type1: Initialize resv_msi_base)
Merging kselftest-fixes/fixes (303e6218ecec selftests: Fix O= and KBUILD_OUTPUT handling for relative paths)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
Merging slave-dma-fixes/fixes (bacdcb6675e1 dmaengine: cppi41: Fix cppi41_dma_prep_slave_sg() when idle)
Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1)
Merging mtd-fixes/mtd/fixes (df8fed831cbc mtd: rawnand: au1550nd: Fix au_read_buf16() prototype)
Merging mfd-fixes/for-mfd-fixes (603d9299da32 mfd: mt6397: Fix probe after changing mt6397-core)
Merging v4l-dvb-fixes/fixes (3e84a18a259e media: meson/ao-cec: move cec_notifier_cec_adap_register after hw setup)
Merging reset-fixes/reset/fixes (f430c7ed8bc2 reset: fix reset_control_ops kerneldoc comment)
Merging mips-fixes/mips-fixes (f6929c92e283 MAINTAINERS: Remove Kevin as maintainer of BMIPS generic platforms)
Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
Merging omap-fixes/fixes (6aed5a0e0f56 Merge branch 'watchdog-fix' into fixes)
Merging kvm-fixes/master (671ddc700fd0 KVM: nVMX: Don't leak L1 MMIO regions to L2)
Merging kvms390-fixes/master (53936b5bf35e KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl)
Merging hwmon-fixes/hwmon (a99d8080aaf3 Linux 5.4-rc6)
Merging nvdimm-fixes/libnvdimm-fixes (6370740e5f8e fs/dax: Fix pmd vs pte conflict detection)
Merging btrfs-fixes/next-fixes (bfbbf8cb43a7 Merge branch 'misc-5.4' into next-fixes)
Merging vfs-fixes/fixes (03ad0d703df7 autofs: fix a leak in autofs_expire_indirect())
Merging dma-mapping-fixes/for-linus (9c24eaf81cc4 iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU)
Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
Merging drivers-x86-fixes/fixes (7d194c2100ad Linux 5.4-rc4)
Merging samsung-krzk-fixes/fixes (54ecb8f7028c Linux 5.4-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging devicetree-fixes/dt/linus (5dba51754b04 of: reserved_mem: add missing of_node_put() for proper ref-counting)
Merging scsi-fixes/fixes (8437bb81853e scsi: sd_zbc: Fix sd_zbc_complete())
CONFLICT (content): Merge conflict in drivers/scsi/sd_zbc.c
Merging drm-fixes/drm-fixes (a99d8080aaf3 Linux 5.4-rc6)
Merging amdgpu-fixes/drm-fixes (c0e70e10b11b drm/amd/display: fix dcn21 Makefile for clang)
Merging drm-intel-fixes/for-linux-next-fixes (ee2c5ef8a9d6 drm/i915/dp: Do not switch aux to TBT mode for non-TC ports)
Merging mmc-fixes/fixes (a99d8080aaf3 Linux 5.4-rc6)
Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging gnss-fixes/gnss-linus (54ecb8f7028c Linux 5.4-rc1)
Merging hyperv-fixes/hyperv-fixes (590c28b9199c Drivers: hv: vmbus: Fix harmless building warnings without CONFIG_PM_SLEEP)
Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request())
Merging risc-v-fixes/fixes (1d9b0b66c3ef MAINTAINERS: Change to my personal email address)
Merging pidfd-fixes/fixes (913fe0eb39c6 clone3: validate stack arguments)
Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio)
Merging spdx/spdx-linus (02dc96ef6c25 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging gpio-intel-fixes/fixes (7d194c2100ad Linux 5.4-rc4)
Merging pinctrl-intel-fixes/fixes (67d33aecd030 pinctrl: cherryview: Allocate IRQ chip dynamic)
Merging erofs-fixes/fixes (da0c9ea146cb Linux 5.4-rc2)
Merging drm-misc-fixes/for-linux-next-fixes (b330f3972f4f fbdev: c2p: Fix link failure on non-inlining)
Merging kspp-gustavo/for-next/kspp (da0c9ea146cb Linux 5.4-rc2)
Merging kbuild/for-next (5bf9e7d8f8b7 kbuild: Extend defconfig field size from 24 to 27)
Merging compiler-attributes/compiler-attributes (54ecb8f7028c Linux 5.4-rc1)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (b3d53f5fce5d usb: core: Remove redundant vmap checks)
Merging asm-generic/master (9b87647c665d asm-generic: add unlikely to default BUG_ON(x))
Merging arc/for-next (2f4ecf68a048 ARC: mm: tlb flush optim: elide redundant uTLB invalidates for MMUv3)
Merging arm/for-next (cb73737ea1d2 ARM: 8928/1: ARM_ERRATA_775420: Spelling s/date/data/)
Merging arm64/for-next/core (a2ffd8ebdcb8 Merge branch 'for-next/elf-hwcap-docs' into for-next/core)
Merging arm-perf/for-next/perf (f1d303a1b5dd perf/imx_ddr: Dump AXI ID filter info to userspace)
Merging arm-soc/for-next (06fd047bde63 Merge branch 'arm/fixes' into for-next)
Merging amlogic/for-next (7c37bc96b8e0 Merge branch 'v5.5/dt64' into tmp/aml-rebuild)
Merging aspeed/for-next (7671be39c4d9 ARM: dts: aspeed-g5: Add SGPIO description)
Merging at91/at91-next (ba9b1009f561 Merge branches 'at91-drivers', 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
Merging bcm2835/for-next (f14234184671 Merge branch 'bcm2835-maintainers-next' into for-next)
Merging imx-mxs/for-next (71918b15d58f Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (2af8e1f26c65 Merge branch 'for_5.5/driver-soc' into next)
Merging mediatek/for-next (4ae1ce88e9a0 Merge branch 'v5.3-next/soc' into for-next)
Merging mvebu/for-next (3aa22be2d6b1 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (0adbc8292201 Merge branch 'omap-for-v5.5/prm' into for-next)
Merging qcom/for-next (358b2c9ef5af Merge tag 'qcom-arm64-defconfig-for-5.5' into final-for-5.5)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging realtek/for-next (6a41c7019bca Merge branch 'v5.5/dt64' into next)
Merging renesas/next (9c45f53abb97 Merge branches 'renesas-arm-defconfig-for-v5.5', 'renesas-arm64-defconfig-for-v5.5', 'renesas-arm64-dt-for-v5.5', 'renesas-drivers-for-v5.5' and 'renesas-dt-bindings-for-v5.5' into renesas-next)
Merging reset/reset/next (c2ffa00ad615 reset: document (devm_)reset_control_get_optional variants)
Merging rockchip/for-next (049ed30771be Merge branch 'v5.5-clk/next' into for-next)
Merging samsung-krzk/for-next (a4276bb320c4 Merge branch 'next/drivers' into for-next)
Merging scmi/for-linux-next (a99d8080aaf3 Linux 5.4-rc6)
Merging sunxi/sunxi/for-next (2ddd531f8c80 Merge branches 'sunxi/clk-for-5.5' and 'sunxi/dt-for-5.5' into sunxi/for-next)
Merging tegra/for-next (6c7c92944894 Merge branch for-5.5/cpufreq into for-next)
Merging clk/clk-next (8d3a12f3fb68 Merge branch 'clk-fixes' into clk-next)
CONFLICT (content): Merge conflict in drivers/clk/imx/clk-imx8mn.c
Merging clk-samsung/for-next (45f10dabb56b clk: samsung: exynos5420: Add SET_RATE_PARENT flag to clocks on G3D path)
Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging csky/linux-next (044cf5e15357 csky: Initial stack protector support)
Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h)
Merging ia64/next (0d3d343560ba genirq: remove the is_affinity_mask_valid hook)
Merging m68k/for-next (7cf78b6b12fd m68k: q40: Fix info-leak in rtc_ioctl)
Merging m68knommu/for-next (dd13a0f1d3f8 m68k/coldfire: Use CONFIG_PREEMPTION)
Merging microblaze/next (22648c989cb8 microblaze: Increase max dtb size to 64K from 32K)
Merging mips/mips-next (dece3c2a320b MIPS: Loongson: Fix return value of loongson_hwmon_init)
CONFLICT (content): Merge conflict in arch/mips/sgi-ip27/ip27-init.c
Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction)
Merging nios2/for-next (91d99a724e9c nios2: force the string buffer NULL-terminated)
Merging openrisc/for-next (f3b17320db25 openrisc: map as uncached in ioremap)
Merging parisc-hd/for-next (e9c837c6ab07 parisc: Avoid spurious inequivalent alias kernel error messages)
Merging powerpc/next (d78d5dace539 powerpc/book3s64/hash: Use secondary hash for bolted mapping if the primary is full)
Merging fsl/next (8a35879a60be powerpc/fsl_booke/32: Document KASLR implementation)
Merging soc-fsl/next (36f6cf9dc2f5 soc: fsl: add RCPM driver)
Merging risc-v/for-next (a4531f3dba5f Merge branch 'next/tlb-opt' into dev/riscv/for-v5.5-rc1)
Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging s390/features (c2f2093e149d s390/unwind: drop unnecessary code around calling ftrace_graph_ret_addr())
Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attributes.h)
CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree.
CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree.
$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h
Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging uml/linux-next (73625ed66389 um: irq: Fix LAST_IRQ usage in init_IRQ())
Merging xtensa/xtensa-for-next (c61b02fb6c43 Merge branch 'xtensa-5.5-asm-memopt' into xtensa-for-next)
Merging fscrypt/master (065ab4c4701f docs: ioctl-number: document fscrypt ioctl numbers)
Merging afs/afs-next (a0753c29004f afs: Support RCU pathwalk)
Merging btrfs/for-next (6eb305c9273a Merge branch 'for-next-next-v5.4-20191104' into for-next-20191104)
Merging ceph/master (a3a0819388b2 ceph: don't allow copy_file_range when stripe_count != 1)
Merging cifs/for-next (93496de7378f CIFS: Use common error handling code in smb2_ioctl_query_info())
Merging configfs/for-next (e9c03af21cc7 configfs: calculate the symlink target only once)
Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging())
Merging erofs/dev (0602fc8bb4f2 erofs: support superblock checksum)
Merging ext3/for_next (7f494a73ee5a Pull MAINTAINERS file update.)
Merging ext4/dev (0d0a60c92fed Merge branch 'rh/dioread-nolock-1k' into dev)
Merging f2fs/dev (a5f7bc69e7e7 f2fs: support aligned pinned file)
Merging fsverity/fsverity (95ae251fe828 f2fs: add fs-verity support)
Merging fuse/for-next (091d1a726772 fuse: redundant get_fuse_inode() calls in fuse_writepages_fill())
Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
Merging nfs/linux-next (a99d8080aaf3 Linux 5.4-rc6)
Merging nfs-anna/linux-next (79cc55422ce9 NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid())
Merging nfsd/nfsd-next (5fcaf6982d11 sunrpc: fix crash when cache_head become valid before update)
Merging orangefs/for-next (e6b998ab62be orangefs: remove redundant assignment to err)
Merging overlayfs/overlayfs-next (5c2e9f346b81 ovl: filter of trusted xattr results in audit)
Merging ubifs/linux-next (6a379f67454a jffs2: Fix memory leak in jffs2_scan_eraseblock() error path)
Merging v9fs/9p-next (aafee43b7286 9p/vfs_super.c: Remove unused parameter data in v9fs_fill_super)
Merging xfs/for-next (9842b56cd406 xfs: make the assertion message functions take a mount parameter)
Merging iomap/iomap-for-next (a90100421499 fs/iomap: remove redundant check in iomap_dio_rw())
Merging djw-vfs/vfs-for-next (7118dd2d41af splice: only read in as much information as there is pipe buffer space)
Merging file-locks/locks-next (b41dae061bbd Merge tag 'xfs-5.4-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging vfs/for-next (3e501af8dd7b Merge branches 'work.misc', 'work.mount3', 'work.namei', 'work.dcache' and 'work.autofs' into for-next)
Merging printk/for-next (4a6442ff627f Merge branch 'for-5.5-pr-warn' into for-next)
Merging pci/next (62453f8b66d9 Merge branch 'pci/trivial')
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
Merging pstore/for-next/pstore (8d82cee2f8aa pstore: Make pstore_choose_compression() static)
Merging hid/for-next (e0316fc294a6 Merge branch 'for-5.5/ish' into for-next)
Merging i2c/i2c/for-next (70d0b04517cd Merge branch 'i2c/for-current-fixed' into i2c/for-next)
Merging i3c/i3c/next (469191c7fcd0 MAINTAINERS: Mark linux-i3c mailing list moderated)
Merging dmi/master (9a85ac3936ad firmware: dmi: Add dmi_memdev_handle)
Merging hwmon-staging/hwmon-next (93a794f1b785 docs: hwmon: Document bel-pfe pmbus driver)
Merging jc_docs/docs-next (1c16b3d58681 docs/core-api: memory-allocation: mention size helpers)
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/pensando/ionic.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ixgbevf.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ixgbe.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/igbvf.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/igb.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/ice.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/iavf.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/i40e.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/fm10k.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e1000e.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e1000.rst
CONFLICT (content): Merge conflict in Documentation/networking/device_drivers/intel/e100.rst
CONFLICT (content): Merge conflict in Documentation/admin-guide/perf/imx-ddr.rst
Merging v4l-dvb/master (d065070e009b media: hi556: Add support for Hi-556 sensor)
Merging v4l-dvb-next/master (d45331b00ddb Linux 5.3-rc4)
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (4590a8c71593 Merge branch 'powercap' into linux-next)
CONFLICT (content): Merge conflict in lib/test_printf.c
Merging cpufreq-arm/cpufreq/arm/linux-next (c23734487fb4 cpufreq: sun50i: Fix CPU speed bin detection)
Merging cpupower/cpupower (d80a4ac20800 cpupower : Handle set and info subcommands correctly)
Merging opp/opp/linux-next (c44bb5034aec PM / OPP: Support adjusting OPP voltages at runtime)
Merging thermal/thermal/linux-next (7d0f31b2fee5 drivers: thermal: tsens: fix potential integer overflow on multiply)
Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
Merging ieee1394/for-next (4d856f72c10e Linux 5.3)
Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions)
Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
Merging rdma/for-next (11f552e21755 IB/mlx5: Test write combining support)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mr.c
Merging net-next/master (b8fed591df6b Merge branch 'netvsc-RSS-related-patches')
CONFLICT (content): Merge conflict in samples/bpf/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
Applying: fix up for "net: of_get_phy_mode: Change API to solve int/unit warnings"
Merging bpf-next/master (f23c7ce341c2 Merge branch 'bpf-libbpf-bitfield-size-relo')
Merging ipsec-next/master (fd1ac07f3f17 xfrm: ifdef setsockopt(UDP_ENCAP_ESPINUDP/UDP_ENCAP_ESPINUDP_NON_IKE))
Merging mlx5-next/mlx5-next (e53a9d26cf80 IB/mlx5: Introduce and use mlx5_core_is_vf())
Merging netfilter-next/master (1574cf83c7a0 Merge tag 'mlx5-updates-2019-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c
Merging ipvs-next/master (d54725cd11a5 netfilter: nf_tables: support for multiple devices per netdev hook)
Merging wireless-drivers-next/master (086ddf860650 mt7601u: use DEFINE_DEBUGFS_ATTRIBUTE to define debugfs fops)
CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
Merging bluetooth/master (cf94da6f502d Bluetooth: Fix invalid-free in bcsp_close())
Merging mac80211-next/master (3f2aef10ffad mac80211: fix a typo of "function")
Merging gfs2/for-next (1a48049adb98 gfs2: make gfs2_fs_parameters static)
Merging mtd/mtd/next (267c1d772380 MAINTAINERS: ubi/ubifs: Update the Git repository)
Merging nand/nand/next (777260a5c992 mtd: rawnand: remove unecessary checking if dmac is NULL)
Merging spi-nor/spi-nor/next (3d63ee5deb46 mtd: spi-nor: fix silent truncation in spi_nor_read_raw())
Merging crypto/master (298b4c604008 crypto: amcc - restore CRYPTO_AES dependency)
CONFLICT (content): Merge conflict in arch/arm/crypto/Kconfig
Merging drm/drm-next (cea35f5ad5ff drm/i915: Don't select BROKEN)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
Applying: cec: fix up for "cec: add cec_adapter to cec_notifier_cec_adap_unregister()"
Applying: drm/v3d: Fix double free in v3d_submit_cl_ioctl()
Merging amdgpu/drm-next (93e6e11732b6 drm/radeon: fix si_enable_smc_cac() failed issue)
CONFLICT (content): Merge conflict in include/uapi/linux/kfd_ioctl.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo_util.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn21/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn20/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
Merging drm-intel/for-linux-next (d9dace943894 drm/i915/selftests: Add intel_gt_suspend_prepare)
Merging drm-tegra/drm/tegra/for-next (84db889e6d82 drm/tegra: Unconditionally select IOMMU_IOVA)
Merging drm-misc/for-linux-next (cea35f5ad5ff drm/i915: Don't select BROKEN)
Merging drm-msm/msm-next (e20c9284c8f2 drm/msm/adreno: Add support for Adreno 510 GPU)
Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500)
Merging imx-drm/imx-drm/next (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary)
Merging etnaviv/etnaviv/next (22567d017c2c dt-bindings: etnaviv: Add #cooling-cells)
Merging regmap/for-next (da0c9ea146cb Linux 5.4-rc2)
Merging sound/for-next (55c6b8e4f729 ALSA: pcm: Create proc files only for non-empty preallocations)
Merging sound-asoc/for-next (c1efaea10be0 Merge branch 'asoc-5.5' into asoc-next)
CONFLICT (content): Merge conflict in sound/soc/samsung/Kconfig
CONFLICT (content): Merge conflict in sound/soc/intel/boards/Kconfig
Merging modules/modules-next (c3a6cf19e695 export: avoid code duplication in include/linux/export.h)
Merging input/next (d843304b22e8 Input: synaptics-rmi4 - simplify data read in rmi_f54_work)
Merging block/for-next (e2e49d718bad Merge branch 'for-5.5/io_uring' into for-next)
Merging device-mapper/for-next (13bd677a472d dm cache: fix bugs when a GFP_NOWAIT allocation fails)
Merging mmc/next (3a07e0b48c98 mmc: renesas_sdhi_internal_dmac: Add r8a774b1 support)
Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
Merging mfd/for-mfd-next (1f98ed315b06 mfd: mfd-core: Move pdev->mfd_cell creation back into mfd_add_device())
CONFLICT (content): Merge conflict in drivers/mfd/mt6397-core.c
Merging backlight/for-backlight-next (53e492915061 backlight: Kconfig: jornada720: Use CONFIG_PREEMPTION)
Merging battery/for-next (9480029fe5c2 power: supply: bd70528: Add MODULE_ALIAS to allow module auto loading)
Merging regulator/for-next (3151d022d740 Merge branch 'regulator-5.5' into regulator-next)
Merging security/next-testing (45893a0abee6 kexec: Fix file verification on S390)
Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size)
Merging integrity/next-integrity (2a7f0e53daf2 ima: ima_api: Use struct_size() in kzalloc())
Merging keys/keys-next (48274e1e5d24 Merge branch 'notifications-core' into keys-next)
Merging selinux/next (42345b68c2e3 selinux: default_range glblub implementation)
Merging smack/for-next (92604e825304 smack: use GFP_NOFS while holding inode_smack::smk_lock)
Merging tomoyo/master (79c8ca578dbf Revert "printk: Monitor change of console loglevel.")
Merging tpmdd/next (6ffdd4c0e27e KEYS: trusted: Remove set but not used variable 'keyhndl')
Merging watchdog/master (81363f248aec watchdog: bd70528: Add MODULE_ALIAS to allow module auto loading)
Merging iommu/next (50f07c7db715 Merge branches 'iommu/fixes', 'arm/qcom', 'arm/renesas', 'arm/rockchip', 'arm/mediatek', 'arm/tegra', 'x86/amd', 'x86/vt-d', 'virtio' and 'core' into next)
Merging vfio/next (026948f01eac vfio/type1: remove hugepage checks in is_invalid_reserved_pfn())
Merging audit/next (c34c78dfc1fc audit: remove redundant condition check in kauditd_thread())
Merging devicetree/for-next (067c650c456e dtc: Use pkg-config to locate libyaml)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/usb/generic-ehci.yaml
Merging mailbox/mailbox-for-next (556a0964e28c mailbox: qcom-apcs: fix max_register value)
Merging spi/for-next (1210b1e69f65 Merge remote-tracking branch 'spi/topic/ptp' into spi-next)
Merging tip/auto-latest (dcf848d387fa Merge branch 'core/urgent')
CONFLICT (content): Merge conflict in samples/bpf/Makefile
CONFLICT (content): Merge conflict in include/linux/security.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
Applying: drm/i915: update for mutex_release API change
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt_pm.c
Merging clockevents/timers/drivers/next (6e001f6a4cc7 clocksource/drivers/asm9260: Add a check for of_clk_get)
Merging edac/edac-for-next (466503d6b1b3 EDAC/amd64: Set grain per DIMM)
Merging irqchip/irq/irqchip-next (41860cc44704 irqchip/sifive-plic: Skip contexts except supervisor in plic_init())
Merging ftrace/for-next (8ed4889eb831 selftests/ftrace: Fix same probe error test)
Merging rcu/rcu/next (8dcdfb7096a3 Merge branches 'doc.2019.10.29a', 'fixes.2019.10.30a', 'nohz.2019.10.28a', 'replace.2019.10.30a', 'torture.2019.10.05a' and 'lkmm.2019.10.05a' into HEAD)
Merging kvm/linux-next (20baa8e515a5 Merge tag 'kvm-ppc-fixes-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD)
Merging kvm-arm/next (ab71d9531316 Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next)
Merging kvm-ppc/kvm-ppc-next (55d7004299eb KVM: PPC: Book3S HV: Reject mflags=2 (LPCR[AIL]=2) ADDR_TRANS_MODE mode)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
Merging kvms390/next (c7b7de631246 KVM: s390: Do not yield when target is already running)
Merging xen-tip/linux-next (6ccae60d014d xen: issue deprecation warning for 32-bit pv guest)
Merging percpu/for-next (825dbc6ff7a3 percpu: add __percpu to SHIFT_PERCPU_PTR)
Merging workqueues/for-next (30ae2fc0a75e workqueue: Minor follow-ups to the rescuer destruction change)
Merging drivers-x86/for-next (fa2a590d0d02 platform/x86: intel_punit_ipc: Drop useless label)
Merging chrome-platform/for-next (3ea09dfacaa3 platform/chrome: wilco_ec: Add charging config driver)
Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq())
Merging leds/for-next (448d6fcb7a52 leds: pca953x: Use of_device_get_match_data())
Merging ipmi/for-next (4aa7afb0ee20 ipmi: Fix memory leak in __ipmi_bmc_register)
Merging driver-core/driver-core-next (09b0965ee8cc IB: mlx5: no need to check return value of debugfs_create functions)
CONFLICT (content): Merge conflict in Documentation/filesystems/debugfs.txt
Merging usb/usb-next (74ce3e412748 usb: typec: ucsi: Optimise ucsi_unregister())
Merging usb-gadget/next (726b4fba94be usb: dwc3: of-simple: add a shutdown)
Merging usb-serial/usb-next (35714565089e USB: serial: ch341: reimplement line-speed handling)
Merging usb-chipidea-next/ci-for-usb-next (973ce009b308 usb: chipidea: imx: check data->usbmisc_data against NULL before access)
Merging phy-next/next (4569e64ab6a5 phy: phy-rockchip-inno-usb2: add phy description for px30)
Merging tty/tty-next (879516870d7a Revert "tty:n_gsm.c: destroy port by tty_port_destroy()")
Merging char-misc/char-misc-next (9c7db4947506 coresight: etm4x: Fix BMVAL misuse)
CONFLICT (content): Merge conflict in samples/Makefile
CONFLICT (content): Merge conflict in samples/Kconfig
Merging extcon/extcon-next (ddd1bbbae486 extcon: sm5502: remove redundant assignment to variable cable_type)
Merging soundwire/next (3ccb8551f52e soundwire: cadence_master: make clock stop exit configurable on init)
Merging thunderbolt/next (354a7a7716ed thunderbolt: Do not start firmware unless asked by the user)
Merging staging/staging-next (6647e4e84501 staging: exfat: Ensure we unlock upon error in ffsReadFile)
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (0bf9146d94a0 docs: driver-api: make interconnect title quieter)
Merging slave-dma/next (31f4b28f6c41 dmaengine: ti: edma: Add support for handling reserved channels)
Merging cgroup/for-next (8c26b3a71bdf Merge branch 'for-5.5' into for-next)
Merging scsi/for-next (4b9029e0a68d Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/scsi_sysfs.c
Merging scsi-mkp/for-next (a4f3904f7614 Merge branch '5.4/scsi-fixes' into 5.5/scsi-next)
Merging vhost/linux-next (8766aecd61f7 vhost: last descriptor must have NEXT clear)
Merging rpmsg/for-next (1587a11907d8 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (1723e834a4aa Merge branch 'devel' into for-next)
Merging gpio-brgl/gpio/for-next (2b9f48e93407 gpio: rcar: Use proper irq_chip name)
Merging gpio-intel/for-next (7d194c2100ad Linux 5.4-rc4)
Merging pinctrl/for-next (bf74543583fa Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (c9ccf71fc807 pinctrl: intel: Add Intel Tiger Lake pin controller support)
Merging pinctrl-samsung/for-next (a322b3377f4b pinctrl: samsung: Fix device node refcount leaks in init code)
Merging pwm/for-next (9e1b4999a169 pwm: stm32: Pass breakinput instead of its values)
Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus)
Merging ktest/for-next (aecea57f84b0 ktest: Fix some typos in config-bisect.pl)
Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool)
Merging kselftest/next (54ecb8f7028c Linux 5.4-rc1)
Merging y2038/y2038 (0682b746099a Merge tag 'compat-ioctl-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground into y2038)
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
Applying: fix up for "compat: move FS_IOC_RESVSP_32 handling to fs/ioctl.c"
Merging livepatching/for-next (8b65d6ab9d70 Merge remote-tracking branch 'for-5.5/system-state' into for-next)
Merging coresight/next (d87f04ffb55b coresight: etm4x: Fix BMVAL misuse)
Merging rtc/rtc-next (23ee22502d31 rtc: em3027: correct month value)
Merging nvdimm/libnvdimm-for-next (4c806b897d60 libnvdimm/region: Enable MAP_SYNC for volatile regions)
Merging at24/at24/for-next (285be87c79e1 eeprom: at24: Improve confusing log message)
Merging ntb/ntb-next (54ecb8f7028c Linux 5.4-rc1)
Merging kspp/for-next/kspp (ec2f877856e0 treewide: Use sizeof_member() macro)
CONFLICT (content): Merge conflict in arch/x86/kernel/fpu/xstate.c
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (54ecb8f7028c Linux 5.4-rc1)
Merging fsi/next (ca9902e3140e fsi: core: Fix small accesses and unaligned offsets via sysfs)
Merging slimbus/for-next (54ecb8f7028c Linux 5.4-rc1)
Merging nvmem/for-next (6bd17868c992 nvmem: add Rockchip OTP driver)
Merging xarray/xarray (b7e9728f3d7f idr: Fix idr_alloc_u32 on 32-bit systems)
Merging hyperv/hyperv-next (94f90545a08f Drivers: hv: balloon: Remove dependencies on guest page size)
Merging auxdisplay/auxdisplay (54ecb8f7028c Linux 5.4-rc1)
Merging kgdb/kgdb/for-next (c58ff643763c kdb: Tweak escape handling for vi users)
Merging pidfd/for-next (1282387e9dca Merge branch 'pidfd' into for-next)
Merging devfreq/for-next (d2f5fccd1ac9 PM / devfreq: Make log message more explicit when devfreq device already exists)
Merging hmm/hmm (bbe3329e354d mm/hmm: remove hmm_mirror and related)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/odp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
Merging fpga/for-next (fddc9fcbe69a fpga: dfl: fme: add power management support)
Merging kunit/test (ea2dd7c0875e lib/list-test: add a test for the 'list' doubly linked list)
Merging cel/cel-next (a99d8080aaf3 Linux 5.4-rc6)
Merging akpm-current/current (ba0a1e22d958 ipc/msg.c: consolidate all xxxctl_down() functions)
CONFLICT (content): Merge conflict in lib/ubsan.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/block/null_blk_main.c: fix layout
Applying: drivers/block/null_blk_main.c: fix uninitialized var warnings
Applying: pinctrl: fix pxa2xx.c build warnings
Applying: lib/genalloc.c: export symbol addr_in_gen_pool
Applying: lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr
Applying: Documentation: rename addr_in_gen_pool to gen_pool_has_addr
Applying: kernel-hacking: group sysrq/kgdb/ubsan into 'Generic Kernel Debugging Instruments'
Applying: kernel-hacking: create submenu for arch special debugging options
Applying: kernel-hacking: group kernel data structures debugging together
Applying: kernel-hacking: move kernel testing and coverage options to same submenu
Applying: kernel-hacking: move Oops into 'Lockups and Hangs'
Applying: kernel-hacking: move SCHED_STACK_END_CHECK after DEBUG_STACK_USAGE
Applying: kernel-hacking: create a submenu for scheduler debugging options
Applying: kernel-hacking: move DEBUG_BUGVERBOSE to 'printk and dmesg options'
Applying: kernel-hacking: move DEBUG_FS to 'Generic Kernel Debugging Instruments'
Applying: bitops: introduce the for_each_set_clump8 macro
Applying: linux/bitmap.h: fix potential sign-extension overflow
Applying: bitops-introduce-the-for_each_set_clump8-macro-fix-fix
Applying: linux/bitopts.h: Add for_each_set_clump8 documentation
Applying: lib/test_bitmap.c: add for_each_set_clump8 test cases
Applying: gpio: 104-dio-48e: utilize for_each_set_clump8 macro
Applying: gpio: 104-idi-48: utilize for_each_set_clump8 macro
Applying: gpio: gpio-mm: utilize for_each_set_clump8 macro
Applying: gpio: ws16c48: utilize for_each_set_clump8 macro
Applying: gpio: pci-idio-16: utilize for_each_set_clump8 macro
Applying: gpio: pcie-idio-24: utilize for_each_set_clump8 macro
Applying: gpio: uniphier: utilize for_each_set_clump8 macro
Applying: gpio: 74x164: utilize the for_each_set_clump8 macro
Applying: thermal: intel: intel_soc_dts_iosf: Utilize for_each_set_clump8 macro
Applying: gpio: pisosr: utilize the for_each_set_clump8 macro
Applying: gpio: max3191x: utilize the for_each_set_clump8 macro
Applying: gpio: pca953x: utilize the for_each_set_clump8 macro
Applying: lib/test_bitmap: force argument of bitmap_parselist_user() to proper address space
Applying: lib/test_bitmap: undefine macros after use
Applying: lib/test_bitmap: name EXP_BYTES properly
Applying: lib/test_bitmap: rename exp to exp1 to avoid ambiguous name
Applying: lib/test_bitmap: move exp1 and exp2 upper for others to use
Applying: lib/test_bitmap: fix comment about this file
Applying: lib/bitmap: introduce bitmap_replace() helper
Applying: gpio: pca953x: remove redundant variable and check in IRQ handler
Applying: gpio: pca953x: use input from regs structure in pca953x_irq_pending()
Applying: gpio: pca953x: convert to use bitmap API
Applying: gpio: pca953x: reduce stack usage in couple of functions
Applying: gpio: pca953x: tighten up indentation
Applying: mm: add generic p?d_leaf() macros
Applying: arc: mm: add p?d_leaf() definitions
Applying: arm: mm: add p?d_leaf() definitions
Applying: arm64: mm: add p?d_leaf() definitions
Applying: mips: mm: add p?d_leaf() definitions
Applying: powerpc: mm: add p?d_leaf() definitions
Applying: riscv: mm: add p?d_leaf() definitions
Applying: s390: mm: add p?d_leaf() definitions
Applying: sparc: mm: add p?d_leaf() definitions
Applying: x86: mm: add p?d_leaf() definitions
Applying: mm: pagewalk: add p4d_entry() and pgd_entry()
Applying: mm: pagewalk: allow walking without vma
Applying: mm-pagewalk-allow-walking-without-vma-v15
Applying: mm: pagewalk: add test_p?d callbacks
Applying: mm: pagewalk: add 'depth' parameter to pte_hole
Applying: x86: mm: point to struct seq_file from struct pg_state
Applying: x86: mm+efi: convert ptdump_walk_pgd_level() to take a mm_struct
Applying: x86: mm: convert ptdump_walk_pgd_level_debugfs() to take an mm_struct
Applying: x86: mm: convert ptdump_walk_pgd_level_core() to take an mm_struct
Applying: mm: add generic ptdump
Applying: mm-add-generic-ptdump-v15
Applying: mm/ptdump: fix a -Wold-style-declaration warning
Applying: x86: mm: convert dump_pagetables to use walk_page_range
Applying: arm64: mm: convert mm/dump.c to use walk_page_range()
Applying: arm64: mm: display non-present entries in ptdump
Applying: mm: ptdump: reduce level numbers by 1 in note_page()
Applying: alpha: use pgtable-nopud instead of 4level-fixup
Applying: arm: nommu: use pgtable-nopud instead of 4level-fixup
Applying: c6x: use pgtable-nopud instead of 4level-fixup
Applying: m68k: nommu: use pgtable-nopud instead of 4level-fixup
Applying: m68k: mm: use pgtable-nopXd instead of 4level-fixup
Applying: microblaze: use pgtable-nopmd instead of 4level-fixup
Applying: nds32: use pgtable-nopmd instead of 4level-fixup
Applying: parisc: use pgtable-nopXd instead of 4level-fixup
Applying: parisc/hugetlb: use pgtable-nopXd instead of 4level-fixup
Applying: sparc32: use pgtable-nopud instead of 4level-fixup
Applying: um: remove unused pxx_offset_proc() and addr_pte() functions
Applying: um: add support for folded p4d page tables
Applying: mm: remove __ARCH_HAS_4LEVEL_HACK and include/asm-generic/4level-fixup.h
Applying: drivers/tty/serial/sh-sci.c: suppress warning
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (b2e9876ce7ca drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: Tree for Nov 6
@ 2018-11-06  3:14 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2018-11-06  3:14 UTC (permalink / raw)
  To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List

[-- Attachment #1: Type: text/plain, Size: 29156 bytes --]

Hi all,

Changes since 20181105:

New trees: risc-v-pjw, sifive, i3c-fixes, i3c

The drm-msm tree gained a conflict against the drm-misc tree.

The tip tree gained a build failure for which I applied a fix patch.

Non-merge commits (relative to Linus' tree): 825
 1082 files changed, 50662 insertions(+), 15456 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, an allmodconfig 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. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 294 trees (counting Linus' and 67 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 (651022382c7f Linux 4.20-rc1)
Merging fixes/master (7c6c54b505b8 Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging kbuild-current/fixes (02826a6ba301 kbuild: deb-pkg: fix bindeb-pkg breakage when O= is used)
Merging arc-current/for-curr (d94cf77e44d5 ARC: [plat-hsdk] Enable DW APB GPIO support)
Merging arm-current/fixes (3a58ac65e2d7 ARM: 8799/1: mm: fix pci_ioremap_io() offset check)
Merging arm64-fixes/for-next/fixes (ca2b497253ad arm64: perf: Reject stand-alone CHAIN events for PMUv3)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging sparc/master (1f2b5b8e2df4 sparc64: Wire up compat getpeername and getsockname.)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (6915ed86cca6 net/ipv6: Move anycast init/cleanup functions out of CONFIG_PROC_FS)
Merging bpf/master (ea53abfab960 bonding/802.3ad: fix link_failure_count tracking)
Merging ipsec/master (533555e5cbb6 xfrm: Fix error return code in xfrm_output_one())
Merging netfilter/master (f393808dc641 netfilter: conntrack: fix calculation of next bucket number in early_drop)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set)
Merging wireless-drivers/master (651022382c7f Linux 4.20-rc1)
Merging mac80211/master (8d0be26c781a mac80211_hwsim: fix module init error paths for netlink)
Merging rdma-fixes/for-rc (a3671a4f973e RDMA/ucma: Fix Spectre v1 vulnerability)
Merging sound-current/for-linus (826b5de90c0b ALSA: firewire-lib: fix insufficient PCM rule for period/buffer size)
Merging sound-asoc-fixes/for-linus (237dea0eb12b Merge branch 'asoc-4.20' into asoc-linus)
Merging regmap-fixes/for-linus (35a7f35ad1b1 Linux 4.19-rc8)
Merging regulator-fixes/for-linus (651022382c7f Linux 4.20-rc1)
Merging spi-fixes/for-linus (83665c6da9d3 Merge branch 'spi-4.19' into spi-linus)
Merging pci-current/for-linus (651022382c7f Linux 4.20-rc1)
Merging driver-core.current/driver-core-linus (651022382c7f Linux 4.20-rc1)
Merging tty.current/tty-linus (202dc3cc10b4 serial: sh-sci: Fix receive on SCIFA/SCIFB variants with DMA)
Merging usb.current/usb-linus (651022382c7f Linux 4.20-rc1)
Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of dwc2_check_core_endianness)
Merging usb-serial-fixes/usb-linus (0238df646e62 Linux 4.19-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code)
Merging phy/fixes (651022382c7f Linux 4.20-rc1)
Merging staging.current/staging-linus (651022382c7f Linux 4.20-rc1)
Merging char-misc.current/char-misc-linus (651022382c7f Linux 4.20-rc1)
Merging soundwire-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging input-current/for-linus (cacd9759eea2 Merge branch 'next' into for-linus)
Merging crypto-current/master (a1c6fd4308d3 crypto: chelsio - Update ntx queue received from cxgb4)
Merging ide/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre v1)
Merging kselftest-fixes/fixes (ce01a1575f45 rseq/selftests: fix parametrized test with -fpie)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging backlight-fixes/for-backlight-fixes (ce397d215ccd Linux 4.18-rc1)
Merging mtd-fixes/master (f0fe77f601c3 lib/bch: fix possible stack overrun)
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
Merging mfd-fixes/for-mfd-fixes (10492ee8ed91 mfd: omap-usb-host: Fix dts probe of children)
Merging v4l-dvb-fixes/fixes (dafb7f9aef2f v4l2-controls: add a missing include)
Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0)
Merging mips-fixes/mips-fixes (d01501f85249 MIPS: Fix `dma_alloc_coherent' returning a non-coherent allocation)
Merging at91-fixes/at91-fixes (651022382c7f Linux 4.20-rc1)
Merging omap-fixes/fixes (c265c0ca76fb ARM: dts: logicpd-som-lv: Fix OMAP35/DM37 Compatibility issues)
Merging kvm-fixes/master (5f8bb004bca4 KVM: vmx: hyper-v: don't pass EPT configuration info to vmx_hv_remote_flush_tlb())
Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs)
Merging hwmon-fixes/hwmon (e3e61f01d755 hwmon: (ibmpowernv) Remove bogus __init annotations)
Merging nvdimm-fixes/libnvdimm-fixes (4628a64591e6 mm: Preserve _PAGE_DEVMAP across mprotect() calls)
Merging btrfs-fixes/next-fixes (675c168b2b92 Merge branch 'misc-4.19' into next-fixes)
Merging vfs-fixes/fixes (3df629d873f8 gfs2_meta: ->mount() can get NULL dev_name)
Merging dma-mapping-fixes/for-linus (f62717551b2b arm64: fix warnings without CONFIG_IOMMU_DMA)
Merging i3c-fixes/master (651022382c7f Linux 4.20-rc1)
Merging drivers-x86-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging samsung-krzk-fixes/fixes (5b394b2ddf03 Linux 4.19-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (5b394b2ddf03 Linux 4.19-rc1)
Merging devicetree-fixes/dt/linus (c961cb3be906 of: Fix cpu node iterator to not ignore disabled cpu nodes)
Merging scsi-fixes/fixes (3cc5746e5ad7 scsi: qedi: Initialize the stats mutex lock)
Merging drm-fixes/drm-fixes (651022382c7f Linux 4.20-rc1)
Merging drm-intel-fixes/for-linux-next-fixes (84df9525b0c2 Linux 4.19)
Merging mmc-fixes/fixes (651022382c7f Linux 4.20-rc1)
Merging rtc-fixes/rtc-fixes (5b394b2ddf03 Linux 4.19-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (651022382c7f Linux 4.20-rc1)
Merging kbuild/for-next (a4219aff51b8 kernel hacking: support building kernel with -Og optimization level)
Merging compiler-attributes/compiler-attributes (651022382c7f Linux 4.20-rc1)
Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
Merging dma-mapping/for-next (886643b76632 arm64: use the generic swiotlb_dma_ops)
Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers)
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging arm/for-next (3e98d240981a Merge branches 'fixes', 'misc' and 'spectre' into for-next)
Merging arm-perf/for-next/perf (5b394b2ddf03 Linux 4.19-rc1)
Merging arm-soc/for-next (eb8380cd4bc7 ARM: Document merges)
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
Merging amlogic/for-next (6456dc61314e Merge branch 'v4.20/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (3368e06e2a91 ARM: dts: aspeed: Adding Facebook TiogaPass BMC)
Merging at91/at91-next (651022382c7f Linux 4.20-rc1)
Merging bcm2835/for-next (ca5b45b7c5cd Merge branch 'bcm2835-defconfig-next' into for-next)
Merging imx-mxs/for-next (d52afa81dfba Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next)
Merging mediatek/for-next (42ac5fee3a13 Merge branch 'v4.19-next/soc' into for-next)
Merging mvebu/for-next (0f8a14a7cb8c Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (21f0bd425b67 Merge branch 'omap-for-v4.20/omap1' into for-next)
Merging reset/reset/next (79ae4910fe00 ARC: HSDK: improve reset driver)
Merging qcom/for-next (6252f3298861 Merge tag 'qcom-arm64-defconfig-for-4.20' into 4.20-tagged)
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (527678d409c5 Merge branches 'fixes-for-v4.20', 'dt-bindings-for-v4.21', 'arm-defconfig-for-v4.21', 'arm-dt-for-v4.21', 'arm64-dt-for-v4.21' and 'arm64-defconfig-for-v4.21' into next)
Merging rockchip/for-next (fc6149c1d111 Merge branch 'v4.20-armsoc/dts64-fixes' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (d7a88a82dc0a Merge branch 'next/soc64' into for-next)
Merging sunxi/sunxi/for-next (19357aba5f14 Merge branches 'sunxi/clk-for-4.21', 'sunxi/config64-for-4.21', 'sunxi/dt-for-4.21', 'sunxi/dt64-for-4.21' and 'sunxi/h3-h5-for-4.21' into sunxi/for-next)
Merging tegra/for-next (22fed951fe3b Merge branch for-4.20/arm64/dt into for-next)
CONFLICT (content): Merge conflict in drivers/firmware/tegra/bpmp.c
Merging arm64/for-next/core (966866892cf8 arm64: kprobe: make page to RO mode when allocate it)
Merging clk/clk-next (651022382c7f Linux 4.20-rc1)
Merging clk-samsung/for-next (9dbcfe1ace4e dt-bindings: clock: samsung: Add SPDX license identifiers)
Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging csky/linux-next (252050365823 dt-bindings: timer: gx6605s SOC timer)
Merging h8300/h8300-next (4bdf61ccbe76 h8300: fix IRQ no)
Merging ia64/next (f84cb541f67c ia64: generate uapi header and system call table files)
Merging m68k/for-next (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode)
Merging m68knommu/for-next (381fdd62c383 m68k: fix command-line parsing when passed from u-boot)
Merging microblaze/next (c4347b05440f microblaze/PCI: Remove stale pcibios_align_resource() comment)
Merging mips/mips-next (b3a428b4b18d MIPS: Enable IOREMAP_PROT config option for MIPS cpus)
Merging nds32/next (3a9e41b52d52 nds32: Power management for nds32)
Merging nios2/for-next (c7c09dc187f0 nios2: kconfig: remove duplicate DEBUG_STACK_USAGE symbol defintions)
Merging openrisc/for-next (5600779ea5f3 openrisc: use generic dma_noncoherent_ops)
Merging parisc-hd/for-next (84df9525b0c2 Linux 4.19)
Merging powerpc/next (651022382c7f Linux 4.20-rc1)
Merging fsl/next (b6ae3550c8e2 powerpc/8xx: add missing header in 8xx_mmu.c)
Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging risc-v/for-next (c31aa5c41f3b automerging branch "kernel.org-palmer-linux/next-revert_udivmoddi4" into "for-next")
Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging s390/features (02522ad77fb7 s390: update defconfigs)
Merging sparc-next/master (345671ea0f92 Merge branch 'akpm' (patches from Andrew))
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
Merging uml/linux-next (917e2fd2c53e um: Make line/tty semantics use true write IRQ)
Merging xtensa/xtensa-for-next (ac9be1a3ba9e Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations)
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (1056f93314bb Merge branch 'for-next-current-v4.19-20181025' into for-next-20181025)
Merging ceph/master (ea4cdc548e5e ceph: new mount option to disable usage of copy-from op)
Merging cifs/for-next (f217ada478a7 smb3: do not call cifs functions in error path in rename)
Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal)
Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs)
Merging ext3/for_next (cebea08e6f31 Pull fsnotify umount race fix.)
Merging ext4/dev (33458eaba4df ext4: fix use-after-free race in ext4_remount()'s error path)
Merging f2fs/dev (78130819695f f2fs: fix to keep project quota consistent)
Merging fuse/for-next (5571f1e65486 fuse: enable caching of symlinks)
Merging jfs/jfs-next (a83722f45c5b jfs: fix spelling mistake, EACCESS -> EACCES)
Merging nfs/linux-next (d3787af289c8 NFS: fix spelling mistake, EACCESS -> EACCES)
Merging nfs-anna/linux-next (9f0c5124f4a8 NFS: Don't open code clearing of delegation state)
Merging nfsd/nfsd-next (5d7a5bcb67c7 sunrpc: correct the computation for page_ptr when truncating)
Merging orangefs/for-next (22fc9db296fc orangefs: no need to check for service_operation returns > 0)
Merging overlayfs/overlayfs-next (d47748e5ae5a ovl: automatically enable redirect_dir on metacopy=on)
Merging ubifs/linux-next (84db119f5a83 ubifs: Remove unneeded semicolon)
Merging v9fs/9p-next (fb488fc1f2b4 9p/trans_fd: put worker reqs on destroy)
Merging xfs/for-next (bf4a1fcf0bc1 xfs: remove [cm]time update from reflink calls)
Merging file-locks/locks-next (9f51ae62c84a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging vfs/for-next (d708e87ca399 Merge branch 'work.mount' into for-next)
CONFLICT (content): Merge conflict in fs/proc/inode.c
CONFLICT (content): Merge conflict in fs/f2fs/super.c
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
CONFLICT (content): Merge conflict in drivers/vfio/Kconfig
CONFLICT (content): Merge conflict in drivers/infiniband/Kconfig
CONFLICT (content): Merge conflict in arch/sparc/kernel/setup_64.c
Applying: sunrpc: Fix flood of warnings from iov_iter_kvec in linux-next
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (a61eee132f1e Merge branch 'for-4.20-vsprintf-hash-fixes' into for-next)
Merging pci/next (651022382c7f Linux 4.20-rc1)
Merging pstore/for-next/pstore (1227daa43bce pstore/ram: Clarify resource reservation labels)
Merging hid/for-next (0aef342184e3 Merge branch 'for-4.19/fixes' into for-next)
Merging i2c/i2c/for-next (012ebc3b7801 MAINTAINERS: add maintainer for IMX LPI2C driver)
Merging i3c/i3c/next (71e60757e1ea dt-bindings: i3c: Document Cadence I3C master bindings)
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (175acd4a6930 hwmon: (adt7475) document mapping of sysfs entries to inputs)
Merging jc_docs/docs-next (aea74de4b216 docs: Fix typos in histogram.rst)
Merging v4l-dvb/master (dafb7f9aef2f v4l2-controls: add a missing include)
Merging v4l-dvb-next/master (357b50f3ccc8 drm: amd: dc: don't use FP math when Kcov is enabled)
Merging fbdev/fbdev-for-next (217188d9f985 video: fbdev: remove redundant 'default n' from Kconfig-s)
Merging pm/linux-next (9e074f4644f0 Merge branch 'pm-sleep' into linux-next)
Merging cpupower/cpupower (cb91890ddf6f tools cpupower: Override CFLAGS assignments)
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (534245cc69c2 OPP: Remove of_dev_pm_opp_find_required_opp())
Merging thermal/next (c2b59d279dbb thermal: core: using power_efficient_wq for thermal worker)
Merging thermal-soc/next (760eea43f8c6 thermal: da9062/61: Prevent hardware access during system suspend)
Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers)
Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock)
Merging swiotlb/linux-next (da689221f952 xen/blkfront: avoid NULL blkfront_info dereference on device removal)
Merging rdma/for-next (a60109dc9a95 IB/mlx5: Add support for extended atomic operations)
Merging net-next/master (7c6c54b505b8 Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging bpf-next/master (44adbac8f721 Merge branch 'work.tty-ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging ipsec-next/master (8d4b6bce2559 xfrm: use complete IPv6 addresses for hash)
Merging mlx5-next/mlx5-next (94a04d1d3d36 net/mlx5: Expose DC scatter to CQE capability bit)
Merging netfilter-next/master (44adbac8f721 Merge branch 'work.tty-ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
Merging ipvs-next/master (26a1ccc6c117 bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT")
Merging wireless-drivers-next/master (651022382c7f Linux 4.20-rc1)
Merging bluetooth/master (7c6c54b505b8 Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging mac80211-next/master (4b42745211af Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging gfs2/for-next (8e31582a9ab1 gfs2: Fix minor typo: couln't versus couldn't.)
Merging mtd/mtd/next (747c519bc227 mtd: maps: Get rid of the latch-addr-flash driver)
Merging nand/nand/next (651022382c7f Linux 4.20-rc1)
Merging spi-nor/spi-nor/next (41fe242979e4 mtd: spi-nor: fsl-quadspi: fix read error for flash size larger than 16MB)
Merging crypto/master (a1c6fd4308d3 crypto: chelsio - Update ntx queue received from cxgb4)
Merging drm/drm-next (651022382c7f Linux 4.20-rc1)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (f9776280c29e drm/i915/dp: Restrict link retrain workaround to external monitors)
Merging drm-tegra/drm/tegra/for-next (5ac93f81096a drm/tegra: Detach devices from IOMMU DMA domain on arm32)
Merging drm-misc/for-linux-next (a7f7090f4433 drm/vgem: Fix typo in driver feature flags)
Merging drm-msm/msm-next (fa81b1ad6976 drm/msm: dpu: Don't set legacy plane->crtc pointer)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/hdmi/hdmi.c
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (fd99bd8b805c drm: malidp: Add the size of the superblocks when calculating total size for AFBC buffers)
Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next)
Merging imx-drm/imx-drm/next (6cec571b70ec drm/imx: ipuv3-plane: add function to query atomic update status)
Merging etnaviv/etnaviv/next (1a866306e0fb drm/etnaviv: add DMA configuration for etnaviv platform device)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (031aef723a7d Merge remote-tracking branches 'regmap/topic/noinc' and 'regmap/topic/single-rw' into regmap-next)
Merging sound/for-next (826b5de90c0b ALSA: firewire-lib: fix insufficient PCM rule for period/buffer size)
Merging sound-asoc/for-next (df515c77709c Merge branch 'asoc-4.21' into asoc-next)
Merging modules/modules-next (9be936f4b3a2 kernel/module: Use kmemdup to replace kmalloc+memcpy)
Merging input/next (f39f8688888a Input: synaptics - avoid using uninitialized variable when probing)
Merging block/for-next (f4bd8e08fb9d Merge branch 'for-linus' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (da4ad3a23af3 dm writecache: remove disabled code in memory_entry())
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (a15874957b40 dt-bindings: mmc: fsl-imx-esdhc: add imx8qxp compatible string)
Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
Merging md/for-next (af9b926de9c5 MD: Memory leak when flush bio size is zero)
Merging mfd/for-mfd-next (6eb357844373 mfd: cros_ec: Avoid unneeded internal declaration warning)
Merging backlight/for-backlight-next (e1c9f2eaa0fb backlight: Remove ld9040 driver)
Merging battery/for-next (651022382c7f Linux 4.20-rc1)
Merging regulator/for-next (651022382c7f Linux 4.20-rc1)
Merging security/next-testing (3bd5c4efee1c Merge tag 'loadpin-security-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next-testing)
Merging apparmor/apparmor-next (5f21585384a4 Merge tag 'for-linus-20181102' of git://git.kernel.dk/linux-block)
Merging integrity/next-integrity (34bccd61b139 MAINTAINERS: add Jarkko as maintainer for trusted keys)
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
Merging selinux/next (5df275cd4cf5 selinux: policydb - fix byte order and alignment issues)
Merging tpmdd/next (cfafe7fa5eb2 tpm: tpm_ibmvtpm: fix kdoc warnings)
Merging watchdog/master (cd6ba41c192d watchdog: ts4800: release syscon device node in ts4800_wdt_probe())
Merging iommu/next (2f2fbfb71ecc Merge branches 'arm/renesas', 'arm/smmu', 'ppc/pamu', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (104c7405a64d vfio: add edid support to mbochs sample driver)
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (ea956d8be91e audit: print empty EXECVE args)
Merging devicetree/for-next (d061864b89c3 ARM: dt: relicense two DT binding IRQ headers)
Merging mailbox/mailbox-for-next (9f0a0a381c5d mailbox: mediatek: Add check for possible failure of kzalloc)
Merging spi/for-next (db4e5a2ae3a8 Merge remote-tracking branch 'spi/topic/of' into spi-next)
Merging tip/auto-latest (11b080f48a8a Merge branch 'x86/urgent')
Applying: fix for "locking/atomics: Check generated headers are up-to-date"
Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC)
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (a324e9396ca3 EDAC, skx: Fix randconfig builds)
Merging irqchip/irq/irqchip-next (2130b789b3ef irqchip/gic: Unify GIC priority definitions)
Merging ftrace/for-next (a2acce536921 tracing: Have stack tracer trace full stack)
Merging rcu/rcu/next (0b1aba265b93 Merge LKMM and RCU branches)
Merging kvm/linux-next (22a7cdcae6a4 KVM/nVMX: Do not validate that posted_intr_desc_addr is page aligned)
Merging kvm-arm/next (e4e11cc0f81e KVM: arm64: Safety check PSTATE when entering guest and handle IL)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (6e301a8e56e4 KVM: PPC: Optimize clearing TCEs for sparse tables)
Merging kvms390/next (ed3054a30258 Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext)
Merging xen-tip/linux-next (7a048cec598e xen: drop writing error messages to xenstore)
Merging percpu/for-next (ad19ef010db1 Merge branch 'for-4.19-fixes' into for-next)
Merging workqueues/for-next (87915adc3f0a workqueue: re-add lockdep dependencies for flushing)
Merging drivers-x86/for-next (651022382c7f Linux 4.20-rc1)
Merging chrome-platform/for-next (bc3f4b5c60db platform/chrome: chromeos_tbmc - Remove unneeded const)
Merging hsi/for-next (5b394b2ddf03 Linux 4.19-rc1)
Merging leds/for-next (eabf06ed6169 Fix pattern handling optimalization)
Merging ipmi/for-next (99d18a3da861 ipmi: clean an indentation issue, remove extraneous space)
Merging driver-core/driver-core-next (651022382c7f Linux 4.20-rc1)
Merging usb/usb-next (651022382c7f Linux 4.20-rc1)
Merging usb-gadget/next (3b766f453557 USB: net2280: Remove ->disconnect() callback from net2280_pullup())
Merging usb-serial/usb-next (17c42e34997a USB: serial: cypress_m8: remove set but not used variable 'iflag')
Merging usb-chipidea-next/ci-for-usb-next (59739131e0ca usb: chipidea: Fix otg event handler)
Merging phy-next/next (651022382c7f Linux 4.20-rc1)
Merging tty/tty-next (651022382c7f Linux 4.20-rc1)
Merging char-misc/char-misc-next (651022382c7f Linux 4.20-rc1)
Merging extcon/extcon-next (2e464ff0a9b1 extcon: int3496: Convert to use SPDX identifier)
Merging soundwire/next (651022382c7f Linux 4.20-rc1)
Merging staging/staging-next (c49d3f3fa686 staging: greybus: loopback.c: remove unused lists)
Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (23ba90b47dfc interconnect: fix build error without DEBUGFS)
Merging slave-dma/next (651022382c7f Linux 4.20-rc1)
Merging cgroup/for-next (e4b97fff6f7f cpuset: Use descriptive text when reading/writing cpuset.sched.partition)
Merging scsi/for-next (615a1fed8f42 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (33279c305d07 scsi: mvsas: Remove set but not used variable 'id')
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
Merging vhost/linux-next (79f800b2e769 MAINTAINERS: remove reference to bogus vsock file)
Merging rpmsg/for-next (0c0e4ddae234 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (f06db74ce447 Merge branch 'devel' into for-next)
Merging pinctrl/for-next (b533adfdb2f6 Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (5b394b2ddf03 Linux 4.19-rc1)
Merging pwm/for-next (2153bbc12f77 pwm: lpss: Only set update bit if we are actually changing the settings)
Merging userns/for-next (a36700589b85 signal: Guard against negative signal numbers in copy_siginfo_from_user32)
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
Merging random/dev (9b25436662d5 random: make CPU trust a boot parameter)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (f73581f8d9a3 selftests/ftrace: Strip escape sequences for log file)
Merging y2038/y2038 (67314ec7b025 RISC-V: Request newstat syscalls)
Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next)
Merging coresight/next (24a3858f031e coresight: tmc: Fix bad register address for CLAIM)
Merging rtc/rtc-next (3822d1bb0df1 rtc: sc27xx: Always read normal alarm when registering RTC device)
Merging nvdimm/libnvdimm-for-next (594861215c83 acpi, nfit: Further restrict userspace ARS start requests)
Merging at24/at24/for-next (9a9e295e7c5c eeprom: at24: fix unexpected timeout under high load)
Merging ntb/ntb-next (651022382c7f Linux 4.20-rc1)
Merging kspp/for-next/kspp (ec9b3877c2fd Merge branch 'for-next/array_size' into for-next/kspp)
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
Merging cisco/for-next (ff6401301656 Merge branch 'for-powerpc' into for-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Merging fsi/master (15e2a7218c27 fsi: sbefifo: Bump max command length)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging xarray/xarray (8f3f4351bac3 XArray: Correct some 64-bit assumptions)
Merging akpm-current/current (695b46b0a226 ipc: conserve sequence numbers in extended IPCMNI mode)
CONFLICT (content): Merge conflict in include/linux/compiler-gcc.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: vfs: replace current_kernel_time64 with ktime equivalent
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (88b81fb58900 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: Tree for Nov 6
@ 2017-11-06  7:30 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2017-11-06  7:30 UTC (permalink / raw)
  To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List

Hi all,

Changes since 20171103:

New tree: cpupower

The powerpc tree still had its build failure for which I applied a patch.

The crypto tree gained a build failure so I used the version from
next-20171103.

The regmap tree lost its build failure.

The tip tree gained a conflict against the pm tree.

The kvm-arm tree gained conflicts against Linus' tree.

The scsi tree gained a conflict against Linus' tree.

The nvdimm tree lost its build failure.

The akpm-current tree gained a conflict against the arm64 tree.

The akpm tree lost a patch that turned up elsewhere and gained a build
failure for which I reveretd a commit.

Non-merge commits (relative to Linus' tree): 10807
 10067 files changed, 519168 insertions(+), 241982 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, an allmodconfig 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. And finally, a simple boot test of the powerpc
pseries_le_defconfig kernel in qemu (with and without kvm enabled).

Below is a summary of the state of the merge.

I am currently merging 272 trees (counting Linus' and 42 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 (2d6349944d96 Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm)
Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging kbuild-current/fixes (bb3f38c3c5b7 kbuild: clang: fix build failures with sparse check)
Merging arc-current/for-curr (fdbed19697e1 ARC: unbork module link errors with !CONFIG_ARC_HAS_LLSC)
Merging arm-current/fixes (dad4675388fc ARM: add debug ".edata_real" symbol)
Merging m68k-current/for-linus (558d5ad276c9 m68k/mac: Avoid soft-lockup warning after mach_power_off)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (7ecb37f62fe5 powerpc/perf: Fix core-imc hotplug callback failure during imc initialization)
Merging sparc/master (23198ddffb6c sparc32: Add cmpxchg64().)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (d09b9e60e06d tcp: fix DSACK-based undo on non-duplicate ACK)
Merging ipsec/master (cf3796675174 xfrm: do unconditional template resolution before pcpu cache check)
Merging netfilter/master (7400bb4b5800 netfilter: nf_reject_ipv4: Fix use-after-free in send_reset)
Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set)
Merging wireless-drivers/master (a6127b4440d1 Merge tag 'iwlwifi-for-kalle-2017-10-06' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (9618aec3349b Merge tag 'mac80211-for-davem-2017-10-25' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging sound-current/for-linus (f5ce817951f3 ALSA: usb-audio: support new Amanero Combo384 firmware version)
Merging pci-current/for-linus (814eae5982cc alpha/PCI: Move pci_map_irq()/pci_swizzle() out of initdata)
Merging driver-core.current/driver-core-linus (bb176f67090c Linux 4.14-rc6)
Merging tty.current/tty-linus (8a5776a5f498 Linux 4.14-rc4)
Merging usb.current/usb-linus (bb176f67090c Linux 4.14-rc6)
Merging usb-gadget-fixes/fixes (7c80f9e4a588 usb: usbtest: fix NULL pointer dereference)
Merging usb-serial-fixes/usb-linus (0b07194bb55e Linux 4.14-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
Merging phy/fixes (2fb850092fd9 phy: rockchip-typec: Check for errors from tcphy_phy_init())
Merging staging.current/staging-linus (bb176f67090c Linux 4.14-rc6)
Merging char-misc.current/char-misc-linus (bb176f67090c Linux 4.14-rc6)
Merging input-current/for-linus (6f29c244075c Input: sparse-keymap - send sync event for KE_SW/KE_VSW)
Merging crypto-current/master (441f99c90497 crypto: ccm - preserve the IV buffer)
Merging ide/master (b671e1703394 PNP: ide: constify pnp_device_id)
Merging vfio-fixes/for-linus (796b755066dd vfio/pci: Fix handling of RC integrated endpoint PCIe capability size)
Merging kselftest-fixes/fixes (a323335e62cc selftests: lib.mk: print individual test results to console by default)
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 nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
Merging spi-nor-fixes/spi-nor/fixes (8a5776a5f498 Linux 4.14-rc4)
Merging mfd-fixes/for-mfd-fixes (0f0fc5c09005 Revert "mfd: da9061: Fix to remove BBAT_CONT register from chip model")
Merging v4l-dvb-fixes/fixes (ead666000a5f media: dvb_frontend: only use kref after initialized)
Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation)
Merging mips-fixes/mips-fixes (ca208b5f19cb MIPS: Update email address for Marcin Nowakowski)
Merging drm-intel-fixes/for-linux-next-fixes (bb5cf3386327 drm/i915: Check incoming alignment for unfenced buffers (on i915gm))
Merging drm-misc-fixes/for-linux-next-fixes (62676d10b483 qxl: alloc & use shadow for dumb buffers)
Merging kbuild/for-next (2c063bfbb917 Merge branches 'kbuild' and 'misc' into for-next)
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
Merging dma-mapping/for-next (c9eb6172c328 dma-mapping: turn dma_cache_sync into a dma_map_ops method)
Merging asm-generic/master (a351e9b9fc24 Linux 4.11)
Merging arc/for-next (64dd3a7c8202 Merge remote-tracking branch 'reset/reset/arc' into for-next)
Merging arm/for-next (4dd490dc84fd Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (07141342149a arm64: MAINTAINERS: hisi: Add HiSilicon SoC PMU support)
Merging arm-soc/for-next (0cfcfe8ec6de Merge branch 'next/drivers' into for-next)
CONFLICT (modify/delete): include/dt-bindings/pinctrl/stm32h7-pinfunc.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of include/dt-bindings/pinctrl/stm32h7-pinfunc.h left in tree.
CONFLICT (modify/delete): include/dt-bindings/pinctrl/stm32f746-pinfunc.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of include/dt-bindings/pinctrl/stm32f746-pinfunc.h left in tree.
CONFLICT (modify/delete): include/dt-bindings/pinctrl/stm32f429-pinfunc.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of include/dt-bindings/pinctrl/stm32f429-pinfunc.h left in tree.
CONFLICT (content): Merge conflict in drivers/thermal/tegra/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/arm/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/Makefile
CONFLICT (modify/delete): arch/arm/mach-integrator/pci_v3.h deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-integrator/pci_v3.h left in tree.
$ git rm -f arch/arm/mach-integrator/pci_v3.h include/dt-bindings/pinctrl/stm32f429-pinfunc.h include/dt-bindings/pinctrl/stm32f746-pinfunc.h include/dt-bindings/pinctrl/stm32h7-pinfunc.h
Merging actions/for-next (e707b3fe4814 Merge branch 'v4.15/dt64' into next)
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (4f6781bad8f6 Merge branch 'v4.15/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (9c9ae757dc8b Merge branch 'dt-for-v4.15' into for-next)
Merging at91/at91-next (bee152d6af7d Merge branch 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (e83e7335d059 Merge branch anholt/bcm2835-defconfig-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 (ac5a1ba06d5c Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (8270bfa5860d Merge branch 'for_4.15/keystone-soc' into next)
Merging mvebu/for-next (c6c5ff72be36 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (a95e738b4c72 Merge branch 'omap-for-v4.15/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging reset/reset/next (b9cbcd5f933c reset: remove reset_control_get(_optional))
Merging qcom/for-next (e7048ed58ed9 Merge tag 'qcom-drivers-for-4.15-2' into final-for-4.15)
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (7cec0c56730a Merge branch 'arm64-dt-for-v4.15' into next)
Merging rockchip/for-next (308c3c77ccb3 Merge branch 'v4.15-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging samsung-krzk/for-next (767d6ca130af Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (b5996699462f Merge branches 'sunxi/dt-for-4.15' and 'sunxi/dt64-for-4.15' into sunxi/for-next)
Merging tegra/for-next (ec0c973f47c7 Merge branch for-4.15/reset into for-next)
Merging arm64/for-next/core (fb8722735f50 arm64: support __int128 on gcc 5+)
CONFLICT (content): Merge conflict in drivers/acpi/arm64/iort.c
Merging clk/clk-next (ccf6413a3013 Merge branch 'clk-gpio' into clk-next)
Merging clk-samsung/for-next (a4f21e9ceb5c clk: samsung: Remove obsolete clkdev alias support)
Merging c6x/for-linux-next (62016565bb04 c6x: remove unused KTHREAD_SIZE definition)
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 (10df0ba4c2c2 m68k/defconfig: Update defconfigs for v4.14-rc1)
Merging m68knommu/for-next (670c50807af2 m68k: coldfire: add dspi0 module support)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
Merging microblaze/next (dfe390a6d844 microblaze: add missing include to mmu_context_mm.h)
Merging mips/mips-for-linux-next (64876b53b008 Merge branches '4.14-fixes' and '4.15-features' into mips-for-linux-next)
Merging nios2/for-next (65d1e3ddeae1 nios2: time: Read timer in get_cycles only if initialized)
Merging openrisc/for-next (610f01b9a88a openrisc: fix possible deadlock scenario during timer sync)
Merging parisc-hd/for-next (569dbb88e80d Linux 4.13)
Merging powerpc/next (4dd9eab39c71 powerpc/pseries: Cleanup error handling in iommu_pseries_alloc_group())
CONFLICT (content): Merge conflict in arch/powerpc/mm/tlb-radix.c
CONFLICT (content): Merge conflict in arch/powerpc/kvm/powerpc.c
Applying: powerpc/64s: ppc_save_regs is now needed for all 64s builds
Merging fsl/next (a4e89ffb5923 powerpc/e6500: Update machine check for L1D cache err)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging risc-v/for-linux-next (fbe934d69eb7 RISC-V: Build Infrastructure)
Merging s390/features (30e8eb867122 s390/qdio: sanitize put_indicator)
CONFLICT (modify/delete): arch/s390/include/asm/rwsem.h deleted in s390/features and modified in HEAD. Version HEAD of arch/s390/include/asm/rwsem.h left in tree.
$ git rm -f arch/s390/include/asm/rwsem.h
Merging sparc-next/master (9cd6681cb116 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
Merging tile/master (777a45b45866 arch/tile: Implement ->set_state_oneshot_stopped())
Merging uml/linux-next (6d20e6b235aa um: return negative in tuntap_open_tramp())
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild
Merging xtensa/xtensa-for-next (271335b9726e Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (a0b3bc855374 fscrypt: lock mutex before checking for bounce page pool)
CONFLICT (modify/delete): include/linux/fscrypt_common.h deleted in fscrypt/master and modified in HEAD. Version HEAD of include/linux/fscrypt_common.h left in tree.
$ git rm -f include/linux/fscrypt_common.h
Merging befs/for-next (5771a8c08880 Linux v4.13-rc1)
Merging btrfs/next (5226fcac7841 squashfs: Add zstd support)
Merging btrfs-kdave/for-next (cfdd4c2552b6 Merge branch 'for-next-next-v4.15-20171101' into for-next-20171101)
Merging ceph/master (6c2838fbdedb ceph: unlock dangling spinlock in try_flush_caps())
Merging cifs/for-next (4f2ba5dc183b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (80b9230b8819 Pull isofs signed char fixes and quota writeback fix.)
Merging ext4/dev (05b0a19805bf ext4: mention noload when recovering on read-only device)
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Merging f2fs/dev (d7cf341a2381 f2fs: don't bother with inode->i_version)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (c6cdd51404b7 fuse: fix READDIRPLUS skipping an entry)
Merging jfs/jfs-next (88a96fa84186 jfs: Add missing NULL pointer check in __get_metapage)
Merging nfs/linux-next (2d6349944d96 Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm)
Merging nfsd/nfsd-next (5f04ab40748f svcrdma: Preserve CB send buffer across retransmits)
Merging orangefs/for-next (0b08273c8ab7 orangefs: Adjust three checks for null pointers)
Merging overlayfs/overlayfs-next (fa0096e3bad6 ovl: do not cleanup unsupported index entries)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (89b68cd92663 UBI: Fix two typos in comments)
Merging xfs/for-next (0dca060c2a5a xfs: scrub: avoid uninitialized return code)
Merging file-locks/locks-next (3b9f8ed25dbe Merge branch 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata)
Merging vfs/for-next (f8340cc34799 mips: switch to {get,put}_compat_sigset())
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (9afe77ed849d added new line symbol after warning about dropped messages)
Merging pci/next (b2e209f8b6dd Merge branch 'pci/host-v3-semi' into next)
CONFLICT (content): Merge conflict in drivers/pci/host/pcie-tango.c
Merging pstore/for-next/pstore (e19b205be43d Linux 4.14-rc2)
Merging hid/for-next (3d375a75caae Merge branch 'for-4.15/logitech' into for-next)
Merging i2c/i2c/for-next (43eda8a5cdb0 Merge branch 'i2c/for-4.15' 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 (0bcea5c474d1 firmware: dmi: handle missing DMI data gracefully)
Merging hwmon-staging/hwmon-next (4d420a6a9ddd pmbus: Add driver for Maxim MAX31785 Intelligent Fan Controller)
Merging jc_docs/docs-next (45653c845b0c scripts: Add a script to find unused documentation)
CONFLICT (content): Merge conflict in Documentation/process/index.rst
Merging v4l-dvb/master (9917fbcfa20a media: camss-vfe: always initialize reg at vfe_set_xbar_cfg())
CONFLICT (modify/delete): drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h left in tree.
CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/i2c/ov5693/Makefile
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/imx227.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/imx227.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/imx219.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/imx219.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/imx175.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/imx175.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/imx134.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/imx134.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/dw9714.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/dw9714.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/dw9714.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/dw9714.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/drv201.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/drv201.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/drv201.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/drv201.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/common.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/common.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/ad5816g.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/ad5816g.h left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/ad5816g.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/ad5816g.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/atomisp/i2c/imx/Makefile deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/atomisp/i2c/imx/Makefile left in tree.
$ git rm -f drivers/staging/media/atomisp/i2c/imx/Makefile drivers/staging/media/atomisp/i2c/imx/ad5816g.c drivers/staging/media/atomisp/i2c/imx/ad5816g.h drivers/staging/media/atomisp/i2c/imx/common.h drivers/staging/media/atomisp/i2c/imx/drv201.c drivers/staging/media/atomisp/i2c/imx/drv201.h drivers/staging/media/atomisp/i2c/imx/dw9714.c drivers/staging/media/atomisp/i2c/imx/dw9714.h drivers/staging/media/atomisp/i2c/imx/imx134.h drivers/staging/media/atomisp/i2c/imx/imx175.h drivers/staging/media/atomisp/i2c/imx/imx219.h drivers/staging/media/atomisp/i2c/imx/imx227.h drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c
Merging v4l-dvb-next/master (db6321a1af84 media: platform: VIDEO_QCOM_CAMSS should depend on HAS_DMA)
Merging fbdev/fbdev-for-next (cb6bc3ff59e3 video: sa1100fb: move pseudo palette into sa1100fb_info structure)
Merging pm/linux-next (efe4e10cf142 Merge branch 'pm-devfreq' into linux-next)
Merging cpupower/cpupower (88ab08cc8dfe tools/power/cpupower: add libcpupower.so.0.0.1 to .gitignore)
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (9e66317d3c92 Linux 4.14-rc3)
Merging thermal/next (dbac386afa1f Merge branches 'thermal-core', 'thermal-intel', 'thermal-tool' and 'imx-nvmem' into next)
CONFLICT (content): Merge conflict in tools/thermal/tmon/Makefile
Merging thermal-soc/next (b2fd708ffa7f thermal: cpu_cooling: pr_err() strings should end with newlines)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (2798b80b3853 Merge branch 'eBPF-based-device-cgroup-controller')
Merging ipsec-next/master (2a171788ba7b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging netfilter-next/master (e8daf27c2fea netfilter: nf_ct_h323: Out Of Bound Read in Netfilter Conntrack)
Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock)
Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.)
Merging wireless-drivers-next/master (e226fb5affcc Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (a990d91d3754 Bluetooth: Remove myself from the MAINTAINERS file)
Merging mac80211-next/master (7c0c5c0ba731 cfg80211: initialize regulatory keys/database later)
Merging rdma/for-next (5455e73a76a3 bnxt_re: Implement the shutdown hook of the L2-RoCE driver interface)
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/catas.c
Merging gfs2/for-next (d0920a9cd7e7 gfs2: Allow gfs2_xattr_set to be called with the glock held)
Merging mtd/master (36de80740008 mtd: nand: atmel: fix buffer overflow in atmel_pmecc_user)
Merging l2-mtd/master (16271224bcf0 Merge tag 'nand/for-4.15' of git://git.infradead.org/l2-mtd)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
Merging nand/nand/next (30863e38ebeb mtd: nand: Fix writing mtdoops to nand flash.)
Merging spi-nor/spi-nor/next (ec0a9f62b393 mtd: intel-spi: Add Intel Lewisburg PCH SPI super SKU PCI ID)
Merging crypto/master (7a373fd74a8d crypto: atmel-aes - Reset the controller before each use)
CONFLICT (modify/delete): drivers/crypto/mv_cesa.h deleted in crypto/master and modified in HEAD. Version HEAD of drivers/crypto/mv_cesa.h left in tree.
$ git rm -f drivers/crypto/mv_cesa.h
$ git reset --hard HEAD^
Merging next-20171103 version of crypto
Merging drm/drm-next (36a5fdf76d32 Merge tag 'drm-intel-next-2017-10-23' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/sun4i/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/pl111/Makefile
CONFLICT (modify/delete): drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h deleted in drm/drm-next and modified in HEAD. Version HEAD of drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h left in tree.
$ git rm -f drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv04.h
Merging drm-amd-dc/drm-next-amd-dc-staging (26c860d55796 Merge branch 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux into drm-next)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (136109c67f67 drm/i915: Set up mocs tables before restarting the engines)
Merging drm-tegra/drm/tegra/for-next (fb83be887390 drm/tegra: hdmi: Add cec-notifier support)
Merging drm-misc/for-linux-next (e073db5c5d7a drm/vc4: Fix wrong printk format in vc4_bo_stats_debugfs())
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 (f5fc2e1173a3 drm/msm: fix msm_rd_dump_submit prototype)
Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables)
Merging mali-dp/for-upstream/mali-dp (a593a185218e drm: gem_cma_helper.c: Allow importing of contiguous scatterlists with nents > 1)
Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next)
Merging imx-drm/imx-drm/next (e64b9189bfd5 gpu: ipu-v3: ipu-dc: Remove unused 'di' variable)
Merging etnaviv/etnaviv/next (330b52bd9bba drm/etnaviv: short-circuit perfmon ioctls)
Merging kconfig/for-next (6f7da290413b Linux 4.12)
Merging regmap/for-next (c60b17521664 Merge remote-tracking branches 'regmap/topic/const' and 'regmap/topic/hwspinlock' into regmap-next)
Merging sound/for-next (727dede0ba8a sound: Retire OSS)
CONFLICT (modify/delete): sound/oss/waveartist.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/waveartist.h left in tree.
CONFLICT (modify/delete): sound/oss/v_midi.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/v_midi.h left in tree.
CONFLICT (modify/delete): sound/oss/ulaw.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/ulaw.h left in tree.
CONFLICT (modify/delete): sound/oss/tuning.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/tuning.h left in tree.
CONFLICT (modify/delete): sound/oss/sound_firmware.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/sound_firmware.h left in tree.
CONFLICT (modify/delete): sound/oss/sound_calls.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/sound_calls.h left in tree.
CONFLICT (modify/delete): sound/oss/sleep.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/sleep.h left in tree.
CONFLICT (modify/delete): sound/oss/sb_ess.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/sb_ess.h left in tree.
CONFLICT (modify/delete): sound/oss/sb_ess.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/sb_ess.c left in tree.
CONFLICT (modify/delete): sound/oss/sb.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/sb.h left in tree.
CONFLICT (modify/delete): sound/oss/pas2.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/pas2.h left in tree.
CONFLICT (modify/delete): sound/oss/os.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/os.h left in tree.
CONFLICT (modify/delete): sound/oss/mpu401.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/mpu401.h left in tree.
CONFLICT (modify/delete): sound/oss/midi_synth.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/midi_synth.h left in tree.
CONFLICT (modify/delete): sound/oss/midi_ctrl.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/midi_ctrl.h left in tree.
CONFLICT (modify/delete): sound/oss/hex2hex.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/hex2hex.c left in tree.
CONFLICT (modify/delete): sound/oss/bin2hex.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/bin2hex.c left in tree.
CONFLICT (modify/delete): sound/oss/ad1848.h deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/ad1848.h left in tree.
CONFLICT (modify/delete): sound/oss/Makefile deleted in sound/for-next and modified in HEAD. Version HEAD of sound/oss/Makefile left in tree.
$ git rm -f sound/oss/Makefile sound/oss/ad1848.h sound/oss/bin2hex.c sound/oss/hex2hex.c sound/oss/midi_ctrl.h sound/oss/midi_synth.h sound/oss/mpu401.h sound/oss/os.h sound/oss/pas2.h sound/oss/sb.h sound/oss/sb_ess.c sound/oss/sb_ess.h sound/oss/sleep.h sound/oss/sound_calls.h sound/oss/sound_firmware.h sound/oss/tuning.h sound/oss/ulaw.h sound/oss/v_midi.h sound/oss/waveartist.h
Merging sound-asoc/for-next (7392f77f14e6 Merge remote-tracking branches 'asoc/topic/wm8741', 'asoc/topic/wm97xx' and 'asoc/topic/zte' into asoc-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/include/amd_shared.h
Merging modules/modules-next (ece1996a21ee module: Do not paper over type mismatches in module_param_call())
Merging input/next (4e974c120039 Input: convert autorepeat timer to use timer_setup())
Merging block/for-next (7770c264640b Merge branch 'for-4.15/block' into for-next)
CONFLICT (content): Merge conflict in drivers/cdrom/Makefile
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (3282fe675b95 dm zoned: ignore last smaller runt zone)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (379777297cb1 mmc: dw_mmc: Convert timers to use timer_setup())
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (ae33a97e9227 md: be cautious about using ->curr_resync_completed for ->recovery_offset)
Merging mfd/for-mfd-next (9a43206bffe8 mfd: axp20x: Add axp20x-regulator cell for AXP813)
Merging backlight/for-backlight-next (5158cc2d4eca backlight: tps65217_bl: Remove unnecessary default brightness check)
Merging battery/for-next (0b07194bb55e Linux 4.14-rc7)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (f9f5357f6bdc Merge remote-tracking branches 'regulator/topic/da9211' and 'regulator/topic/pfuze100' into regulator-next)
Merging security/next-testing (d6d80cb57be4 Smack: Base support for overlayfs)
Merging integrity/next (e87dafe70acc ima: Remove redundant conditional operator)
CONFLICT (content): Merge conflict in Documentation/ABI/testing/evm
Merging keys/keys-next (8ab2a6905b28 KEYS: Add documentation for asymmetric keyring restrictions)
Merging selinux/next (5794ed762ac2 selinux: remove extraneous initialization of slots_used and max_chain_len)
Merging tpmdd/next (9dd0ff974241 tpm: Update MAINTAINERS for Jason Gunthorpe)
CONFLICT (content): Merge conflict in include/linux/tpm_eventlog.h
Merging watchdog/master (4cb30b044a8f watchdog: mei_wdt: constify mei_cl_device_id)
Merging iommu/next (a593472591a5 Merge branches 'iommu/fixes', 'arm/omap', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (537b559a6114 Merge branches 'vfio/fixes', 'vfio/platform', 'iommu/arm/smmu' and 'iommu/updates' into next-20171025)
Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig)
Merging audit/next (7dfecd0a6b9f Audit: remove unused audit_log_secctx function)
Merging devicetree/for-next (e45fe7f788dd scripts/dtc: Update to upstream version v1.4.5-6-gc1e55a5513e9)
CONFLICT (content): Merge conflict in drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
Merging mailbox/mailbox-for-next (22d28b0ffcf4 mailbox: Build Broadcom FlexRM driver as loadable module for iProc SOCs)
Merging spi/for-next (4acc94f2fdaa Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave', 'spi/topic/spreadtrum' and 'spi/topic/tegra114' into spi-next)
Merging tip/auto-latest (4f0aa3f0c451 Merge branch 'linus')
CONFLICT (modify/delete): sound/oss/uart6850.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of sound/oss/uart6850.c left in tree.
CONFLICT (modify/delete): sound/oss/sys_timer.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of sound/oss/sys_timer.c left in tree.
CONFLICT (modify/delete): sound/oss/soundcard.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of sound/oss/soundcard.c left in tree.
CONFLICT (modify/delete): sound/oss/midibuf.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of sound/oss/midibuf.c left in tree.
CONFLICT (content): Merge conflict in net/ipv4/tcp_output.c
CONFLICT (content): Merge conflict in kernel/trace/bpf_trace.c
CONFLICT (content): Merge conflict in kernel/events/core.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/file_ops.c
CONFLICT (content): Merge conflict in drivers/idle/intel_idle.c
CONFLICT (content): Merge conflict in drivers/block/amiflop.c
CONFLICT (content): Merge conflict in arch/s390/lib/spinlock.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/spinlock.h
CONFLICT (modify/delete): arch/s390/include/asm/rwsem.h deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/s390/include/asm/rwsem.h left in tree.
CONFLICT (content): Merge conflict in arch/powerpc/mm/numa.c
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
$ git rm -f arch/s390/include/asm/rwsem.h sound/oss/midibuf.c sound/oss/soundcard.c sound/oss/sys_timer.c sound/oss/uart6850.c
Merging clockevents/clockevents/next (8a7507eea818 clocksource/drivers/mips-gic-timer: Add fastpath for local timer updates)
CONFLICT (content): Merge conflict in drivers/clocksource/mips-gic-timer.c
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (a8e9b186f153 EDAC, sb_edac: Fix missing break in switch)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (a96a5037ed0f tracing, thermal: Hide cpu cooling trace events when not in use)
Merging rcu/rcu/next (e8c9900b339c rcu: Account for rcu_all_qs() in cond_resched())
Merging kvm/linux-next (6d6ab940dc8b Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD)
Merging kvm-arm/next (abf14ccc8fb4 KVM: arm/arm64: fix the incompatible matching for external abort)
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c
CONFLICT (content): Merge conflict in arch/arm64/kvm/inject_fault.c
CONFLICT (content): Merge conflict in arch/arm/kvm/emulate.c
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (c01015091a77 KVM: PPC: Book3S HV: Run HPT guests on POWER9 radix hosts)
Merging kvms390/next (8a3175a917cf KVM: s390: vsie: use common code functions for pinning)
Merging xen-tip/linux-next (6f0e8bf16730 xen: support 52 bit physical addresses in pv guests)
Merging percpu/for-next (438a50618095 percpu: don't forget to free the temporary struct pcpu_alloc_info)
Merging workqueues/for-next (2ce4badf4315 Merge branch 'for-4.15' into for-next)
Merging drivers-x86/for-next (d45eedd5c006 platform/x86: intel_pmc_ipc: Use spin_lock to protect GCR updates)
CONFLICT (content): Merge conflict in Documentation/admin-guide/thunderbolt.rst
Merging chrome-platform/for-next (859eb05676f6 platform/chrome: Use proper protocol transfer function)
Merging hsi/for-next (8635d6b3afe6 dt-bindings: hsi: add omap4 hsi controller bindings)
Merging leds/for-next (f2ea85d760fb leds: lp55xx: fix spelling mistake: 'cound' -> 'could')
Merging ipmi/for-next (71c07ce42ccc ipmi_si_platform: Fix typo in parameter description)
Merging driver-core/driver-core-next (2ec161501798 driver core: Move device_links_purge() after bus_remove_device())
Merging usb/usb-next (a0fea6027f19 USB: Add delay-init quirk for Corsair K70 LUX keyboards)
Merging usb-gadget/next (ce2b21a4e5ce usb: dwc2: Fix UDC state tracking)
Merging usb-serial/usb-next (7c36e6e14da5 USB: serial: f81534: implement break control)
Merging usb-chipidea-next/ci-for-usb-next (2a53e060a053 usb: chipidea: fix trivial typo in Kconfig)
Merging phy-next/next (36914111e682 drivers: phy: add calibrate method)
Merging tty/tty-next (9ce99a3a9284 tty: serial: imx: remove dead code imx_dma_rxint)
Merging char-misc/char-misc-next (e9c16affe064 drivers/pcmcia: omap1: Fix error in automated timer conversion)
CONFLICT (content): Merge conflict in drivers/pcmcia/omap_cf.c
CONFLICT (content): Merge conflict in drivers/misc/lkdtm_core.c
Merging extcon/extcon-next (4a4a87146a07 extcon: max77843: Add support for SmartDock accessory)
Merging staging/staging-next (4b2d9fe87950 staging: fsl-dpaa2/eth: Extra headroom in RX buffers)
CONFLICT (modify/delete): drivers/staging/vme/devices/vme_pio2.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/vme/devices/vme_pio2.h left in tree.
CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
$ git rm -f drivers/staging/vme/devices/vme_pio2.h
Merging mux/for-next (aae4e7a8bc44 Linux 4.13-rc4)
Merging slave-dma/next (cb6a84d840b1 Merge branch 'for-linus' into next)
Merging cgroup/for-next (7674045b516f Merge branch 'for-4.15' into for-next)
CONFLICT (modify/delete): kernel/sched/cpuacct.h deleted in cgroup/for-next and modified in HEAD. Version HEAD of kernel/sched/cpuacct.h left in tree.
CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c
CONFLICT (content): Merge conflict in kernel/cgroup/Makefile
$ git rm -f kernel/sched/cpuacct.h
Merging scsi/for-next (1c356ec5e932 scsi: lpfc: fix kzalloc-simple.cocci warnings)
CONFLICT (content): Merge conflict in include/scsi/scsi_devinfo.h
Merging scsi-mkp/for-next (1c356ec5e932 scsi: lpfc: fix kzalloc-simple.cocci warnings)
Merging target-updates/for-next (17c45b90061a iSCSI-target: Use common error handling code in iscsi_decode_text_input())
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging libata/for-next (844a47c82baa Merge branch 'for-4.15' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (ac7380709f65 vhost: fix end of range for access_ok)
Merging rpmsg/for-next (cad7f2afe66c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (b53b8300bf8e pinctrl: armada-37xx: remove unused variable)
CONFLICT (content): Merge conflict in MAINTAINERS
Applying: gpio: uniphier: merge fix for "Update irq_domain_ops.activate() signature"
Merging pinctrl/for-next (09299176b141 pinctrl: qcom: spmi-gpio: Add pmi8994 gpio support)
Applying: Revert "regmap: Add a config option for hwspinlock"
Applying: Revert "regmap: Clean up hwspinlock on regmap exit"
Applying: Revert "regmap: Also protect hwspinlock in error handling path"
Applying: Revert "regmap: Add hardware spinlock support"
Merging pinctrl-samsung/for-next (2bd6bf03f4c1 Linux 4.14-rc1)
Merging pwm/for-next (7755daf5e7e8 Merge branch 'for-4.14/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 (3fda0e737e90 userns: Simplify insert_extent)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (9e66317d3c92 Linux 4.14-rc3)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (2329c02eed5a selftests/ftrace: Introduce exit_pass and exit_fail)
CONFLICT (content): Merge conflict in tools/testing/selftests/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 (3602b15a20a6 Merge branch 'for-4.15/callbacks' into for-next)
Merging coresight/next (9a937c2f634e doc: coresight: correct usage for disabling idle states)
Merging rtc/rtc-next (afcaf5e02910 rtc: add support for NXP PCF85363 real-time clock)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (25e7798f20e6 Merge branch 'for-4.15/mapsync' into libnvdimm-for-next)
CONFLICT (content): Merge conflict in include/linux/iomap.h
CONFLICT (content): Merge conflict in fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/dax.c
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging kspp/for-next/kspp (5b45b18ecf90 lkdtm: Update usercopy tests for whitelisting)
CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c
Merging akpm-current/current (c72ff29931d5 sysvipc-make-get_maxid-o1-again-checkpatch-fixes)
CONFLICT (content): Merge conflict in mm/slab_common.c
CONFLICT (content): Merge conflict in mm/slab.h
CONFLICT (content): Merge conflict in kernel/fork.c
CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h
CONFLICT (content): Merge conflict in include/net/sock.h
CONFLICT (content): Merge conflict in include/net/inet_sock.h
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in fs/ext4/file.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/netronome/nfp/nfp_net_common.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
CONFLICT (content): Merge conflict in arch/x86/mm/kasan_init_64.c
CONFLICT (content): Merge conflict in Makefile
$ git checkout -b akpm remotes/origin/akpm/master
Applying: lib: optimize cpumask_next_and()
Applying: mm: add infrastructure for get_user_pages_fast() benchmarking
Applying: drivers/pcmcia/sa1111_badge4.c: avoid unused function warning
Applying: arch/ia64/include/asm/topology.h: remove unused parent_node() macro
Applying: arch/sh/include/asm/topology.h: remove unused parent_node() macro
Applying: arch/sparc/include/asm/topology_64.h: remove unused parent_node() macro
Applying: arch/tile/include/asm/topology.h: remove unused parent_node() macro  
Applying: include/asm-generic/topology.h: remove unused parent_node() macro
Applying: EXPERT Kconfig menu: fix broken EXPERT menu
Applying: sparc64: NG4 memset 32 bits overflow
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (ac238248abd0 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
Applying: Revert "lib: optimize cpumask_next_and()"

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: Tree for Nov 6
  2015-11-06 12:45 ` Christian Borntraeger
@ 2015-11-09 21:31   ` Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2015-11-09 21:31 UTC (permalink / raw)
  To: Christian Borntraeger; +Cc: linux-next, linux-kernel

Hi Christian,

On Fri, 6 Nov 2015 13:45:46 +0100 Christian Borntraeger <borntraeger@de.ibm.com> wrote:
>
> can you rename that branch to borntraeger/linux-next ?

Done.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: linux-next: Tree for Nov 6
  2015-11-06  3:24 Stephen Rothwell
@ 2015-11-06 12:45 ` Christian Borntraeger
  2015-11-09 21:31   ` Stephen Rothwell
  0 siblings, 1 reply; 9+ messages in thread
From: Christian Borntraeger @ 2015-11-06 12:45 UTC (permalink / raw)
  To: Stephen Rothwell, linux-next; +Cc: linux-kernel

Am 06.11.2015 um 04:24 schrieb Stephen Rothwell:
> Merging access_once/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops)

Stephen,

can you rename that branch to borntraeger/linux-next ?

It used to carry the access_once reworks, but it will in general hold things
that I work on.

Thanks?

Christian

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: Tree for Nov 6
@ 2015-11-06  3:24 Stephen Rothwell
  2015-11-06 12:45 ` Christian Borntraeger
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2015-11-06  3:24 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

Please do *not* add any material intended for v4.5 to your linux-next
included branches until after v4.4-rc1 has been released.

Changes since 20151105:

The thermal-soc tree still had its build failure for which I reverted
a commit.

The battery tree still had its build failure so I used the version from
next-20150925.

Non-merge commits (relative to Linus' tree): 4836
 4749 files changed, 206535 insertions(+), 74370 deletions(-)

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" and checkout or reset to the new
master.

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log
files in the Next directory.  Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig for x86_64,
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 229 trees (counting Linus' and 35 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@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (66339fdacb63 Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
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 (38850d786a79 ARM: 8449/1: fix bug in vdsomunge swab32 macro)
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 (977bf062bba3 powerpc/dma: dma_set_coherent_mask() should not be GPL only)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (52708d690b8b sparc64: Fix numa distance values)
Merging net/master (49a496c97d03 tcp: use correct req pointer in tcp_move_syn() calls)
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (6ece90f9a13e netfilter: fix Kconfig dependencies for nf_dup_ipv{4,6})
Merging sound-current/for-linus (5cf92c8b3dc5 ALSA: hda - Add Intel Lewisburg device IDs Audio)
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 (f235f664a8af fbcon: initialize blink interval before calling fb_set_par)
Merging usb.current/usb-linus (32b88194f71d Linux 4.3-rc7)
Merging usb-gadget-fixes/fixes (25cb62b76430 Linux 4.3-rc5)
Merging usb-serial-fixes/usb-linus (32b88194f71d Linux 4.3-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (f256896afdb6 usb: chipidea: otg: gadget module load and unload support)
Merging staging.current/staging-linus (32b88194f71d Linux 4.3-rc7)
Merging char-misc.current/char-misc-linus (25cb62b76430 Linux 4.3-rc5)
Merging input-current/for-linus (e60e063c14b1 HID: hid-gfrm: avoid warning for input_configured API change)
Merging crypto-current/master (4afa5f961792 crypto: algif_hash - Only export and import on sockets with data)
Merging ide/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
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 (6a13feb9c828 Linux 4.3)
Merging asm-generic/master (4008cb3ad223 asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging arc/for-next (f6e21a7cc349 ARC: use ASL assmebler mnemonic)
Merging arm/for-next (4f96dfc97367 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 (b6f3dc41232d Merge branch 'next/cleanup' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/timer.c
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sama5d2.dtsi
Applying: ARM: mediatek: fixup for clocksource_of_init API change
Merging at91/at91-next (c544ee640869 Merge tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging berlin/berlin/for-next (27527ea5f2fd Merge branch 'berlin/soc' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (f843df81257a Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next)
Merging mvebu/for-next (2a9e275d2fbf Merge branch 'mvebu/config' into mvebu/for-next)
Merging omap/for-next (f2a148747f11 Merge branch 'omap-for-v4.3/fixes' into for-next)
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 (fcbba086b456 ARM: dts: msm8974: Add SCM firmware node)
CONFLICT (content): Merge conflict in drivers/soc/qcom/smd-rpm.c
CONFLICT (content): Merge conflict in drivers/soc/qcom/Kconfig
Merging renesas/next (c7aba848d39f Merge branches 'heads/defconfig-for-v4.4' and 'heads/dt-for-v4.4' into next)
Merging rockchip/for-next (55e899c44d10 Merge branch 'v4.4-armsoc/drivers' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (4ccfae394061 Merge branch 'v4.4-samsung-defconfig' into for-next)
CONFLICT (content): Merge conflict in drivers/soc/Makefile
CONFLICT (content): Merge conflict in drivers/soc/Kconfig
Merging samsung-krzk/for-next (6ff33f3902c3 Linux 4.3-rc1)
Merging sunxi/sunxi/for-next (7022e5f74246 Merge branch 'sunxi/dt-for-4.4' into sunxi/for-next)
Merging tegra/for-next (2d37df587e3c Merge branch for-4.4/defconfig into for-next)
Merging arm64/for-next/core (f8f8bdc48851 arm64/efi: fix libstub build under CONFIG_MODVERSIONS)
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 (918fc2ee791e cris: Drop reference to get_cmos_time())
Merging h8300/h8300-next (6829bca19fa4 h8300: Don't set CROSS_COMPILE unconditionally)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address)
Merging m68knommu/for-next (4ac313111018 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU)
Merging metag/for-next (3dce23eb8878 metag: Turn irq_ctx_* macros into static inlines)
Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
Merging mips/mips-for-linux-next (4deb27263d5f 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 (a01fece2e418 parisc: Change L1_CACHE_BYTES to 16)
Merging powerpc/next (8bdf2023e238 Merge branch 'next' of git://git.denx.de/linux-denx-agust into next)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (e1f580e8ced5 powerpc/e6500: hw tablewalk: make sure we invalidate and write to the same tlb entry)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (a262ec8adb41 s390/head: fix error message on unsupported hardware)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (09745f38a74e arch/tile: turn off timer tick for oneshot_stopped state)
Merging uml/linux-next (56b88a3bf97a 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 (592fafe644bf Add resilienthandles mount parm)
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 (be69e1c19f0e fs/ext4: remove unnecessary new_valid_dev check)
Merging f2fs/dev (beaa57dd986d f2fs: fix to skip shrinking extent nodes)
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 (c36b97e9430d GFS2: Protect freeing directory hash table with i_lock spin_lock)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (941c3ff3102c Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug)
Merging nfsd/nfsd-next (1bc483f959c8 SUNRPC: drop stale comment in svc_setup_socket())
Merging orangefs/for-next (548049495cb4 Orangefs: fix some checkpatch.pl complaints that had creeped in.)
Merging overlayfs/overlayfs-next (8d3095f4ad47 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 (264e89ad3412 Merge branch 'xfs-dax-updates' into for-next)
Merging file-locks/linux-next (616fb38fa7a9 locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait)
Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root)
Merging pci/next (7225107e1582 Merge branch 'pci/host-layerscape' into next)
Merging hid/for-next (0ca16cfb3a7d Merge branch 'for-4.4/wacom' into for-next)
Merging i2c/i2c/for-next (121c7794864c Merge branch 'i2c/for-4.4' into i2c/for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
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 (3b5ea47dbff0 hwmon: (fam15h_power) Add max compute unit accumulated power)
Merging v4l-dvb/master (8132ccfb864a Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (674327f76bb1 Merge branch 'kbuild/kconfig' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (fca9051bec79 Merge branch 'for-4.4' into for-next)
Merging pm/linux-next (1ab68460b1d0 Merge branches 'pm-avs', 'pm-clk' and 'powercap')
Merging idle/next (f05bd12f0e9c Merge branch 'cpuidle' into release)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (3ce79ae29210 Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next)
Merging thermal-soc/next (e35dbb4d4b44 thermal: exynos: Directly return 0 instead of using local ret variable)
Applying: Revert "thermal: rockchip: support the sleep pinctrl state to avoid glitches in s2r"
Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery)
Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE)
Merging slave-dma/next (fa3cd2a2b840 Merge branch 'for-linus' into next)
Merging net-next/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (92240e8dc0d1 ipvs: Remove possibly unused variables from ip_vs_conn_net_{init,cleanup})
Merging wireless-drivers-next/master (8aaa878de83a Merge ath-next from ath.git)
Merging bluetooth/master (e94c88357784 Bluetooth: Compress the size of struct hci_ctrl)
Merging rdma/for-next (39bfc271bd68 IB/core: Remove old fast registration API)
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
Merging mtd/master (e5a5d92d9dc3 mxc_nand: fix copy_spare)
Merging l2-mtd/master (28ec8a864f4b mtd: nand: sunxi: avoid retrieving data before ECC pass)
CONFLICT (content): Merge conflict in drivers/staging/mt29f_spinand/mt29f_spinand.c
Merging crypto/master (271817a3e92c crypto: asymmetric_keys - Fix unaligned access in x509_get_sig_params())
Merging drm/drm-next (e02328f47bd7 vga_switcheroo: Drop client power state VGA_SWITCHEROO_INIT)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
Merging drm-panel/drm/panel/for-next (f1811a8a6413 drm/bridge: ptn3460: Fix coccinelle warnings)
Merging drm-intel/for-linux-next (99106bc17e66 drm/i915: Do graphics device reset under forcewake)
Merging drm-tegra/drm/tegra/for-next (2bcdcbfae289 drm/tegra: dc: Request/free syncpoint at init/exit)
Merging drm-misc/topic/drm-misc (364b19868ecd drm/dp: add eDP DPCD backlight control bit definitions)
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 (a9ee34b70e07 drm/msm: Remove local fbdev emulation Kconfig option)
Merging sound/for-next (5cf92c8b3dc5 ALSA: hda - Add Intel Lewisburg device IDs Audio)
Merging sound-asoc/for-next (b4b283da6a29 Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fsl-sai', 'asoc/fix/sun4i-codec' and 'asoc/fix/wm8960' into asoc-linus)
Merging modules/modules-next (d1189c63ea5e scripts: [modpost] add new sections to white list)
CONFLICT (content): Merge conflict in scripts/Makefile.modpost
Merging input/next (a748941c95d2 Input: tsc2004 - add support for tsc2004)
Merging block/for-next (3387dbebe45f Merge branch 'for-4.4/lightnvm' into for-next)
Merging device-mapper/for-next (aad9ae455075 dm switch: simplify conditional in alloc_region_table())
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 (7cc8d580228c mmc: dw_mmc: fix the wrong setting for UHS-DDR50 mode)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (339421def582 MD: when RAID journal is missing/faulty, block RESTART_ARRAY_RW)
Merging mfd/for-mfd-next (271bb1773b1e bindings: mfd: s2mps11: Add documentation for s2mps15 PMIC)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/s2mps11.txt
Merging backlight/for-backlight-next (9d6c243502b7 backlight: pm8941-wled: Add default-brightness property)
Merging battery/master (6bd03ce3c12a power: bq27xxx_battery: Remove unneeded dependency in Kconfig)
$ git reset --hard HEAD^
Merging next-20150925 version of battery
Merging omap_dss2/for-next (08bfb453f045 radeonfb: Deinline large functions)
Merging regulator/for-next (62e544b983a0 Merge remote-tracking branches 'regulator/topic/supply', 'regulator/topic/tps6105x' and 'regulator/topic/tps65023' into regulator-next)
Merging security/next (ba94c3ff20c9 Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
CONFLICT (content): Merge conflict in fs/ext4/crypto_key.c
Merging integrity/next (72e1eed8abb1 integrity: prevent loading untrusted certificates on the IMA trusted keyring)
Merging selinux/next (63205654c0e0 selinux: Use a kmem_cache for allocation struct file_security_struct)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (760d280084f8 watchdog: include: add units for timeout values in kerneldoc)
Merging iommu/next (b67ad2f7c751 Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next)
Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback)
Merging vfio/next (033291eccbdb vfio: Include No-IOMMU mode)
Merging jc_docs/docs-next (3ce96239d482 Documentation: add new description of path-name lookup.)
CONFLICT (content): Merge conflict in Documentation/Changes
Merging trivial/for-next (0c6cac7ab444 hwmon: applesmc: fix comment typos)
Merging audit/next (a4416687e957 audit: make audit_log_common_recv_msg() a void function)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (2d799dde8e69 MAINTAINERS: update DT binding doc locations)
CONFLICT (content): Merge conflict in include/linux/of_irq.h
CONFLICT (content): Merge conflict in MAINTAINERS
Merging mailbox/mailbox-for-next (cb1ca0b3bb66 mailbox: mailbox-test: avoid reading iomem twice)
Merging spi/for-next (c70efb851531 Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/ti-qspi' and 'spi/topic/txx9' into spi-next)
CONFLICT (content): Merge conflict in drivers/nfc/trf7970a.c
CONFLICT (content): Merge conflict in drivers/input/touchscreen/tsc2005.c
CONFLICT (content): Merge conflict in drivers/iio/proximity/as3935.c
CONFLICT (content): Merge conflict in drivers/iio/frequency/adf4350.c
CONFLICT (content): Merge conflict in drivers/iio/dac/ad7303.c
CONFLICT (content): Merge conflict in drivers/iio/adc/ti-adc128s052.c
CONFLICT (content): Merge conflict in drivers/iio/adc/mcp320x.c
CONFLICT (content): Merge conflict in drivers/iio/adc/max1027.c
Merging tip/auto-latest (ab441fc80aa8 Merge branch 'x86/urgent')
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 (990995bad13c EDAC: Fix PAGES_TO_MiB macro misuse)
Merging irqchip/irqchip/for-next (29bade08fb07 irqchip: armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (d227c3ae4e94 tracefs: Fix refcount imbalance in start_creating())
CONFLICT (content): Merge conflict in kernel/trace/trace_stack.c
Applying: Add missing 'bool preempt' argument as required by sched_switch's trace event proto
Merging rcu/rcu/next (39cd2dd39a8b Merge branches 'doc.2015.10.06a', 'percpu-rwsem.2015.10.06a' and 'torture.2015.10.06a' into HEAD)
Merging kvm/linux-next (a3eaa8649e4c KVM: VMX: Fix commit which broke PML)
Merging kvm-arm/next (26caea7693cb KVM: arm/arm64: Merge vgic_set_lr() and vgic_sync_lr_elrsr())
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (70aa3961a196 KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path)
Merging kvms390/next (46b708ea875f KVM: s390: use simple switch statement as multiplexer)
Merging xen-tip/linux-next (abed7d0710e8 xen: fix the check of e_pfn in xen_find_pfn_range)
Merging percpu/for-next (5a928541585b kernel: Remove unneeded return from void function)
Merging workqueues/for-next (4fcfc3013144 Merge branch 'for-4.4' into for-next)
Merging drivers-x86/for-next (c52e2e1d3b23 toshiba_acpi: Initialize hotkey_event_type variable)
Merging chrome-platform/for-next (18800fc7a04e platform/chrome: Support reading/writing the vboot context)
Merging regmap/for-next (231e7cb81625 Merge remote-tracking branches 'regmap/topic/rbtree' and 'regmap/topic/update-offload' into regmap-next)
Merging hsi/for-next (16bd5865cdb3 hsi: controllers:remove redundant code)
Merging leds/for-next (ffdc307d038f leds: 88pm860x: add missing of_node_put)
Merging ipmi/for-next (d503e2fbbfea char: ipmi: ipmi_ssif: Replace timeval with timespec64)
Merging driver-core/driver-core-next (c23fe83138ed debugfs: Add debugfs_create_ulong())
Merging tty/tty-next (e052c6d15c61 tty: Use unbound workqueue for all input workers)
Merging usb/usb-next (0bbc367e21bf Merge 4.3-rc7 into usb-next)
Merging usb-gadget/next (81e9d14a53eb usb: gadget: net2280: restore ep_cfg after defect7374 workaround)
Merging usb-serial/usb-next (92944c4520ed USB: qcserial: update comment for Sierra Wireless MC7304/MC7354)
Merging usb-chipidea-next/ci-for-usb-next (2fb2884ed856 usb: chipidea: delete static debug support)
Merging staging/staging-next (8e483ed1342a Merge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
Merging char-misc/char-misc-next (e2d8680741ed fpga: socfpga: Fix check of return value of devm_request_irq)
Merging extcon/extcon-next (11eecf910bd8 extcon: Modify the id and name of external connector)
Merging cgroup/for-next (d57456753787 cgroup: fix race condition around termination check in css_task_iter_next())
CONFLICT (content): Merge conflict in kernel/sched/core.c
CONFLICT (content): Merge conflict in kernel/events/core.c
Applying: vmscan build fix
Merging scsi/for-next (0cb9ad238b50 Merge branch 'mkp-scsi' into misc)
Merging target-updates/for-next (517982229f78 configfs: remove old API)
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 (d99c8053fc24 pinctrl: pinconf: remove needless loop)
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 (0963670aeaec gpio: fix up SPI submenu)
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 (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (e5bf1991ea62 clk: qcom: msm8960: Fix dsi1/2 halt bits)
CONFLICT (content): Merge conflict in drivers/clk/Kconfig
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 (3b5bab390181 selftests: breakpoint: Actually build it)
Merging y2038/y2038 (8750343a6505 coredump: Use 64bit time for unix time of coredump)
Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
Merging access_once/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops)
Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next)
Merging coresight/next (c0d90ad7604a coresight: checking for NULL string in coresight_name_match())
Merging rtc/rtc-next (ae7fb8cb8f67 rtc: Add a driver for Micro Crystal RV8803)
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)
Merging akpm-current/current (f1e1fabe6b48 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/pgtable-generic.c
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in mm/huge_memory.c
CONFLICT (content): Merge conflict in mm/failslab.c
CONFLICT (content): Merge conflict in fs/proc/task_mmu.c
CONFLICT (content): Merge conflict in fs/9p/vfs_file.c
CONFLICT (content): Merge conflict in drivers/usb/host/u132-hcd.c
CONFLICT (content): Merge conflict in block/blk-mq.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arc/mm/cache.c
Applying: mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix
Applying: mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix-fix
Applying: block: fixes for __GPF_WAIT changes
Applying: ndb: fix up for dequeue_signal_lock API change
$ 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: remove-abs64-fix-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: drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS
Applying: kmap_atomic_to_page() has no users, remove it
Applying: include/linux/kdev_t.h: remove unused huge_valid_dev()
Applying: include/linux/kdev_t.h: old/new_valid_dev() can return bool
Applying: fs/9p: remove unnecessary new_valid_dev() checks
Applying: fs/btrfs/inode.c: remove unnecessary new_valid_dev() check
Applying: fs/exofs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/ext2/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/f2fs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/hpfs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/jfs: remove unnecessary new_valid_dev() checks
Applying: fs/ncpfs/dir.c: remove unnecessary new_valid_dev() check
Applying: fs/nilfs2/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/reiserfs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/stat.c: remove unnecessary new_valid_dev() check
Applying: fs/ubifs/: remove unnecessary new_valid_dev() checks
Applying: fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries
Merging akpm/master (129b79e91d92 fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries)

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: Tree for Nov 6
@ 2014-11-06  8:43 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2014-11-06  8:43 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 25638 bytes --]

Hi all,

Due to a move of office, there will not be a linux-next release on
Friday (and maybe Monday).

I did not manage to quite get all my builds done today.  This tree will
not build on 32 bit Sparc (at least).

Changes since 20141105:

The f2fs tree lost its build failure.

The iommu tree lost its build failure.

The usb-gadget tree gained a conflict against the usb tree.

The scsi tree lost its build failure.

The y2038 tree gained conflicts against the staging and v4l-dvb trees.

The akpm-current tree gained a build failure for which I applied a patch.

The akpm tree gained a build failure which I just left.

Non-merge commits (relative to Linus' tree): 4168
 3408 files changed, 123809 insertions(+), 129169 deletions(-)

----------------------------------------------------------------------------

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ).  If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one.  You should use "git fetch" and checkout or reset to the new
master.

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a
multi_v7_defconfig for arm. After the final fixups (if any), it is also
built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and
allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm
defconfig.

Below is a summary of the state of the merge.

I am currently merging 227 trees (counting Linus' and 32 trees of patches
pending for Linus' tree).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (20f3963d8f48 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1)
Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4)
Merging arm-current/fixes (9ff0bb5ba606 ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn())
Merging m68k-current/for-linus (f7bbd12a4b7e m68k: Wire up bpf)
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash)
Merging powerpc-merge-mpe/fixes (8a97577a5967 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux)
Merging sparc/master (7da89a2a3776 sparc64: Fix crashes in schizo_pcierr_intr_other().)
Merging net/master (66f1c44887ba bridge: include in6.h in if_bridge.h for struct in6_addr)
Merging ipsec/master (d10845fc85b2 Merge branch 'gso_encap_fixes')
Merging sound-current/for-linus (0725dda207e9 ALSA: usb-audio: Fix device_del() sysfs warnings at disconnect)
Merging pci-current/for-linus (32f638fc11db PCI: Don't oops on virtual buses in acpi_pci_get_bridge_handle())
Merging wireless/master (0c9a67c8f1d2 Merge tag 'mac80211-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging driver-core.current/driver-core-linus (0df1f2487d2f Linux 3.18-rc3)
Merging tty.current/tty-linus (0df1f2487d2f Linux 3.18-rc3)
Merging usb.current/usb-linus (f20531a9aae0 phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly)
Merging usb-gadget-fixes/fixes (9599815de61d usb: dwc2: gadget: fix enumeration issues)
Merging usb-serial-fixes/usb-linus (e681286de221 USB: opticon: fix non-atomic allocation in write path)
Merging staging.current/staging-linus (bce20b239662 Merge tag 'iio-fixes-for-3.18b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (0df1f2487d2f Linux 3.18-rc3)
Merging input-current/for-linus (e55a3366984c Revert "Input: i8042 - disable active multiplexing by default")
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (09adc8789c4e crypto: qat - Enforce valid numa configuration)
Merging ide/master (7546e52b5e3d Drivers: ide: Remove typedef atiixp_ide_timing)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (a87fa1d81a9f of: Fix overflow bug in string property parsing functions)
Merging rr-fixes/fixes (f49819560f53 virtio-rng: skip reading when we start to remove the device)
Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
Merging kselftest-fixes/fixes (7069a97a1415 selftests/net: move test out of Makefile into a shell script)
Merging drm-intel-fixes/for-linux-next-fixes (0df1f2487d2f Linux 3.18-rc3)
Merging asm-generic/master (f3670394c29f Revert "x86/efi: Fixup GOT in all boot code paths")
Merging arc/for-next (996bad6cb351 ARC: add power management options)
Merging arm/for-next (9ff0bb5ba606 ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn())
Merging arm-perf/for-next/perf (af66abfe2ec8 arm: perf: fold hotplug notifier into arm_pmu)
Merging arm-soc/for-next (d6d798c1db44 Merge branch 'fixes' into for-next)
Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
Merging berlin/berlin/for-next (bb3adf0f4627 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (e173c7d26265 Merge branch 'imx/dt' into for-next)
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (0626430385b7 Merge branch 'mvebu/dt' into mvebu/for-next)
Merging renesas/next (fa8b1f634502 Merge branches 'heads/defconfig-for-v3.19', 'heads/soc-for-v3.19', 'heads/dt-for-v3.19' and 'heads/dt-cleanups-for-v3.19' into next)
Merging samsung/for-next (5d184e4fb69a Merge branch 'v3.19-next/pm-samsung-2' into for-next)
Merging sunxi/sunxi/for-next (2f38ad8b07ac Merge branch 'sunxi/dt-for-3.19' into sunxi/for-next)
Merging tegra/for-next (5599b9197647 Merge branch for-3.18/defconfig into for-next)
Merging arm64/for-next/core (0a6479b0ffad arm64: Remove unneeded extern keyword)
Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
Merging cris/for-next (21bd887cd7c4 CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD)
Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
Merging ia64/next (0f33be009b89 Linux 3.17-rc6)
Merging m68k/for-next (bcf8eb09b564 nubus: Remove superfluous interrupt disable/restore)
Merging m68knommu/for-next (cac7f2429872 Linux 3.18-rc2)
Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check)
Merging microblaze/next (a4f174dee4ae microblaze: Wire up bpf syscall)
Merging mips/mips-for-linux-next (456fbdb023b2 Merge branch '3.18-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (5e40d331bd72 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging powerpc-mpe/next (8a97577a5967 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux)
Merging fsl/next (cb0446c1b625 Revert "powerpc/fsl_msi: spread msi ints across different MSIRs")
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging s390/features (eaf785d51dc6 s390/cpum_sf: Remove initialization of PMU event index)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (01f7ae056916 arch: tile: kernel: signal.c: Use __copy_from/to_user() instead of __get/put_user())
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (66acb0216d5a Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
Merging btrfs/next (a43bb39b5c71 btrfs: Fix compile error when CONFIG_SECURITY is not set.)
Merging ceph/master (c27a3e4d667f libceph: do not hard code max auth ticket len)
Merging cifs/for-next (6212096bb0a1 [CIFS] Update modinfo cifs version for cifs.ko)
Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (831115af5ca3 eCryptfs: Remove unnecessary casts when parsing packet lengths)
Merging ext3/for_next (3c9cafe05ff0 fs, jbd: use a more generic hash function)
Merging ext4/dev (ae9e9c6aeea6 ext4: make ext4_ext_convert_to_initialized() return proper number of blocks)
Merging f2fs/dev (d5053a34a9cc f2fs: introduce -o fastboot for reducing booting time only)
Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.)
CONFLICT (content): Merge conflict in fs/fscache/object.c
Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT)
Merging gfs2/master (1a8550332a7f GFS2: If we use up our block reservation, request more next time)
Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr)
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (6debb30deb5e NFS: SEEK is an NFS v4.2 feature)
Merging nfsd/nfsd-next (ccc6398ea5d5 nfsd: clean up comments over nfs4_file definition)
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
Merging ubifs/linux-next (91401a34038e UBI: Fastmap: Calc fastmap size correctly)
Merging xfs/for-next (5d11fb4b9a1d xfs: rework zero range to prevent invalid i_size updates)
Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING)
Merging vfs/for-next (9c883c360fd0 Merge branch 'for-lustre' into for-next)
Merging pci/next (f114040e3ea6 Linux 3.18-rc1)
Merging hid/for-next (351da0b20a0a Merge branch 'for-3.19/upstream' into for-next)
Merging i2c/i2c/for-next (f114040e3ea6 Linux 3.18-rc1)
Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro)
Merging hwmon-staging/hwmon-next (efe8271c1e1b hwmon: (iio_hwmon) Add support for humidity sensors)
Merging v4l-dvb/master (0da19d032fb1 Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (e9f717fb534c Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
Merging libata/for-next (f9ca5ab832e7 libata-scsi: Update SATL for ZAC drives)
Merging pm/linux-next (f23b3d72491b Merge branch 'device-properties' into linux-next)
Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (6ceaf58abe25 Merge branch 'int340x-thermal' of .git into next)
Merging thermal-soc/next (9404b15775ec Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (19583ca584d6 Linux 3.16)
Merging dlm/next (c07127b48c63 dlm: fix missing endian conversion of rcom_status flags)
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
Merging slave-dma/next (f114040e3ea6 Linux 3.18-rc1)
Merging net-next/master (25de4668d094 ipv6: move INET6_MATCH() to include/net/inet6_hashtables.h)
Merging ipsec-next/master (f293a5e33e08 xfrm: add XFRMA_REPLAY_VAL attribute to SA messages)
Merging wireless-next/master (bf515fb11ab5 Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next)
Merging bluetooth/master (0916c02205ed mac802154: fix typo promisuous to promiscuous)
Merging infiniband/for-next (7b909bb49ac2 Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next)
Merging mtd/master (89cf38dd536a mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF chips)
Merging l2-mtd/master (abb1cd00e6b7 mtd: atmel_nand: make PMECC lookup table and offset property optional)
Merging crypto/master (bac68f2c9a43 crypto: caam - add support for rfc4106(gcm(aes)))
Merging drm/drm-next (041df3573d0c Merge tag 'drm-intel-next-2014-10-24' of git://anongit.freedesktop.org/drm-intel into drm-next)
Merging drm-panel/drm/panel/for-next (7d1311b93e58 Linux 3.17-rc1)
Merging drm-intel/for-linux-next (b5bdca7dade9 drm/i915/audio: add DOC comment describing HDA over HDMI/DP)
Merging drm-tegra/drm/tegra/for-next (8ed05f485498 drm/tegra: Depend on COMMON_CLK)
Merging drm-misc/topic/core-stuff (babc94936b7a drm/edid: add #defines and helpers for ELD)
Merging sound/for-next (19566b0bd93c Merge branch 'for-linus' into for-next)
Merging sound-asoc/for-next (3333c009c30c Merge remote-tracking branches 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next)
Merging modules/modules-next (d3051b489aa8 modules, lock around setting of MODULE_STATE_UNFORMED)
Merging virtio/virtio-next (1bbc26062754 virtio-rng: refactor probe error handling)
Merging input/next (02b6a58b83b2 Input: touchscreen - use __maybe_unused instead of ifdef around suspend/resume)
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
Merging block/for-next (0f6ea1801d84 Merge branch 'for-3.19/drivers' into for-next)
Merging device-mapper/for-next (f8cc4537dae7 dm: do not call dm_sync_table() when creating new devices)
Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (71884933b574 mmc:sdhci-pci: enable sdhci doesn't support hs200 quirk for AMD sdhci)
Merging kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging clean-up)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (b395f75eabb3 lib/raid6: Add log level to printks)
Merging mfd/for-mfd-next (4a288f1edf33 mfd: tc6393xb: Fail ohci suspend if full state restore is required)
Merging backlight/for-backlight-next (0df1f2487d2f Linux 3.18-rc3)
Merging battery/master (cdaf3e15385d power: charger-manager: Fix accessing invalidated power supply after charger unbind)
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (f114040e3ea6 Linux 3.18-rc1)
Merging regulator/for-next (5386984c6ba1 Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/s2mps11', 'regulator/topic/sky81452', 'regulator/topic/stub' and 'regulator/topic/suspend' into regulator-next)
Merging security/next (594081ee7145 integrity: do zero padding of the key id)
Merging integrity/next (c2426d2ad502 ima: added support for new kernel cmdline parameter ima_template_fmt)
Merging selinux/next (4093a8443941 selinux: normalize audit log formatting)
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
Merging watchdog/master (8ae1a57f54af watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7)
CONFLICT (content): Merge conflict in drivers/watchdog/s3c2410_wdt.c
Merging iommu/next (5988c921b747 Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip' and 'arm/renesas' into next)
Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
Merging vfio/next (93899a679fd6 vfio-pci: Fix remove path locking)
Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation)
Merging jc_docs/docs-next (4041f42fa17b Merge branch 'docs-3.19' into docs-next)
Merging trivial/for-next (be278e980d95 clocksource: Fix 'clcoksource' typo in comment)
Merging audit/next (915f389d9c52 audit: add Paul Moore to the MAINTAINERS entry)
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (43c0767e17ac of/platform: Move platform devices under /sys/devices/platform)
Merging dt-rh/for-next (d22e9131187d of: add vendor prefix for Chipidea)
Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings)
Merging spi/for-next (024b58aeba17 Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/dw', 'spi/topic/fsl-dspi' and 'spi/topic/gpio' into spi-next)
Merging tip/auto-latest (bb7c44a44b58 Merge branch 'x86/vdso')
Merging clockevents/clockevents/next (b0ad5917960c ARM/ARM64: arch-timer: fix arch_timer_probed logic)
Merging edac/linux_next (d0585cd815fa sb_edac: Claim a different PCI device)
Merging edac-amd/for-next (bc4febe93c2f EDAC, MCE, AMD: Add decoding table for MC6 xec)
Merging irqchip/irqchip/for-next (8fbe8bc2d89b Merge branch 'irqchip/core' into irqchip/for-next)
Merging tiny/tiny/next (d45461ff03ad Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless', 'tiny/no-advice', 'tiny/tinyconfig' and 'tiny/x86-boot-compressed-use-yn' into tiny/next)
Merging ftrace/for-next (70c738a64478 Merge branch 'trace/ftrace/testing' into trace/for-next)
Merging rcu/rcu/next (f120000b06ab Merge branch 'torture.2014.10.28d' into HEAD)
CONFLICT (content): Merge conflict in drivers/md/dm.c
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (c6338ce49445 kvm: kvmclock: use get_cpu() and put_cpu())
Merging kvm-arm/next (f62c95fd4041 Merge tag 'kvm-s390-next-20141028' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_get_last_inst)
Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
Merging xen-tip/linux-next (63401a5dca18 Merge branch 'hypercall_cache_flush_v5' into xentip-linux-next-7)
Merging percpu/for-next (56e4dea81a55 percpu: Convert remaining __get_cpu_var uses in 3.18-rcX)
Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue())
Merging drivers-x86/for-next (725c7f619e20 quirk for Lenovo Yoga 3: no rfkill switch)
Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries)
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (46f6c620e8a1 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/headers' into regmap-next)
Merging hsi/for-next (a26a42508157 HSI: remove deprecated IRQF_DISABLED)
Merging leds/for-next (33faa112cef4 leds: implement sysfs interface locking mechanism)
Merging ipmi/for-next (ef4a48c51321 Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux)
Merging driver-core/driver-core-next (0df1f2487d2f Linux 3.18-rc3)
Merging tty/tty-next (0df1f2487d2f Linux 3.18-rc3)
Merging usb/usb-next (d9c3ae28bd6b uwb: Remove bogus colon after newline from debug message)
CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig
Merging usb-gadget/next (c3761a79c14d usb: dwc2: allow dwc2 to get built when USB_GADGET=m)
CONFLICT (content): Merge conflict in drivers/usb/chipidea/otg_fsm.c
Merging usb-serial/usb-next (679315e5fae1 USB: serial: add Google simple serial SubClass support)
Merging staging/staging-next (be61a0d78449 Merge tag 'iio-for-3.19a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_imon.c
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_igorplugusb.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_igorplugusb.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/namei.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_lib.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/file.c
$ git rm -f drivers/staging/media/lirc/lirc_igorplugusb.c
Merging char-misc/char-misc-next (d512c2098b1a mei: hbm: use client specific print functions)
Merging cgroup/for-next (cea74465e27b cpuset: lock vs unlock typo)
Merging scsi/for-next (6a5411d8719c IB/srp: Separate target and channel variables)
Merging target-updates/for-next (cac7f2429872 Linux 3.18-rc2)
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (3cbfc571a0e5 Merge branch 'devel' into for-next)
Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs)
CONFLICT (content): Merge conflict in drivers/vhost/net.c
Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6)
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (2071d0968e56 Documentation: gpio: guidelines for bindings)
Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition)
Merging pwm/for-next (e2e08970100d pwm: atmel: Fix calculation of prescale value)
Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning)
Merging userns/for-next (a1998908ba46 nfs: fix kernel warning when removing proc entry)
CONFLICT (content): Merge conflict in fs/nfs/client.c
Merging ktest/for-next (d832d743385d ktest: Don't bother with bisect good or bad on replay)
Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (98d147f50eb0 clk: pxa clocks build system fix)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging aio/master (668044a5d632 aio: Make it possible to remap aio ring)
Merging llvmlinux/for-next (ec25a590c29c arm: LLVMLinux: Use global stack register variable for percpu)
Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL)
Merging kselftest/next (49296470830a selftests/timers: change test to use ksft framework)
Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c)
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c
CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
Merging akpm-current/current (f87854f250cb ipc/shm.c: fix overly aggressive shmdt() when calls span multiple segments)
CONFLICT (content): Merge conflict in drivers/usb/storage/debug.c
Applying: mm: convert i_mmap_mutex to rwsem fix
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/gpio/gpio-zevio.c: fix build
Applying: slab: fix cpuset check in fallback_alloc
Applying: slub: fix cpuset check in get_any_partial
Applying: mm/cma: make kmemleak ignore CMA regions
Applying: mm: cma: split cma-reserved in dmesg log
Applying: fs: proc: include cma info in proc/meminfo
Applying: lib/show_mem.c: adds cma reserved information
Applying: lib-show_mem-this-patch-adds-cma-reserved-infromation-fix
Applying: mm: replace remap_file_pages() syscall with emulation
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
Merging akpm/master (c6ebbf6333fe mm: add strictlimit knob)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: Tree for Nov 6
@ 2013-11-06  9:28 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2013-11-06  9:28 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 32536 bytes --]

Hi all,

Changes since 20131105:

Removed tree: audit-current

Changed tree: audit (change of maintainer)

The modules tree lost its very large number of warnings.

The audit tree gained a conflict against Linus' tree and a build failure
so I used the version from next-20131105.

The xen-tip tree gained a conflict agains the arm tree.

The gpio tree gained conflicts against the arm-soc and cortex trees

The akpm tree gained conflicts against the net-next tree.

----------------------------------------------------------------------------

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" as mentioned in the FAQ on the wiki
(see below).

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log files
in the Next directory.  Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a
multi_v7_defconfig for arm. After the final fixups (if any), it is also
built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and
allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final
link) and i386, sparc, sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 210 trees (counting Linus' and 29 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (be408cd3e1fe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging fixes/master (fa8218def1b1 Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap)
Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux)
Merging arc-current/for-curr (18e8a7387340 ARC: [plat-arcfpga] defconfig update)
Merging arm-current/fixes (384b38b66947 ARM: 7873/1: vfp: clear vfp_current_hw_state for dying cpu)
Merging m68k-current/for-linus (55490050df0f m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls)
Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
Merging powerpc-merge/merge (8b5ede69d24d powerpc/irq: Don't switch to irq stack from softirq stack)
Merging sparc/master (6d15ee492809 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging net/master (be408cd3e1fe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging ipsec/master (84502b5ef984 xfrm: Fix null pointer dereference when decoding sessions)
Merging sound-current/for-linus (fab1285a51b7 ALSA: hda - Name Haswell HDMI controllers better)
Merging pci-current/for-linus (67d470e0e171 Revert "x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero")
Merging wireless/master (8ce9beac4661 drivers: net: wireless: b43: Fix possible NULL ptr dereference)
Merging driver-core.current/driver-core-linus (31d141e3a666 Linux 3.12-rc6)
Merging tty.current/tty-linus (6e757ad2c92c tty/serial: at91: fix uart/usart selection for older products)
Merging usb.current/usb-linus (e1466ad5b1ae USB: serial: ftdi_sio: add id for Z3X Box device)
Merging staging.current/staging-linus (31d141e3a666 Linux 3.12-rc6)
Merging char-misc.current/char-misc-linus (31d141e3a666 Linux 3.12-rc6)
Merging input-current/for-linus (5beea882e641 Input: ALPS - add support for model found on Dell XT2)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (f262f0f5cad0 crypto: s390 - Fix aes-cbc IV corruption)
Merging ide/master (64110c16e012 ide: sgiioc4: Staticize ioc4_ide_attach_one())
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions)
Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory")
Merging rr-fixes/fixes (f6537f2f0eba scripts/kallsyms: filter symbols not in kernel address space)
Merging mfd-fixes/master (d0e639c9e06d Linux 3.12-rc4)
Merging vfio-fixes/for-linus (d93b3ac0edb8 VFIO: vfio_iommu_type1: fix bug caused by break in nested loop)
Merging drm-intel-fixes/for-linux-next-fixes (1fbc0d789d12 drm/i915: Fix the PPT fdi lane bifurcate state handling on ivb)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (72decceef59d ARC: [TB10x] Updates for GPIO and pinctrl)
Merging arm/for-next (17e09ac56465 Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next)
Merging arm-perf/for-next/perf (15c03dd4859a Linux 3.12-rc3)
Merging arm-soc/for-next (c1b35c610b89 Merge branch 'next/dt' into for-next)
CONFLICT (content): Merge conflict in drivers/clk/clk-nomadik.c
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig
Merging bcm2835/for-next (7d132055814e Linux 3.10-rc6)
Merging cortex/for-next (797d602db128 ARM: new platform for Energy Micro's EFM32 Cortex-M3 SoCs)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (db8821583488 Merge branches 'imx/fixes-3.13', 'imx/soc-3.14' and 'imx/dt-3.14' into for-next)
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (b91cf40516e0 Merge branch 'mvebu/dt' into for-next)
Merging renesas/next (597472bb771b Merge branch 'heads/clock' into next)
Merging samsung/for-next (d2287944920d Merge branch 'v3.13-next/samsung' into for-next)
Merging tegra/for-next (1ebd0d6a0589 Merge branch for-3.13/maintainers into for-next)
Merging arm64/upstream (aa62c2091129 arm64: compat: Clear the IT state independent of the 32-bit ARM or Thumb-2 mode)
Merging blackfin/for-linus (08b67faa23fd blackfin: Ignore generated uImages)
Merging c6x/for-linux-next (b2c32b32a212 c6x: remove unused COMMON_CLKDEV Kconfig parameter)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols)
Merging h8300-remove/h8300-remove (b400126add8f CREDITS: Add Yoshinori Sato for h8300)
Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
Merging ia64/next (959f58544b7f Linux 3.12-rc7)
Merging m68k/for-next (77a42796786c m68k: Remove deprecated IRQF_DISABLED)
Merging m68knommu/for-next (959f58544b7f Linux 3.12-rc7)
Merging metag/for-next (b6ef9161e43a irq-imgpdc: add ImgTec PDC irqchip driver)
Merging microblaze/next (d5d04bb48f0e Bye, bye, WfW flag)
Merging mips/mips-for-linux-next (edf7b938321e MIPS: Random whitespace clean-ups)
Merging openrisc/for-upstream (56aea88df7b3 openrisc: Refactor 16-bit constant relocation)
Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (89bcde9f4c7f parisc: make "make install" not depend on vmlinux)
Merging powerpc/next (b0c06d333505 powerpc/bpf: Support MOD operation)
Merging mpc5xxx/next (7e198197ec87 powerpc/mpc512x: remove unnecessary #if)
Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (106078641f32 s390/mm,tlb: correct tlb flush on page table upgrade)
Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c
CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
Merging sparc-next/master (f8ce1faf5595 Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
Merging tile/master (e823acc0a9e3 tile: remove stray blank space)
Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (8872366df396 xtensa: Fix broken allmodconfig build)
Merging btrfs/next (d7396f07358a Btrfs: optimize key searches in btrfs_search_slot)
Merging ceph/master (53d028160f1a ceph: implement readv/preadv for sync operation)
Merging cifs/for-next (81f4821f0bec SMB2/SMB3 Copy offload support (refcopy) phase 1)
Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (959f58544b7f Linux 3.12-rc7)
Merging ext3/for_next (7ba3ec5749dd ext2: Fix fs corruption in ext2_get_xip_mem())
Merging ext4/dev (efbed4dc5857 ext4: add ratelimiting to ext4 messages)
Merging f2fs/dev (4bf08ff6f9f3 f2fs: remove unnecessary TestClearPageError when wait pages writeback)
Merging fscache/fscache (f1fe29b4a02d NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open())
Merging fuse/for-next (ce128de6260f fuse: writepages: protect secondary requests from fuse file release)
Merging gfs2/master (2147dbfd059e GFS2: Use generic list_lru for quota)
Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc)
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (fab99ebe39fe NFSv4.2: Remove redundant checks in nfs_setsecurity+nfs4_label_init_security)
Merging nfsd/nfsd-next (3378b7f40d79 nfsd4: fix discarded security labels on setattr)
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
Merging squashfs/master (8ae6a7f5a3a8 squashfs: enhance parallel I/O)
Merging v9fs/for-next (94876b5bb6a8 9P: introduction of a new cache=mmap model.)
Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range)
Merging xfs/for-next (273203699f82 xfs: xfs_remove deadlocks due to inverted AGF vs AGI lock ordering)
CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_sf.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_readdir.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_block.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_da_format.h
Merging vfs/for-next (dc03a60dfcff do_remount(): pull touch_mnt_namespace() up)
CONFLICT (content): Merge conflict in fs/nfsd/nfsfh.c
CONFLICT (content): Merge conflict in fs/9p/vfs_inode_dotl.c
CONFLICT (content): Merge conflict in fs/9p/vfs_inode.c
CONFLICT (content): Merge conflict in fs/9p/vfs_file.c
Merging pci/next (589a1b076ff9 Merge branch 'pci/yijing-pci_is_pcie-v2' into next)
Merging hid/for-next (bdae615c84bb Merge branch 'for-3.13/roccat' into for-next)
Merging i2c/i2c/for-next (8a73cd4cfa15 i2c: exynos5: add High Speed I2C controller driver)
Merging jdelvare-hwmon/master (0f07c1dd7545 hwmon: (lm90) Add support for TI TMP451)
Merging hwmon-staging/hwmon-next (26336c8a36c0 hwmon: (w83793) Clean up a signedness issue)
Merging v4l-dvb/master (5c52a0f259af Merge branch 'build_fixes' into to_next)
Merging kbuild/for-next (9fbe8e5b9724 Merge branch 'kbuild/kconfig' into kbuild/for-next)
Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/for-next (1ca953d5f992 Merge branch 'for-3.13' into for-next)
Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block)
Merging pm/linux-next (4ac728bf9df4 Merge branch 'powercap-next' into linux-next)
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/opp.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c
Merging idle/next (d7b0a1b0b9b1 intel_idle: Support Intel Atom Processor C2000 Product Family)
Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (79122105c394 Merge branches 'intel_powerclamp', 'misc' and 'x86_pkg_temp' of .git into next)
Merging ieee1394/for-next (db9ae8fec7b1 firewire: ohci: Fix deadlock at bus reset)
Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fastmap())
Merging dlm/next (a97f4a66d8ee dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY)
Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging slave-dma/next (6b327a028f09 Merge branch 'for-linus' into next)
Merging dmaengine/next (4a43f394a082 dmaengine: dma_sync_wait and dma_find_channel undefined)
Merging net-next/master (b915550179d9 Merge branch 'huawei_cdc_ncm')
CONFLICT (content): Merge conflict in arch/parisc/include/uapi/asm/socket.h
CONFLICT (modify/delete): arch/h8300/include/uapi/asm/socket.h deleted in HEAD and modified in net-next/master. Version net-next/master of arch/h8300/include/uapi/asm/socket.h left in tree.
$ git rm -f arch/h8300/include/uapi/asm/socket.h
Merging ipsec-next/master (1c5ad13f7c2b net: esp{4,6}: get rid of struct esp_data)
Merging wireless-next/master (6b732323c1e1 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
Merging bluetooth/master (22c9c627a90d Bluetooth: Fix rejecting SMP security request in slave role)
Merging infiniband/for-next (a78fc816b361 Merge branches 'cma', 'ipoib', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next)
Merging mtd/master (d255c59aab2a Merge tag 'for-linus-20131025' of git://git.infradead.org/linux-mtd)
Merging l2-mtd/master (235c044446d6 mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES)
Merging crypto/master (f262f0f5cad0 crypto: s390 - Fix aes-cbc IV corruption)
Merging drm/drm-next (9d6104e0174b drm/sysfs: Do not drop device reference twice)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_crt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c
Applying: drm/i915: Resolve interaction with drm-fixes tree
Merging drm-intel/for-linux-next (f02586dfedf1 drm/i915: Make intel_dp_is_edp() less specific)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c
Merging drm-tegra/drm/for-next (977386a04bae drm/tegra: Reserve syncpoint base for gr3d)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging sound/for-next (fab1285a51b7 ALSA: hda - Name Haswell HDMI controllers better)
Merging sound-asoc/for-next (e98209dda4b1 Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus)
Merging modules/modules-next (08746a65c296 init: fix in-place parameter modification regression)
Applying: modpost: fix bogus 'exported twice' warnings.
Merging virtio/virtio-next (2342d6a6512c virtio_ring: adapt to notify() returning bool)
Merging input/next (c6d81bd7237b Input: add driver for Neonode zForce based touchscreens)
Merging input-mt/for-next (ad81f0545ef0 Linux 3.11-rc1)
Merging cgroup/for-next (0d60e6cd793e Merge branch 'for-3.13' into for-next)
CONFLICT (content): Merge conflict in mm/memcontrol.c
Merging block/for-next (75da81bb4d50 Merge branch 'for-3.13/core' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
CONFLICT (content): Merge conflict in drivers/md/raid5.c
Merging aio-direct/for-next (bb6f7be48318 tmpfs: add support for read_iter and write_iter)
CONFLICT (content): Merge conflict in include/linux/blk_types.h
CONFLICT (content): Merge conflict in fs/nfs/file.c
CONFLICT (content): Merge conflict in fs/nfs/direct.c
CONFLICT (content): Merge conflict in drivers/block/loop.c
Applying: ceph: Fix up for iov_iter changes
Merging device-mapper/for-next (8c5b2d8c4066 MAINTAINERS: add reference to device-mapper's linux-dm.git tree)
Applying: dm_cache: fix up for bvec iterator abstraction
Applying: device-mapper: fixup for api changes
Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (4d22378221bd mmc: core: Add MMC_CAP_RUNTIME_RESUME to resume at runtime_resume)
Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
Merging slab/for-next (139f3f1863de Merge branch 'slab/struct-page' into for-next)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (555c28a5b0c1 raid1: Add some macros to make code clearly.)
Merging mfd/master (5e90169c5a02 mfd: lpc_ich: Add Device IDs for Intel Wildcat Point-LP PCH)
CONFLICT (content): Merge conflict in sound/soc/codecs/mc13783.c
Merging mfd-lj/for-mfd-next (6bfd1e63de34 mfd: lpc_sch: Ignore resource conflicts when adding mfd cells)
Merging battery/master (588bd5918bac power_supply: Fix documentation for TEMP_*ALERT* properties)
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
Applying: video: xilinxfb: Fix for "Use standard variable name convention"
Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (8623ec220b9c omapdss: Add new panel driver for Topolly td028ttec1 LCD.)
Merging regulator/for-next (4445d0094e75 Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next)
Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'trusted' keyring)
CONFLICT (content): Merge conflict in crypto/Makefile
Merging selinux/master (42d64e1add3a selinux: correct locking in selinux_netlbl_socket_connect))
Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
Merging watchdog/master (ec1a1a17a211 watchdog: rt2880_wdt: fix return value check in rt288x_wdt_probe())
Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' into next)
Merging vfio/next (15c03dd4859a Linux 3.12-rc3)
Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages on read error)
Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
Merging trivial/for-next (2bb9936beac2 doc: usb: Fix typo in Documentation/usb/gadget_configs.txt)
CONFLICT (content): Merge conflict in net/netfilter/xt_set.c
Merging audit/master (9410d228a4cf audit: call audit_bprm() only once to add AUDIT_EXECVE information)
CONFLICT (content): Merge conflict in fs/exec.c
$ git reset --hard HEAD^
Merging next-20131105 version of audit
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buffer overflow)
CONFLICT (content): Merge conflict in drivers/pci/host/pci-mvebu.c
CONFLICT (content): Merge conflict in drivers/crypto/caam/jr.c
CONFLICT (content): Merge conflict in arch/arm/mach-integrator/pci_v3.c
Merging dt-rh/for-next (7f60466de9a4 mips: re-order DT init scan)
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/prom.h
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging spi/for-next (f8ce25620cdc Merge remote-tracking branch 'spi/topic/wr' into spi-next)
CONFLICT (content): Merge conflict in drivers/spi/spi.c
Merging tip/auto-latest (fa1471b9ac4e Merge branch 'x86/uaccess')
CONFLICT (modify/delete): tools/perf/config/feature-tests.mak deleted in tip/auto-latest and modified in HEAD. Version HEAD of tools/perf/config/feature-tests.mak left in tree.
CONFLICT (content): Merge conflict in tools/perf/config/Makefile
CONFLICT (content): Merge conflict in include/linux/wait.h
CONFLICT (content): Merge conflict in include/linux/acpi.h
CONFLICT (modify/delete): arch/h8300/include/asm/Kbuild deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/h8300/include/asm/Kbuild left in tree.
$ git rm -f arch/h8300/include/asm/Kbuild
$ git rm -f tools/perf/config/feature-tests.mak
Applying: tip: extra fixes for perf changes
Merging edac/linux_next (de4772c62148 edac: sb_edac.c should not require prescence of IMC_DDRIO device)
Merging edac-amd/for-next (c3e511e4c4d9 amd64_edac: Remove superfluous condition check.)
Merging ftrace/for-next (076a3a95a522 Merge branch 'trace/ftrace/urgent' into trace/for-next)
Merging rcu/rcu/next (4102adab9189 rcu: Move RCU-related source code to kernel/rcu directory)
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (81e87e267967 kvm_host: typo fix)
Merging kvm-arm/kvm-arm-next (79c648806f90 arm/arm64: KVM: PSCI: use MPIDR to identify a target CPU)
CONFLICT (content): Merge conflict in arch/arm/kvm/reset.c
Merging kvm-ppc/kvm-ppc-next (a78b55d1c021 kvm: powerpc: book3s: drop is_hv_enabled)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/ptrace.c
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/processor.h
Merging oprofile/for-next (9b415b3a3c4e edac, highbank: Moving error injection to sysfs for edac)
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
Merging xen-tip/linux-next (a54f899c5f57 pci-swiotlb-xen: call pci_request_acs only ifdef CONFIG_PCI)
CONFLICT (content): Merge conflict in arch/arm/include/asm/dma-mapping.h
Merging percpu/for-next (90f2492cf9c8 x86: remove this_cpu_xor() implementation)
Merging workqueues/for-next (016564d41b35 workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues)
Merging drivers-x86/linux-next (5c07eae979df platform/x86: panasonic-laptop: reuse module_acpi_driver)
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (04bc9ac163a2 Merge remote-tracking branch 'regmap/topic/spmi' into regmap-next)
Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (30dae2f98612 leds: lp55xx: handle enable pin in driver)
CONFLICT (content): Merge conflict in include/linux/of.h
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c
Merging driver-core/driver-core-next (0cae60f91494 sysfs: rename sysfs_assoc_lock and explain what it's about)
CONFLICT (content): Merge conflict in include/linux/netdevice.h
CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c
CONFLICT (content): Merge conflict in drivers/pci/pci-driver.c
CONFLICT (content): Merge conflict in drivers/mmc/host/mvsdio.c
Merging tty/tty-next (80d8611dd076 serial: omap: fix missing comma)
CONFLICT (content): Merge conflict in drivers/tty/serial/imx.c
CONFLICT (content): Merge conflict in drivers/tty/serial/atmel_serial.c
Merging usb/usb-next (7d49f0bac41e USB: Maintainers change for usb serial drivers)
CONFLICT (content): Merge conflict in drivers/usb/musb/davinci.c
CONFLICT (content): Merge conflict in drivers/Kconfig
CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap3-evm.dts
Merging usb-gadget/next (80d7d8a768cd usb: phy: twl6030-usb: Include linux/of.h header)
Merging staging/staging-next (ed5d6ca0038f staging: drm/imx: fix return value check in ipu_add_subdevice_pdata())
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/lloop.c
Merging char-misc/char-misc-next (425792266a40 misc: mic: Fixes for randconfig build errors and warnings.)
Applying: Intel MIC Host Driver: fix for sysfs_get_dirent API change
Merging scsi/for-next (2aee240c68ed Merge branch 'misc' into for-next)
Merging target-updates/for-next (2dd1d53fe004 iscsi-target: Implement demo_mode_discovery logic)
Merging target-merge/for-next-merge (15c03dd4859a Linux 3.12-rc3)
Merging writeback/writeback-for-next (a8855990e382 writeback: Do not sort b_io list only because of block device inode)
Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (94daf85e3c4d pinctrl: at91: copy define to driver)
Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO)
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (afb3690c3cbd gpio: bcm-kona: add missing .owner to struct gpio_chip)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging dma-mapping/dma-mapping-next (0df651a0740c Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging pwm/for-next (702e304f198f Documentation/pwm: Fix trivial typos)
CONFLICT (modify/delete): arch/arm/mach-omap2/board-zoom-peripherals.c deleted in HEAD and modified in pwm/for-next. Version pwm/for-next of arch/arm/mach-omap2/board-zoom-peripherals.c left in tree.
$ git rm -f arch/arm/mach-omap2/board-zoom-peripherals.c
Merging dma-buf/for-next (19e8697ba45e dma-buf: Expose buffer size to userspace (v2))
Merging userns/for-next (40216baa0101 vfs: Lazily remove mounts on unlinked files and directories. v2)
CONFLICT (content): Merge conflict in fs/fuse/dir.c
Merging ktest/for-next (df5f7c66013c ktest: Reset grub menu cache with different machines)
Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (f61027426a5b clk: of: helper for determining number of parent clocks)
CONFLICT (content): Merge conflict in drivers/clk/Makefile
Merging random/dev (392a546dc836 random: add debugging code to detect early use of get_random_bytes())
CONFLICT (content): Merge conflict in drivers/char/random.c
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
Merging aio/master (13fd8a5dc3cf Merge branch 'aio-fix' of http://evilpiepirate.org/git/linux-bcache)
Merging akpm-current/current (3cd43dcfaabf scripts/bloat-o-meter: use .startswith rather than fragile slicing)
CONFLICT (content): Merge conflict in mm/bounce.c
CONFLICT (content): Merge conflict in fs/bio-integrity.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2800pci.c
CONFLICT (content): Merge conflict in arch/x86/mm/init.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: drop actor argument of do_generic_file_read()
Applying: mm-drop-actor-argument-of-do_generic_file_read-fix
Applying: mm: avoid increase sizeof(struct page) due to split page table lock
Applying: mm: rename USE_SPLIT_PTLOCKS to USE_SPLIT_PTE_PTLOCKS
Applying: mm: convert mm->nr_ptes to atomic_long_t
Applying: mm: introduce api for split page table lock for PMD level
Applying: mm, thp: change pmd_trans_huge_lock() to return taken lock
Applying: mm, thp: move ptl taking inside page_check_address_pmd()
Applying: mm, thp: do not access mm->pmd_huge_pte directly
Applying: mm, hugetlb: convert hugetlbfs to use split pmd lock
Applying: mm-hugetlb-convert-hugetlbfs-to-use-split-pmd-lock-checkpatch-fixes
Applying: mm: convert the rest to new page table lock api
Applying: mm: implement split page table lock for PMD level
Applying: x86, mm: enable split page table lock for PMD level
Applying: x86-mm-enable-split-page-table-lock-for-pmd-level-checkpatch-fixes
Applying: x86: add missed pgtable_pmd_page_ctor/dtor calls for preallocated pmds
Applying: cris: fix potential NULL-pointer dereference
Applying: m32r: fix potential NULL-pointer dereference
Applying: xtensa: fix potential NULL-pointer dereference
Applying: mm: allow pgtable_page_ctor() to fail
Applying: microblaze: add missing pgtable_page_ctor/dtor calls
Applying: mn10300: add missing pgtable_page_ctor/dtor calls
Applying: openrisc: add missing pgtable_page_ctor/dtor calls
Applying: alpha: handle pgtable_page_ctor() fail
Applying: arc: handle pgtable_page_ctor() fail
Applying: arm: handle pgtable_page_ctor() fail
Applying: arm64: handle pgtable_page_ctor() fail
Applying: avr32: handle pgtable_page_ctor() fail
Applying: cris: handle pgtable_page_ctor() fail
Applying: frv: handle pgtable_page_ctor() fail
Applying: hexagon: handle pgtable_page_ctor() fail
Applying: ia64: handle pgtable_page_ctor() fail
Applying: m32r: handle pgtable_page_ctor() fail
Applying: m68k: handle pgtable_page_ctor() fail
Applying: m68k-handle-pgtable_page_ctor-fail-fix
Applying: m68k-handle-pgtable_page_ctor-fail-fix-fix
Applying: metag: handle pgtable_page_ctor() fail
Applying: mips: handle pgtable_page_ctor() fail
Applying: parisc: handle pgtable_page_ctor() fail
Applying: powerpc: handle pgtable_page_ctor() fail
Applying: s390: handle pgtable_page_ctor() fail
Applying: score: handle pgtable_page_ctor() fail
Applying: sh: handle pgtable_page_ctor() fail
Applying: sparc: handle pgtable_page_ctor() fail
Applying: tile: handle pgtable_page_ctor() fail
Applying: um: handle pgtable_page_ctor() fail
Applying: unicore32: handle pgtable_page_ctor() fail
Applying: x86: handle pgtable_page_ctor() fail
Applying: xtensa: handle pgtable_page_ctor() fail
Applying: iommu/arm-smmu: handle pgtable_page_ctor() fail
Applying: xtensa: use buddy allocator for PTE table
Applying: mm: dynamically allocate page->ptl if it cannot be embedded to struct page
Applying: mm: try to detect that page->ptl is in use
Applying: mm-dynamically-allocate-page-ptl-if-it-cannot-be-embedded-to-struct-page-fix-fix
Applying: seq_file: introduce seq_setwidth() and seq_pad()
Applying: seq_file: remove "%n" usage from seq_file users
Applying: vsprintf: ignore %n again
Applying: drivers/rtc/rtc-hid-sensor-time.c: use dev_get_platdata()
Applying: drivers/rtc/rtc-hid-sensor-time.c: enable HID input processing early
Applying: sched: replace INIT_COMPLETION with reinit_completion
Applying: tree-wide: use reinit_completion instead of INIT_COMPLETION
Applying: tree-wide-use-reinit_completion-instead-of-init_completion-fix
Applying: sched: remove INIT_COMPLETION
Applying: drivers/w1/masters/w1-gpio.c: use dev_get_platdata()
Applying: scripts/tags.sh: remove obsolete __devinit[const|data]
Applying: revert "softirq: Add support for triggering softirq work on softirqs"
Applying: kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS
Applying: kernel: provide a __smp_call_function_single stub for !CONFIG_SMP
Applying: kernel-provide-a-__smp_call_function_single-stub-for-config_smp-fix
Applying: kernel: fix generic_exec_single indentation
Applying: llists: move llist_reverse_order from raid5 to llist.c
Applying: llists-move-llist_reverse_order-from-raid5-to-llistc-fix
Applying: kernel: use lockless list for smp_call_function_single
Applying: blk-mq: use __smp_call_function_single directly
Applying: sound/core/memalloc.c: use gen_pool_dma_alloc() to allocate iram buffer
Merging akpm/master (d076a30be385 sound/core/memalloc.c: use gen_pool_dma_alloc() to allocate iram buffer)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* linux-next: Tree for Nov 6
@ 2012-11-06  5:48 Stephen Rothwell
  0 siblings, 0 replies; 9+ messages in thread
From: Stephen Rothwell @ 2012-11-06  5:48 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 38029 bytes --]

Hi all,

Changes since 20121105:

The pci tree gained a build failure for which I applied a merge fix patch.

The v4l-dvb tree still had its build failure so I used the version from
next-20121026.

The thermal tree lost its conflict.

The pm tree gained a conflict against the pci tree.

The tty tree gained a conflict against the arm tree.

The clk tree lost its conflict.

The akpm tree gained conflicts against the cgroup tree and I dropped a
few patches that Andrew also dropped.

----------------------------------------------------------------------------

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" as mentioned in the FAQ on the wiki
(see below).

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. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc,
sparc64 and arm defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.

Below is a summary of the state of the merge.

We are up to 209 trees (counting Linus' and 28 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (3d70f8c Linux 3.7-rc4)
Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.)
Merging arm-current/fixes (6404f0b ARM: 7569/1: mm: uninitialized warning corrections)
Merging m68k-current/for-linus (8a745ee m68k: Wire up kcmp)
Merging powerpc-merge/merge (8c23f40 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging sparc/master (f7e8d9f qlogicpti: Fix build warning.)
Merging net/master (cacb6ba net: inet_diag -- Return error code if protocol handler is missed)
Merging sound-current/for-linus (ae24c31 ALSA: hda - Force to reset IEC958 status bits for AD codecs)
Merging pci-current/for-linus (85c413b Merge branch 'pci/huang-d3cold-fixes' into for-linus)
Merging wireless/master (6fe7cc7 ath9k: Test for TID only in BlockAcks while checking tx status)
Merging driver-core.current/driver-core-linus (8f0d816 Linux 3.7-rc3)
Merging tty.current/tty-linus (8f0d816 Linux 3.7-rc3)
Merging usb.current/usb-linus (d99e65b USB: fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled)
Merging staging.current/staging-linus (8f0d816 Linux 3.7-rc3)
Merging char-misc.current/char-misc-linus (8f0d816 Linux 3.7-rc3)
Merging input-current/for-linus (32ed191 Input: tsc40 - remove wrong announcement of pressure support)
Merging md-current/for-linus (ed30be0 MD RAID10: Fix oops when creating RAID10 arrays via dm-raid.c)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (9efade1 crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption)
Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
Merging rr-fixes/fixes (59ef28b module: fix out-by-one error in kallsyms)
Merging asm-generic/master (9b04ebd asm-generic/io.h: remove asm/cacheflush.h include)
Merging arm/for-next (31ccae2 Merge remote-tracking branch 'wildea/asids' into for-next)
Merging arm-perf/for-next/perf (85776d5 Merge branch 'hw-breakpoint' into for-next/perf)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (f580077 zynq: move static peripheral mappings)
Merging arm64/upstream (811a0c8 arm64: perf: use architected event for CPU cycle counter)
Merging blackfin/for-linus (9d84601 Blackfin: dpmc: use module_platform_driver macro)
Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm)
Merging cris/for-next (eacb25c UAPI: Fix up empty files in arch/cris/)
Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
Merging ia64/next (d536e0d Merge tag 'disintegrate-ia64-20121009' of git://git.infradead.org/users/dhowells/linux-headers into next)
Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
Merging m68knommu/for-next (6762976 m68knommu: merge ColdFire 5249 and 525x definitions)
Applying: m68k: fix up for UAPI changes
Merging microblaze/next (1883baa UAPI: (Scripted) Disintegrate arch/microblaze/include/asm)
Merging mips/mips-for-linux-next (70f7750 MIPS: Remove leftovers from the IRIX binary compat code.)
Merging openrisc/for-upstream (634bd40 openrisc: use kbuild.h instead of defining macros in asm-offset.c)
Merging parisc/for-next (559fd14 Merge tag 'disintegrate-parisc-20121016' into for-next)
Merging powerpc/next (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.)
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (fa9b24a powerpc/mpc5200: move lpbfifo node and fix its interrupt property)
Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
Merging s390/features (2845a77 s390/crypto: Don't panic after crypto instruction failures)
Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.)
Merging sparc-next/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40)
Merging tile/master (ddffeb8 Linux 3.7-rc1)
Merging unicore32/unicore32 (7bf2799 arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (3d70f8c Linux 3.7-rc4)
Merging btrfs/next (c37b2b6 Btrfs: do not bug when we fail to commit the transaction)
Merging ceph/master (3515297 rbd: activate v2 image support)
Merging cifs/for-next (5004f80 cifs: fix SID binary to string conversion)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning())
Merging ext4/dev (ffb5387 ext4: fix unjournaled inode bitmap modification)
Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
Merging gfs2/master (8144a48a GFS2: Add Orlov allocator)
Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling)
Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
Merging nfs/linux-next (070d15d NFSv4.1: Remove the 'FIFO' behaviour for nfs41_setup_sequence)
Merging nfsd/nfsd-next (ddffeb8 Linux 3.7-rc1)
Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
Merging ubifs/linux-next (a28ad42 UBIFS: fix mounting problems after power cuts)
Merging xfs/for-next (c99abb8 xfs: Update mount options documentation)
Merging vfs/for-next (a736427 missing const in alpha callers of do_mount())
Merging pci/next (84a8fb6 Merge branch 'pci/yinghai-for-pci-root-bus-hotplug' into next)
Applying: PCI: fixups for pci_resource_start conversion
Merging hid/for-next (35c9a62 Merge branch 'for-3.8/roccat' into for-next)
Merging quilt/i2c (e570296 i2c: Mention functionality flags in SMBus protocol documentation)
Merging i2c-embedded/i2c-embedded/for-next (60f0a25 i2c: tegra: set irq name as device name)
Merging quilt/jdelvare-hwmon (a196a0c hwmon: (it87) Support PECI for additional chips)
Merging hwmon-staging/hwmon-next (d29d75d hwmon: (da9055) Fix chan_mux[DA9055_ADC_ADCIN3] setting)
Merging v4l-dvb/master (ac5ce7c Merge /home/v4l/v4l/patchwork)
$ git reset --hard HEAD^
Merging refs/next/20121026/v4l-dvb
Merging kbuild/for-next (c582d2a Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
Merging infiniband/for-next (1e3474d Merge branches 'cxgb4' and 'mlx4' into for-next)
Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
Merging acpi/next (b63cb74 tools: Allow tools to be installed in a user specified location)
Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
CONFLICT (content): Merge conflict in include/linux/cpuidle.h
CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (e15cb14 thermal: user_space: Add missing static storage class specifiers)
Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
Merging ubi/linux-next (6a059ab UBI: use list_move_tail instead of list_del/list_add_tail)
Merging dlm/next (a3de56b fs/dlm: remove CONFIG_EXPERIMENTAL)
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path)
Merging target-updates/for-next (3a89b51 target: Fix incorrect starting offset after MODE_SENSE refactoring)
Merging target-merge/for-next-merge (6f0c058 Linux 3.7-rc2)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (6734092 isci: add a couple __iomem annotations)
Merging slave-dma/next (8007644 async_tx: use memchr_inv)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (d64ec84 r8169: enable internal ASPM and clock request settings)
Merging wireless-next/master (38141fc ar5523: make buffer size variable unsigned)
Merging bluetooth/master (0c0afed Bluetooth: Fix parameter order of hci_get_route)
Merging mtd/master (5a6ea4a mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions())
Merging l2-mtd/master (2c5e1925 mtd: mtd_oobtest: printk -> pr_{info,err,crit})
Merging crypto/master (3200da8 crypto: tegra - fix missing unlock on error case)
Merging drm/drm-next (1f31c69 Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next)
Merging sound/for-next (4492363 ALSA: virtuoso: Xonar DSX support)
Merging sound-asoc/for-next (7f1f4b5 Merge branches 'fix/mxs', 'fix/omap', 'fix/samsung', 'topic/ak4104', 'topic/atmel', 'topic/cs4271', 'topic/da9055', 'topic/davinci', 'topic/fsi', 'topic/fsl', 'topic/jack', 'topic/jz4740', 'topic/samsung', 'topic/si476x', 'topic/tlv320aic32x4', 'topic/wm2200', 'topic/wm8750', 'topic/wm8770', 'topic/wm8971' and 'topic/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-next)
Merging modules/modules-next (8c2ad37 powerpc: add finit_module syscall.)
Merging virtio/virtio-next (41395df virtio: Convert dev_printk(KERN_<LEVEL> to dev_<level>()
Merging input/next (8ed2757 Input: add DA9055 Onkey driver)
Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
Merging cgroup/for-next (1db1e31 Merge branch 'cgroup-rmdir-updates' into cgroup/for-3.8)
Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
CONFLICT (content): Merge conflict in init/Kconfig
CONFLICT (content): Merge conflict in drivers/block/floppy.c
Merging quilt/device-mapper (cee3685 track_chunk is always called with interrupts enabled. Consequently, we do not need to save and restore interrupt state in "flags" variable. This patch changes spin_lock_irqsave to spin_lock_irq and spin_unlock_irqrestore to spin_unlock_irq.)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (0e0f572 mmc: sdhci: fix IS_ERR() checking of regulator_get())
Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
Merging slab/for-next (31841eb Merge branch 'slab/next' into for-next)
CONFLICT (content): Merge conflict in mm/slob.c
Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1)
Merging md/for-next (347c03c [PATCH V1] md: Update checkpoint of resync/recovery based on time.)
Merging mfd/for-next (8f0d816 Linux 3.7-rc3)
Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
Merging regulator/for-next (fe623ca Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/fix/put', 'regulator/topic/gpio', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regulator/topic/tps51632', 'regulator/topic/tps65910' and 'regulator/topic/vexpress' into regulator-next)
Merging security/next (b566650 drivers/char/tpm: remove tasklet and cleanup)
CONFLICT (content): Merge conflict in security/keys/process_keys.c
CONFLICT (content): Merge conflict in security/keys/keyring.c
CONFLICT (content): Merge conflict in security/keys/keyctl.c
CONFLICT (content): Merge conflict in net/dns_resolver/dns_key.c
CONFLICT (content): Merge conflict in fs/cifs/cifsacl.c
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (f74b527 Merge branches 'iommu/fixes', 'dma-debug' and 'x86/amd' into next)
Merging vfio/next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
Merging osd/linux-next (b6755ff osduld: Add osdname & systemid sysfs at scsi_osd class)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (926ccfe Btrfs: Fix printk and variable name)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (e1424ee Merge branch 'pm-qos-next' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
CONFLICT (content): Merge conflict in kernel/audit_tree.c
Merging edac/linux_next (5e75cbb Merge branch 'devel' into next)
Merging edac-amd/for-next (a8373ec EDAC: Handle error path in edac_mc_sysfs_init() properly)
Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
Merging dt-rh/for-next (2066306 arm: l2cc: doc: fix device tree example typo)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging spi-mb/spi-next (73b5301 Merge branch 'spi-spidev' into spi-next)
Merging tip/auto-latest (8a1d31c Merge branch 'x86/urgent')
Merging rcu/rcu/next (155f744 Merge branches 'doc.2012.10.30a', 'fixes.2012.10.30a', 'srcu.2012.10.27a', 'stall.2012.10.24a', 'tracing.2012.10.30a' and 'idle.2012.10.24a' into HEAD)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (f026399 Merge branch 'for-queue' of https://github.com/agraf/linux-2.6 into queue)
Merging kvm-ppc/kvm-ppc-next (f534a53 KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte())
CONFLICT (add/add): Merge conflict in arch/powerpc/include/uapi/asm/epapr_hcalls.h
CONFLICT (content): Merge conflict in arch/powerpc/include/uapi/asm/Kbuild
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild
Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
Merging xen-two/linux-next (7595787 Merge branch 'stable/for-linus-3.7' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (b4916cb percpu: make pcpu_free_chunk() use pcpu_mem_free() instead of kfree())
Merging workqueues/for-next (b401057 Merge branch 'for-3.8' into for-next)
Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (516edb8 Merge remote-tracking branches 'regmap/topic/core', 'regmap/topic/domain', 'regmap/topic/lock', 'regmap/topic/range' and 'regmap/topic/type' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (c84f14d leds: lm3642: Fix up world writable sysfs files)
Merging driver-core/driver-core-next (bb3215e Documentation: Fixes a term's translation in Documentation/zh_CN/arm64/memory.txt)
Merging tty/tty-next (76cc438 tty: of_serial: fix return value check in of_platform_serial_setup())
CONFLICT (content): Merge conflict in drivers/tty/serial/omap-serial.c
Merging usb/usb-next (cdb2fac USB: EHCI: fix build error in ChipIdea host driver)
CONFLICT (content): Merge conflict in drivers/usb/early/ehci-dbgp.c
Merging staging/staging-next (15358a7 staging: comedi: adl_pci9118: support auto-attachment)
CONFLICT (modify/delete): drivers/staging/telephony/Kconfig deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/telephony/Kconfig left in tree.
$ git rm -f drivers/staging/telephony/Kconfig
Merging char-misc/char-misc-next (ab5c4a5 mei: move amthif specific code from mei_write to mei_amthif_write)
Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (2f970ea Merge branch 'at91' into for-next)
Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
CONFLICT (content): Merge conflict in drivers/net/tun.c
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging gpio-lw/for-next (b1ffa4b Merge branch 'devel' into for-next)
Merging arm-soc/for-next (a76f19e Merge branch 'next/multiplatform' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/drm.c
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging bcm2835/for-next (d7f292e Merge branch 'for-3.8/defconfig' into for-next)
Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling)
Merging ep93xx/ep93xx-for-next (fab1f74 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
Merging msm/for-next (a0d271c Linux 3.6)
Merging renesas/next (40ac606 Merge branches 'heads/fixes', 'heads/defconfig', 'heads/boards' and 'heads/soc' into next)
Merging samsung/for-next (f789f1e Merge branch 'next/board-samsung' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos4210.dtsi
Merging tegra/for-next (c76dbd0 Merge branch 'for-3.8/defconfig' into for-next)
Merging kvmtool/master (cfb8234 kvm tools: Fast A20 gate emulation)
Merging dma-mapping/dma-mapping-next (8f0d816 Linux 3.7-rc3)
Merging pwm/for-next (d5da78e PWM: Add SPEAr PWM chip driver support)
Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
Merging userns/for-next (e9069f4 btrfs: Fix compilation with user namespace support enabled)
Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
Merging signal/for-next (f899e0f frv: switch to generic fork/vfork/clone)
CONFLICT (content): Merge conflict in arch/sparc/kernel/sys_sparc_64.c
CONFLICT (content): Merge conflict in arch/arm/kernel/process.c
Merging clk/clk-next (9be9d48 clk: wm831x: Use devm_clk_register() to simplify code)
Merging random/dev (c5c1244 random: fix debug format strings)
Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
Merging drop-experimental/linux-next (e175f83 tools/lguest: remove depends on CONFIG_EXPERIMENTAL)
CONFLICT (content): Merge conflict in drivers/ptp/Kconfig
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/Kconfig
Merging scsi-post-merge/merge-base:master ()
Merging akpm-current/current (7cd8e78 device_cgroup: fix unchecked cgroup parent usage)
$ git checkout akpm
Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction only in direct reclaim
Applying: proc: check vma->vm_file before dereferencing
Applying: memstick: remove unused field from state struct
Applying: memstick: ms_block: fix compile issue
Applying: memstick: use after free in msb_disk_release()
Applying: memstick: memory leak on error in msb_ftl_scan()
Applying: CRIS: Fix I/O macros
Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
Applying: vfs: d_obtain_alias() needs to use "/" as default name.
Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: x86 numa: don't check if node is NUMA_NO_NODE
Applying: arch/x86/tools/insn_sanity.c: identify source of messages
Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
Applying: olpc: fix olpc-xo1-sci.c build errors
Applying: x86: make 'mem=' option work for efi platform
Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: time: don't inline EXPORT_SYMBOL functions
Applying: fs/pstore/ram.c: fix up section annotations
Applying: h8300: select generic atomic64_t support
Applying: drivers/message/fusion/mptscsih.c: missing break
Applying: drivers/scsi/hptiop: support HighPoint RR4520/RR4522 HBA
Applying: cciss: cleanup bitops usage
Applying: cciss: use check_signature()
Applying: block: store partition_meta_info.uuid as a string
Applying: init: reduce PARTUUID min length to 1 from 36
Applying: block: partition: msdos: provide UUIDs for partitions
Applying: drbd: use copy_highpage
Applying: vfs: increment iversion when a file is truncated
Applying: fs: change return values from -EACCES to -EPERM
Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
Applying: mm/page_alloc.c: remove duplicate check
Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()
Applying: mm: show migration types in show_mem
Applying: mm, memcg: make mem_cgroup_out_of_memory() static
Applying: mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD
Applying: mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD
Applying: thp: clean up __collapse_huge_page_isolate
Applying: thp-clean-up-__collapse_huge_page_isolate v2
Applying: mm: introduce mm_find_pmd()
Applying: mm-introduce-mm_find_pmd-fix
Applying: thp: introduce hugepage_vma_check()
Applying: thp: cleanup: introduce mk_huge_pmd()
Applying: memory hotplug: suppress "Device memoryX does not have a release() function" warning
Applying: memory-hotplug: skip HWPoisoned page when offlining pages
Applying: memory-hotplug: update mce_bad_pages when removing the memory
Applying: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix
Applying: memory-hotplug: auto offline page_cgroup when onlining memory block failed
Applying: memory-hotplug: fix NR_FREE_PAGES mismatch
Applying: numa: convert static memory to dynamically allocated memory for per node device
Applying: memory-hotplug: suppress "Device nodeX does not have a release() function" warning
Applying: memory-hotplug, mm/sparse.c: clear the memory to store struct page
Applying: memory-hotplug: allocate zone's pcp before onlining pages
Applying: mm: make zone_pcp_reset independent of MEMORY_HOTREMOVE
Applying: memory-hotplug: build zonelist if a zone is populated after onlining pages
Applying: memory_hotplug: fix possible incorrect node_states[N_NORMAL_MEMORY]
Applying: slub, hotplug: ignore unrelated node's hot-adding and hot-removing
Applying: mm: add comment on storage key dirty bit semantics
Applying: mm,vmscan: only evict file pages when we have plenty
Applying: mmvmscan-only-evict-file-pages-when-we-have-plenty-fix
Applying: mm: refactor reinsert of swap_info in sys_swapoff()
Applying: mm: do not call frontswap_init() during swapoff
Applying: mm, highmem: use PKMAP_NR() to calculate an index of pkmap
Applying: mm, highmem: remove useless pool_lock
Applying: mm, highmem: remove page_address_pool list
Applying: mm-highmem-remove-page_address_pool-list-v2
Applying: mm, highmem: makes flush_all_zero_pkmaps() return index of last flushed entry
Applying: mm-highmem-makes-flush_all_zero_pkmaps-return-index-of-last-flushed-entry-v2
Applying: mm, highmem: get virtual address of the page using PKMAP_ADDR()
Applying: mm: thp: set the accessed flag for old pages on access fault
Applying: mm: memmap_init_zone() performance improvement
Applying: Documentation/cgroups/memory.txt: s/mem_cgroup_charge/mem_cgroup_change_common/
Applying: mm, oom: allow exiting threads to have access to memory reserves
Applying: memcg: make it possible to use the stock for more than one page
Applying: memcg: reclaim when more than one page needed
Applying: memcg: change defines to an enum
Applying: memcg: kmem accounting basic infrastructure
Applying: mm: add a __GFP_KMEMCG flag
Applying: memcg: kmem controller infrastructure
Applying: mm: allocate kernel pages to the right memcg
Applying: res_counter: return amount of charges after res_counter_uncharge()
Applying: memcg: kmem accounting lifecycle management
Applying: memcg: use static branches when code not in use
Applying: memcg: allow a memcg with kmem charges to be destructed
CONFLICT (content): Merge conflict in mm/memcontrol.c
Applying: memcg: execute the whole memcg freeing in free_worker()
Applying: fork: protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs
Applying: memcg: add documentation about the kmem controller
Applying: slab/slub: struct memcg_params
Applying: slab: annotate on-slab caches nodelist locks
Applying: slab/slub: consider a memcg parameter in kmem_create_cache
Applying: memcg: allocate memory for memcg caches whenever a new memcg appears
Applying: memcg: infrastructure to match an allocation to the right cache
Applying: memcg: skip memcg kmem allocations in specified code regions
Applying: sl[au]b: always get the cache from its page in kmem_cache_free()
Applying: sl[au]b: allocate objects from memcg cache
Applying: memcg: destroy memcg caches
CONFLICT (content): Merge conflict in mm/memcontrol.c
Applying: memcg/sl[au]b: track all the memcg children of a kmem_cache
Applying: memcg/sl[au]b: shrink dead caches
Applying: memcg: aggregate memcg cache values in slabinfo
Applying: slab: propagate tunable values
Applying: slub: slub-specific propagation changes
Applying: kmem: add slab-specific documentation about the kmem controller
Applying: drop_caches: add some documentation and info message
Applying: drop_caches-add-some-documentation-and-info-messsge-checkpatch-fixes
Applying: swap: add a simple detector for inappropriate swapin readahead
Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
Applying: mm/memblock: reduce overhead in binary search
Applying: scripts/pnmtologo: fix for plain PBM
Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
Applying: Documentation/kernel-parameters.txt: update mem= option's spec according to its implementation
Applying: include/linux/init.h: use the stringify operator for the __define_initcall macro
Applying: scripts/tags.sh: add magic for declarations of popular kernel type
Applying: backlight: da903x_bl: use dev_get_drvdata() instead of platform_get_drvdata()
Applying: backlight: 88pm860x_bl: fix checkpatch warning
Applying: backlight: atmel-pwm-bl: fix checkpatch warning
Applying: backlight: corgi_lcd: fix checkpatch error and warning
Applying: backlight: da903x_bl: fix checkpatch warning
Applying: backlight: generic_bl: fix checkpatch warning
Applying: backlight: hp680_bl: fix checkpatch error and warning
Applying: backlight: ili9320: fix checkpatch error and warning
Applying: backlight: jornada720: fix checkpatch error and warning
Applying: backlight: l4f00242t03: fix checkpatch warning
Applying: backlight: lm3630: fix checkpatch warning
Applying: backlight: locomolcd: fix checkpatch error and warning
Applying: backlight: omap1: fix checkpatch warning
Applying: backlight: pcf50633: fix checkpatch warning
Applying: backlight: platform_lcd: fix checkpatch error
Applying: backlight: tdo24m: fix checkpatch warning
Applying: backlight: tosa: fix checkpatch error and warning
Applying: backlight: vgg2432a4: fix checkpatch warning
Applying: backlight: lms283gf05: use devm_gpio_request_one
Applying: backlight: tosa: use devm_gpio_request_one
Applying: drivers/video/backlight/lp855x_bl.c: use generic PWM functions
Applying: drivers-video-backlight-lp855x_blc-use-generic-pwm-functions-fix
Applying: drivers/video/backlight/lp855x_bl.c: remove unnecessary mutex code
Applying: drivers/video/backlight/da9052_bl.c: add missing const
Applying: drivers/video/backlight/lms283gf05.c: add missing const
Applying: drivers/video/backlight/tdo24m.c: add missing const
Applying: drivers/video/backlight/vgg2432a4.c: add missing const
Applying: drivers/video/backlight/s6e63m0.c: remove unnecessary cast of void pointer
Applying: drivers/video/backlight/88pm860x_bl.c: drop devm_kfree of devm_kzalloc'd data
Applying: drivers/video/backlight/max8925_bl.c: drop devm_kfree of devm_kzalloc'd data
Applying: drivers/video/backlight/lm3639_bl.c: fix up world writable sysfs file
Applying: drivers/video/backlight/ep93xx_bl.c: fix section mismatch
Applying: drivers/video/backlight/hp680_bl.c: add missing __devexit macros for remove
Applying: drivers/video/backlight/ili9320.c: add missing __devexit macros for remove
Applying: string: introduce helper to get base file name from given path
Applying: lib: dynamic_debug: use kbasename()
Applying: mm: use kbasename()
Applying: procfs: use kbasename()
Applying: proc_devtree: remove duplicated include from proc_devtree.c
Applying: trace: use kbasename()
Applying: compat: generic compat_sys_sched_rr_get_interval() implementation
Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
Applying: checkpatch: warn on unnecessary line continuations
Applying: epoll: support for disabling items, and a self-test app
Applying: binfmt_elf: fix corner case kfree of uninitialized data
Applying: binfmt_elf-fix-corner-case-kfree-of-uninitialized-data-checkpatch-fixes
Applying: rtc: omap: kicker mechanism support
Applying: ARM: davinci: remove rtc kicker release
Applying: rtc: omap: dt support
Applying: rtc: omap: depend on am33xx
Applying: rtc: omap: add runtime pm support
Applying: drivers/rtc/rtc-imxdi: support for i.MX53
Applying: drivers/rtc/rtc-imxdi.c: add devicetree support
Applying: ARM: mach-imx: support for DryIce RTC in i.MX53
Applying: drivers/rtc/rtc-vt8500.c: convert to use devm_kzalloc
Applying: hfsplus: add on-disk layout declarations related to attributes tree
Applying: hfsplus: add functionality of manipulating by records in attributes tree
Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
Applying: hfsplus: add support of manipulation by attributes file
Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
Applying: hfsplus: code style fixes - reworked support of extended attributes
Applying: fat: modify nfs mount option
Applying: fat (exportfs): rebuild inode if ilookup() fails
Applying: fat-exportfs-rebuild-inode-if-ilookup-fails-fix
Applying: fat (exportfs): rebuild directory-inode if fat_dget() fails
Applying: Documentation: update nfs option in filesystem/vfat.txt
Applying: fat: remove parent_logstart check in fat_get_parent
Applying: fat: restructure export operations
Applying: fat: move fat_i_pos_read to fat.h
Applying: fat: (exportfs) move code to rebuild directory-inode to separate function
Applying: fat: add mutex lock to fat_build_inode
Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections
Applying: kstrto*: add documentation
Applying: simple_strto*: annotate function as obsolete
Applying: proc: don't show nonexistent capabilities
Applying: procfs: add VmFlags field in smaps output
Applying: procfs-add-vmflags-field-in-smaps-output-v4-fix
Applying: /proc/pid/status: add "Seccomp" field
Applying: fork: unshare: remove dead code
Applying: ipc: remove forced assignment of selected message
Applying: ipc: add sysctl to specify desired next object id
Applying: ipc-add-sysctl-to-specify-desired-next-object-id-checkpatch-fixes
Applying: ipc: wrap new sysctls for CRIU inside CONFIG_CHECKPOINT_RESTORE
Applying: Documentation: update sysctl/kernel.txt
Applying: ipc: message queue receive cleanup
Applying: ipc-message-queue-receive-cleanup-checkpatch-fixes
Applying: ipc: introduce message queue copy feature
Applying: ipc: remove redundant MSG_COPY check
Applying: ipc: cleanup do_msgrcv() aroung MSG_COPY feature
Applying: selftests: IPC message queue copy feature test
Applying: test: IPC message queue copy feature test update
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held
Applying: Documentation/sparse.txt: document context annotations for lock checking
Applying: aoe: describe the behavior of the "err" character device
Applying: aoe: print warning regarding a common reason for dropped transmits
Applying: aoe-print-warning-regarding-a-common-reason-for-dropped-transmits-v2
Applying: aoe: avoid using skb member after dev_queue_xmit
Applying: aoe: update cap on outstanding commands based on config query response
Applying: aoe: support the forgetting (flushing) of a user-specified AoE target
Applying: aoe: support larger I/O requests via aoe_maxsectors module param
Applying: aoe: "payload" sysfs file exports per-AoE-command data transfer size
Applying: aoe: cleanup: remove unused ata_scnt function
Applying: aoe: whitespace cleanup
Applying: aoe: update driver-internal version number to 60
Applying: documentation-dma-api-howtotxt-add-dma-mapping-error-check-usage-examples-fix
Applying: tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
Merging akpm/master (5b53047 tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, back to index

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-06  8:03 linux-next: Tree for Nov 6 Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2018-11-06  3:14 Stephen Rothwell
2017-11-06  7:30 Stephen Rothwell
2015-11-06  3:24 Stephen Rothwell
2015-11-06 12:45 ` Christian Borntraeger
2015-11-09 21:31   ` Stephen Rothwell
2014-11-06  8:43 Stephen Rothwell
2013-11-06  9:28 Stephen Rothwell
2012-11-06  5:48 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git