LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: Tree for Oct 5
@ 2021-10-05  8:06 Stephen Rothwell
  2021-10-05 20:46 ` linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate) Randy Dunlap
  0 siblings, 1 reply; 20+ messages in thread
From: Stephen Rothwell @ 2021-10-05  8:06 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20211001:

New tree: bitmap

The tegra tree gained a build failure so I used the version from
next-20211001.

The net-next tree gained a build failure so I used the version from
next-20211001.

The crypto tree lost its build failure.

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

The sound-asoc tree still had its build failure for which I reverted a commit.

The selinux tree gained a semantic conflict against the block tree.

The audit tree gained a conflict against the selinux tree.

The ipmi tree lost its build failure.

Non-merge commits (relative to Linus' tree): 5110
 4859 files changed, 255590 insertions(+), 100481 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 htmldocs. 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 338 trees (counting Linus' and 91 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 (f6274b06e326 Merge tag 'linux-kselftest-fixes-5.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest)
Merging fixes/fixes (3ca706c189db drm/ttm: fix type mismatch error on sparc64)
Merging kbuild-current/fixes (0664684e1ebd kbuild: Add -Werror=ignored-optimization-argument to CLANG_FLAGS)
Merging arc-current/for-curr (6880fa6c5660 Linux 5.15-rc1)
Merging arm-current/fixes (463dbba4d189 ARM: 9104/2: Fix Keystone 2 kernel mapping regression)
Merging arm64-fixes/for-next/fixes (22b70e6f2da0 arm64: Restore forced disabling of KPTI on ThunderX)
Merging arm-soc-fixes/arm/fixes (3f1c260ffddb MAINTAINERS: Add myself as MStar/Sigmastar Armv7 SoC maintainers)
Merging drivers-memory-fixes/fixes (6880fa6c5660 Linux 5.15-rc1)
Merging m68k-current/for-linus (9fde03486402 m68k: Remove set_fs())
Merging powerpc-fixes/fixes (23c216b335d1 powerpc/iommu: Report the correct most efficient DMA mask for PCI devices)
Merging s390-fixes/fixes (a46044a92add s390/pci: fix zpci_zdev_put() on reserve)
Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
Merging fscrypt-current/for-stable (80f6e3080bfc fs-verity: fix signed integer overflow with i_size near S64_MAX)
Merging net/master (b44d52a50bc6 dsa: tag_dsa: Fix mask for trunked packets)
Merging bpf/master (b0e875bac0fa libbpf: Fix memory leak in strset)
Merging ipsec/master (93ec1320b017 xfrm: fix rcu lock in xfrm_notify_userpolicy())
Merging netfilter/master (7cd8b1542a7b ptp_pch: Load module automatically if ID matches)
Merging ipvs/master (3d3b30175a51 netfilter: nf_tables: honor NLM_F_CREATE and NLM_F_EXCL in event notification)
Merging wireless-drivers/master (603a1621caa0 mwifiex: avoid null-pointer-subtraction warning)
Merging mac80211/master (a2083eeb119f cfg80211: scan: fix RCU in cfg80211_add_nontrans_list())
Merging rdma-fixes/for-rc (9e1ff307c779 Linux 5.15-rc4)
Merging sound-current/for-linus (cc03069a3970 ALSA: hda/realtek: Add quirk for Clevo X170KM-G)
Merging sound-asoc-fixes/for-linus (c417c32a473e Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus)
Merging regmap-fixes/for-linus (6880fa6c5660 Linux 5.15-rc1)
Merging regulator-fixes/for-linus (9e1ff307c779 Linux 5.15-rc4)
Merging spi-fixes/for-linus (fa382a0f96cf Merge remote-tracking branch 'spi/for-5.15' into spi-linus)
Merging pci-current/for-linus (e4e737bb5c17 Linux 5.15-rc2)
Merging driver-core.current/driver-core-linus (410d591a1954 kernfs: don't create a negative dentry if inactive node exists)
Merging tty.current/tty-linus (5816b3e6577e Linux 5.15-rc3)
Merging usb.current/usb-linus (5816b3e6577e Linux 5.15-rc3)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (5816b3e6577e Linux 5.15-rc3)
Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle)
Merging phy/fixes (6880fa6c5660 Linux 5.15-rc1)
Merging staging.current/staging-linus (5816b3e6577e Linux 5.15-rc3)
Merging iio-fixes/fixes-togreg (26d90b559057 iio: light: opt3001: Fixed timeout error when 0 lux)
Merging char-misc.current/char-misc-linus (ad2b502bc5e6 Merge tag 'misc-habanalabs-fixes-2021-09-29' of https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into char-misc-linus)
Merging soundwire-fixes/fixes (6880fa6c5660 Linux 5.15-rc1)
Merging thunderbolt-fixes/fixes (9e1ff307c779 Linux 5.15-rc4)
Merging input-current/for-linus (0c5483a5778f Input: analog - always use ktime functions)
Merging crypto-current/master (0e14ef38669c crypto: x86/sm4 - Fix frame pointer stack corruption)
Merging vfio-fixes/for-linus (42de956ca7e5 vfio/ap_ops: Add missed vfio_uninit_group_dev())
Merging kselftest-fixes/fixes (2f9602870886 selftests: drivers/dma-buf: Fix implicit declaration warns)
Merging modules-fixes/modules-linus (0d67e332e6df module: fix clang CFI with MODULE_UNLOAD=n)
Merging dmaengine-fixes/fixes (6880fa6c5660 Linux 5.15-rc1)
Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
Merging mtd-fixes/mtd/fixes (f60f5741002b mtd: rawnand: qcom: Update code word value for raw read)
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
Merging v4l-dvb-fixes/fixes (206704a1fe0b media: atomisp: restore missing 'return' statement)
Merging reset-fixes/reset/fixes (ed104ca4bd9c reset: reset-zynqmp: Fixed the argument data type)
Merging mips-fixes/mips-fixes (740da9d7ca4e MIPS: Revert "add support for buggy MT7621S core detection")
Merging at91-fixes/at91-fixes (dbe68bc9e82b ARM: dts: at91: sama7g5ek: to not touch slew-rate for SDMMC pins)
Merging omap-fixes/fixes (e879f855e590 bus: ti-sysc: Add break in switch statement in sysc_init_soc())
Merging kvm-fixes/master (2353e593a13b Merge tag 'kvm-s390-master-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master)
Merging kvms390-fixes/master (25b5476a294c KVM: s390: Function documentation fixes)
Merging hwmon-fixes/hwmon (dd4d747ef05a hwmon: (w83793) Fix NULL pointer dereference by removing unnecessary structure field)
Merging nvdimm-fixes/libnvdimm-fixes (d55174cccac2 nvdimm/pmem: fix creating the dax group)
Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
Merging btrfs-fixes/next-fixes (45940091a3c1 Merge branch 'misc-5.15' into next-fixes)
Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx())
Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
Merging drivers-x86-fixes/fixes (6f6aab1caf6c platform/x86: gigabyte-wmi: add support for B550I Aorus Pro AX)
Merging samsung-krzk-fixes/fixes (6880fa6c5660 Linux 5.15-rc1)
Merging pinctrl-samsung-fixes/fixes (6880fa6c5660 Linux 5.15-rc1)
Merging devicetree-fixes/dt/linus (b2d70c0dbf27 dt-bindings: drm/bridge: ti-sn65dsi86: Fix reg value)
Merging scsi-fixes/fixes (79a7482249a7 scsi: csiostor: Add module softdep on cxgb4)
Merging drm-fixes/drm-fixes (78ea81417944 Merge tag 'exynos-drm-fixes-for-v5.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (9e1ff307c779 Linux 5.15-rc4)
Merging mmc-fixes/fixes (e2845b1d92d7 mmc: meson-gx: do not use memcpy_to/fromio for dram-access-quirk)
Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
Merging gnss-fixes/gnss-linus (e73f0f0ee754 Linux 5.14-rc1)
Merging hyperv-fixes/hyperv-fixes (41608b64b10b PCI: hv: Fix sleep while in non-sleep context when removing child devices from the bus)
Merging soc-fsl-fixes/fix (c1e64c0aec8c soc: fsl: qe: fix static checker warning)
Merging risc-v-fixes/fixes (5155cf7b6aae Merge remote-tracking branch 'palmer/riscv-vdso-cleanup' into fixes)
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
Merging fpga-fixes/fixes (2a2a79577dda fpga: ice40-spi: Add SPI device ID table)
Merging spdx/spdx-linus (6880fa6c5660 Linux 5.15-rc1)
Merging gpio-brgl-fixes/gpio/for-current (1649b8376694 gpio: pca953x: Improve bias setting)
Merging gpio-intel-fixes/fixes (1649b8376694 gpio: pca953x: Improve bias setting)
Merging pinctrl-intel-fixes/fixes (9e1ff307c779 Linux 5.15-rc4)
Merging erofs-fixes/fixes (c40dd3ca2a45 erofs: clear compacted_2b if compacted_4b_initial > totalidx)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (f62314b1ced2 kunit: fix reference count leak in kfree_at_end)
Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
Merging memblock-fixes/fixes (024591f9a6e0 arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM)
Merging cel-fixes/for-rc (7d2a07b76933 Linux 5.14)
Merging irqchip-fixes/irq/irqchip-fixes (b78f26926b17 irqchip/gic: Work around broken Renesas integration)
Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
Merging perf-current/perf/urgent (0513e464f900 Merge tag 'perf-tools-fixes-for-v5.15-2021-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
Merging drm-misc-fixes/for-linux-next-fixes (f86e9e383a71 video: fbdev: gbefb: Only instantiate device when built for IP32)
CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c
Merging kspp-gustavo/for-next/kspp (6409e7102a9b Merge branch 'for-next/kspp-fixes' into for-next/kspp)
Merging kbuild/for-next (6988f70cf105 kconfig: rename a variable in the lexer to a clearer name)
Merging perf/perf/core (be8ecc57f180 perf srcline: Use long-running addr2line per DSO)
Merging compiler-attributes/compiler-attributes (b83a908498d6 compiler_attributes.h: move __compiletime_{error|warning})
Merging dma-mapping/for-next (59583f747664 sparc32: page align size in arch_dma_alloc)
Merging asm-generic/master (7962c2eddbfe arch: remove unused function syscall_set_arguments())
Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1)
Merging arm/for-next (4603664c0fe9 Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (e45ac92bcc92 Merge branches 'for-next/kexec', 'for-next/kselftest', 'for-next/misc', 'for-next/mm', 'for-next/mte', 'for-next/pfn-valid' and 'for-next/scs' into for-next/core)
Merging arm-perf/for-next/perf (e656972b6986 drivers/perf: Improve build test coverage)
Merging arm-soc/for-next (6880fa6c5660 Linux 5.15-rc1)
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (83e38509109e Merge branch 'v5.16/dt64' into for-next)
Merging aspeed/for-next (e986277a56da Merge branches 'defconfig-for-v5.16' and 'dt-for-v5.16' into for-next)
Merging at91/at91-next (b4af371d908f Merge branch 'at91-soc' into at91-next)
Merging drivers-memory/for-next (bf7cf1ccbccc Merge branch 'mem-ctrl-next' into for-next)
Merging imx-mxs/for-next (0dd3273df8c2 Merge branch 'imx/dt64' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (69862ae4e378 Merge branch 'v5.14-next/soc' into for-next)
Merging mvebu/for-next (930af8dda750 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (7fd4d99072ce Merge branch 'omap-for-v5.16/ti-sysc' into for-next)
Merging qcom/for-next (37f6317b1882 Merge branches 'arm64-for-5.16', 'drivers-for-5.16' and 'dts-for-5.16' into for-next)
Merging raspberrypi/for-next (9f5289ec6f1c ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address)
Merging renesas/next (a462ac13da67 Merge branches 'renesas-arm-defconfig-for-v5.16' and 'renesas-arm-dt-for-v5.16' into renesas-next)
Merging reset/reset/next (09f3824342f6 reset: simple: remove ZTE details in Kconfig help)
Merging rockchip/for-next (9a6218fd50c1 Merge branch 'v5.16-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (64052e7fbb09 Merge branch 'next/dt' into for-next)
Merging scmi/for-linux-next (cb5da0da3602 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (350081007916 ARM: dts: stm32: set the DCMI pins on stm32mp157c-odyssey)
Merging sunxi/sunxi/for-next (bb289f4c0b2b Merge branches 'sunxi/clk-for-5.16', 'sunxi/core-for-5.16', 'sunxi/drivers-for-5.16', 'sunxi/dt-for-5.16' and 'sunxi/fixes-for-5.15' into sunxi/for-next)
Merging tegra/for-next (e7ed16ca46b5 Merge branch for-5.16/arm64/dt into for-next)
$ git reset --hard HEAD^
Merging next-20211001 version of tegra
Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next)
Merging ti-k3-new/ti-k3-next (6037c75b193a arm64: dts: ti: k3-am65: Relocate thermal-zones to SoC specific location)
Merging xilinx/for-next (7a4c31ee877a arm64: zynqmp: Add support for Xilinx Kria SOM board)
Merging clk/clk-next (1a10ca10a675 Merge branch 'clk-rockchip' into clk-next)
Merging clk-imx/for-next (d1012253a2d3 clk: imx: imx6ul: Fix csi clk gate register)
Merging clk-renesas/renesas-clk (cc3e8f97bbd3 clk: renesas: r8a779a0: Add Z0 and Z1 clock support)
Merging clk-samsung/for-next (1d26eaeec37a clk: samsung: s5pv210-audss: Make use of devm_platform_ioremap_resource())
Merging csky/linux-next (40e080ed8218 csky: Make HAVE_TCM depend on !COMPILE_TEST)
Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs)
Merging m68k/for-next (6621cb4a2d0a m68k: muldi3: Use semicolon instead of comma)
Merging m68knommu/for-next (16352355b8f4 m68knommu: Remove MCPU32 config symbol)
Merging microblaze/next (6880fa6c5660 Linux 5.15-rc1)
Merging mips/mips-next (67512a8cf5a7 MIPS: Avoid macro redefinitions)
Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory())
CONFLICT (content): Merge conflict in arch/nds32/Kconfig
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
Merging openrisc/for-next (72698a878926 openrisc: time: don't mark comment as kernel-doc)
Merging parisc-hd/for-next (144857444edb parisc/unwind: use copy_from_kernel_nofault())
Merging powerpc/next (e4e737bb5c17 Linux 5.15-rc2)
Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver)
Merging risc-v/for-next (21ccdccd21e4 riscv: mm: don't advertise 1 num_asid for 0 asid bits)
Merging s390/for-next (7e8601b12f46 Merge branch 'features' into for-next)
Merging sh/for-next (12285ff8667b sh: kdump: add some attribute to function)
Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging uml/linux-next (234640275675 um: rename set_signals() to um_set_signals())
Merging xtensa/xtensa-for-next (ddc33155115a xtensa: xtfpga: Try software restart before simulating CPU reset)
Merging pidfd/for-next (61bc346ce64a uapi/linux/prctl: provide macro definitions for the PR_SCHED_CORE type argument)
Merging fscrypt/master (7f595d6a6cdc fscrypt: allow 256-bit master keys with AES-256-XTS)
Merging fscache/fscache-next (97b85f2079a9 Merge branch 'fscache-iter-3' into fscache-next)
Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build")
Merging btrfs/for-next (9a10940c7b28 Merge branch 'for-next-next-v5.15-20211004' into for-next-20211004)
Merging ceph/master (b96728705f91 ceph: convert to noop_direct_IO)
Merging cifs/for-next (9e1ff307c779 Linux 5.15-rc4)
Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup())
Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs)
Merging erofs/dev (1266b4a7ecb6 erofs: fix double free of 'copied')
Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block)
Merging ext3/for_next (372d1f3e1bfe ext2: fix sleeping in atomic bugs on error)
Merging ext4/dev (f2c77973507f ext4: recheck buffer uptodate bit under buffer lock)
Merging f2fs/dev (6663b138ded1 f2fs: set SBI_NEED_FSCK flag when inconsistent node block found)
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
Merging fuse/for-next (7a41554fdfb0 fuse: move fuse_invalidate_attr() into fuse_update_ctime())
Merging gfs2/for-next (11603f0011d0 gfs2: Allow append and immutable bits to coexist)
Merging jfs/jfs-next (c48a14dca2cb JFS: fix memleak in jfs_mount)
Merging ksmbd/ksmbd-for-next (9e1ff307c779 Linux 5.15-rc4)
Merging nfs/linux-next (9e1ff307c779 Linux 5.15-rc4)
Merging nfs-anna/linux-next (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers)
Merging nfsd/nfsd-next (35940a58f9f1 SUNRPC: Capture value of xdr_buf::page_base)
Merging cel/for-next (2ba5acfb3495 SUNRPC: fix sign error causing rpcsec_gss drops)
Merging ntfs3/master (35afb70dcfe4 fs/ntfs3: Check for NULL if ATTR_EA_INFO is incorrect)
Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.)
Merging overlayfs/overlayfs-next (1dc1eed46f9f ovl: fix IOCB_DIRECT if underlying fs doesn't support direct IO)
Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode)
Merging v9fs/9p-next (9c4d94dc9a64 net/9p: increase default msize to 128k)
Merging xfs/for-next (f38a032b165d xfs: fix I_DONTCACHE)
Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check)
Merging iomap/iomap-for-next (03b8df8d43ec iomap: standardize tracepoint formatting and storage)
Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID)
Merging file-locks/locks-next (90f7d7a0d0d6 locks: remove LOCK_MAND flock lock support)
Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next)
Merging printk/for-next (c15b5fc054c3 ia64: don't do IA64_CMPXCHG_DEBUG without CONFIG_PRINTK)
Merging pci/next (ef4bce990eab Merge branch 'pci/virtualization')
Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long)
Merging hid/for-next (dd0f17ef2ea8 Merge branches 'for-5.15/upstream-fixes' and 'for-5.16/amd-sfh' into for-next)
Merging i2c/i2c/for-next (90d8f9584220 Merge branch 'i2c/for-current-fixed' into i2c/for-next)
Merging i3c/i3c/next (a3587e2c0578 i3c: fix incorrect address slot lookup on 64-bit)
Merging dmi/dmi-for-next (f97a2103f1a7 firmware: dmi: Move product_sku info to the end of the modalias)
Merging hwmon-staging/hwmon-next (0889b7c73a4d hwmon: (tmp421) introduce MAX_CHANNELS define)
Merging jc_docs/docs-next (250a0a5ba9d2 docs: checkpatch: add multiline, do/while, and multiple-assignment messages)
Merging v4l-dvb/master (c52e7b855b33 Merge tag 'v5.15-rc4' into media_tree)
Merging v4l-dvb-next/master (c52e7b855b33 Merge tag 'v5.15-rc4' into media_tree)
Merging pm/linux-next (d91db9b878c3 Merge branch 'pm-pci' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (c2ace21f937a cpufreq: tegra186/tegra194: Handle errors in BPMP response)
Merging cpupower/cpupower (79a0dc5530a9 tools: cpupower: fix typo in cpupower-idle-set(1) manpage)
Merging devfreq/devfreq-next (6b28c7d0781e PM / devfreq: Strengthen check for freq_table)
Merging opp/opp/linux-next (e69709f6861a opp: Add more resource-managed variants of dev_pm_opp_of_add_table())
Merging thermal/thermal/linux-next (fc26023f8816 thermal/drivers/int340x: Fix tcc offset on resume)
CONFLICT (content): Merge conflict in drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (ecd95673142e fs: dlm: avoid comms shutdown delay in release_lockspace)
Merging swiotlb/linux-next (f3c4b1341e83 swiotlb: use depends on for DMA_RESTRICTED_POOL)
Merging rdma/for-next (d30ef6d5c013 Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/ipoib_tx.c
Merging net-next/master (166003436190 Merge branch 'phy-10g-mode-helper')
$ git reset --hard HEAD^
Merging next-20211001 version of net-next
Applying: fix up for "net: add new socket option SO_RESERVE_MEM"
[master 96958d6c3597] next-20211001/net-next
Merging bpf-next/for-next (0693b27644f0 Merge branch 'mctp-kunit-tests')
CONFLICT (content): Merge conflict in arch/sparc/include/uapi/asm/socket.h
$ git reset --hard HEAD^
Merging next-20211001 version of bpf-next
Merging ipsec-next/master (83688aec17bf net/ipv4/xfrm4_tunnel.c: remove superfluous header files from xfrm4_tunnel.c)
Merging mlx5-next/mlx5-next (d2c8a1554c10 IB/mlx5: Enable UAR to have DevX UID)
Merging netfilter-next/master (acde891c243c rxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies())
Merging ipvs-next/master (acde891c243c rxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies())
Merging wireless-drivers-next/master (a8e5387f8362 ipw2200: Fix a function name in print messages)
Merging bluetooth/master (43f51bd946da Bluetooth: Rename driver .prevent_wake to .wakeup)
CONFLICT (content): Merge conflict in arch/sparc/include/uapi/asm/socket.h
$ git reset --hard HEAD^
Merging next-20211001 version of bluetooth
Merging mac80211-next/master (171964252189 mac80211: MBSSID support in interface handling)
Merging mtd/mtd/next (b72841e4dcd5 mtd: mtdswap: Remove redundant assignment of pointer eb)
Merging nand/nand/next (c2606ddcf5ad mtd: onenand: samsung: drop Exynos4 and describe driver in KConfig)
Merging spi-nor/spi-nor/next (5816b3e6577e Linux 5.15-rc3)
Merging crypto/master (e42dff467ee6 crypto: api - Export crypto_boot_test_finished)
Merging drm/drm-next (1e3944578b74 Merge tag 'amd-drm-next-5.16-2021-09-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
Merging drm-misc/for-linux-next (61bae132030a Revert "drm: cleanup: drm_modeset_lock_all_ctx() --> DRM_MODESET_LOCK_ALL_BEGIN()")
Merging amdgpu/drm-next (4e45069010e5 drm/amdgpu/pm: properly handle sclk for profiling modes on vangogh)
Merging drm-intel/for-linux-next (7d396cacaea6 drm/i195: Make the async flip VT-d workaround dynamic)
Merging drm-tegra/drm/tegra/for-next (c3dbfb9c49ee gpu: host1x: Plug potential memory leak)
Merging drm-msm/msm-next (bc80747eb681 drm/msm: Do not run snapshot on non-DPU devices)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem_submit.c
Merging imx-drm/imx-drm/next (20fbfc81e390 drm/imx: imx-tve: Make use of the helper function devm_platform_ioremap_resource())
Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function)
Merging regmap/for-next (6880fa6c5660 Linux 5.15-rc1)
Merging sound/for-next (23939115be18 ALSA: usb-audio: Fix packet size calculation regression)
Merging sound-asoc/for-next (6de669e88076 Merge remote-tracking branch 'asoc/for-5.16' into asoc-next)
Applying: Revert "firmware: cs_dsp: add driver to support firmware loading on Cirrus Logic DSPs"
Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer)
Merging input/next (5c4c2c8e6fac Input: ariel-pwrbutton - add SPI device ID table)
Merging block/for-next (1b2d1439fc25 Merge branch 'for-5.16/io_uring' into for-next)
Merging device-mapper/for-next (d3703ef33129 dm crypt: use in_hardirq() instead of deprecated in_irq())
Merging libata/for-next (0e96dc47b95a ahci: remove duplicated PCI device IDs)
Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug)
Merging mmc/next (fb99597d255a mmc: slot-gpio: Update default label when no con_id provided)
Merging mfd/for-mfd-next (cdff1eda6932 mfd: lpc_sch: Rename GPIOBASE to prevent build error)
Merging backlight/for-backlight-next (79fad92f2e59 backlight: pwm_bl: Improve bootloader/kernel device handover)
Merging battery/for-next (0668281d329d power: supply: cpcap-battery: use device_get_match_data() to simplify code)
Merging regulator/for-next (d17e70999e4a Merge remote-tracking branch 'regulator/for-5.16' into regulator-next)
Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check)
Merging integrity/next-integrity (836f7b6ca082 ima: fix deadlock when traversing "ima_default_rules".)
Merging keys/keys-next (e377c31f788f integrity: Load mokx variables into the blacklist keyring)
CONFLICT (content): Merge conflict in certs/system_keyring.c
Merging safesetid/safesetid-next (1b8b71922919 LSM: SafeSetID: Mark safesetid_initialized as __initdata)
Merging selinux/next (f5d0e5e9d72d selinux: remove the SELinux lockdown implementation)
CONFLICT (content): Merge conflict in fs/io-wq.c
Applying: fixup for "io_uring: init opcode in io_init_req()"
Merging smack/next (387ef964460f Smack:- Use overlay inode label in smack_inode_copy_up())
Merging tomoyo/master (7d2a07b76933 Linux 5.14)
Merging tpmdd/next (f985911b7bc7 crypto: public_key: fix overflow during implicit conversion)
Merging watchdog/master (5816b3e6577e Linux 5.15-rc3)
Merging iommu/next (0b29edc21567 Merge branches 'arm/mediatek', 'arm/renesas', 'iommu/fixes', 'x86/amd' and 'core' into next)
Merging audit/next (571e5c0efcb2 audit: add OPENAT2 record to list "how" info)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (37ef2c34e437 docs: dt: Fix a few grammar nits in the binding/schema docs)
Merging mailbox/mailbox-for-next (85dfdbfc13ea mailbox: cmdq: add multi-gce clocks support for mt8195)
Merging spi/for-next (8886d5c77f83 Merge remote-tracking branch 'spi/for-5.16' into spi-next)
Merging tip/auto-latest (d4bfebd9ef49 Merge remote-tracking branch 'tip/x86/cpu' into tip-master)
Merging clockevents/timers/drivers/next (f196ae282070 dt-bindings: timer: Add ABIs for new Ingenic SoCs)
Merging edac/edac-for-next (1c60e6f24b67 Merge branch 'edac-misc' into edac-for-next)
Merging irqchip/irq/irqchip-next (6e3b473ee064 Merge branch irq/qcom-pdc-nowake-cleanup into irq/irqchip-next)
Merging ftrace/for-next (5dfe50b05588 bootconfig: Rename xbc_node_find_child() to xbc_node_find_subkey())
Merging rcu/rcu/next (718ecc280a84 rcu: Make idle entry report expedited quiescent states)
Merging kvm/next (deae4a10f166 KVM: x86: only allocate gfn_track when necessary)
Merging kvm-arm/next (419025b3b419 Merge branch kvm-arm64/misc-5.15 into kvmarm-master/next)
Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests)
Merging kvms390/next (d5d7bdc80baf s390/mm: optimize reset_guest_reference_bit())
Merging xen-tip/linux-next (0594c58161b6 xen/x86: fix PV trap handling on secondary processors)
Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next)
Merging workqueues/for-next (6880fa6c5660 Linux 5.15-rc1)
Merging drivers-x86/for-next (c99ca78d67a6 platform/x86: thinkpad_acpi: Switch to common use of attributes)
Merging chrome-platform/for-next (eb057514ccca platform/chrome: cros_ec: Fix spelling mistake "responsed" -> "response")
Merging hsi/for-next (4ef69e17eb56 HSI: cmt_speech: unmark comments as kernel-doc)
Merging leds/for-next (2a5a8fa8b231 leds: trigger: use RCU to protect the led_cdevs list)
Merging ipmi/for-next (bc7b6871360e ipmi: Add docs for the IPMI IPMB driver)
Merging driver-core/driver-core-next (bb76c823585b Merge 5.15-rc4 into driver-core-next)
Merging usb/usb-next (ae9a6149884e Merge 5.15-rc3 into usb-next)
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (c8345c0500de USB: serial: kl5kusb105: drop line-status helper)
Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed)
Merging tty/tty-next (5ecb11dd892f Merge 5.15-rc3 into tty-next)
Merging char-misc/char-misc-next (8bf7a12c628d Merge 5.15-rc4 into char-misc-next)
Merging extcon/extcon-next (f83d7033d4ec dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string)
Merging phy-next/next (717e04fba4fa phy: rockchip-inno-usb2: Make use of the helper function devm_add_action_or_reset())
Merging soundwire/next (ccfdcb325f2a ABI: sysfs-bus-soundwire-slave: use wildcards on What definitions)
Merging thunderbolt/next (0a0624a26f9c thunderbolt: Fix -Wrestrict warning)
Merging vfio/next (d9a0cd510c33 Merge branch 'v5.16/vfio/hch-cleanup-vfio-iommu_group-creation-v6' into v5.16/vfio/next)
Merging staging/staging-next (42ce32b1ae54 staging: r8188eu: Remove unused macros and defines from odm.h)
Merging iio/togreg (4c2d124b3c9d iio: imu: adis16400: Fix buffer alignment requirements.)
CONFLICT (content): Merge conflict in drivers/iio/adc/aspeed_adc.c
Merging mux/for-next (3516bd729358 Merge tag 's390-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging icc/icc-next (dfe14674bf7b Merge branch 'icc-rpm' into icc-next)
Merging dmaengine/next (6880fa6c5660 Linux 5.15-rc1)
Merging cgroup/for-next (7ee285395b21 cgroup: Make rebind_subsystems() disable v2 controllers all at once)
Merging scsi/for-next (b198c36ab605 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (c749301ebee8 scsi: sd: Fix sd_do_mode_sense() buffer length handling)
Merging vhost/linux-next (dd7dc7e82b14 vhost_vdpa: unset vq irq before freeing irq)
Merging rpmsg/for-next (eb2685635cb7 Merge branches 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (7ac554888233 MAINTAINERS: Remove reference to non-existing file)
Merging gpio-brgl/gpio/for-next (7687a5b0ee93 gpio: modepin: Add driver support for modepin GPIO controller)
Merging gpio-intel/for-next (1649b8376694 gpio: pca953x: Improve bias setting)
Merging pinctrl/for-next (5077a3240bb3 Merge tag 'renesas-pinctrl-for-v5.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel)
Merging pinctrl-intel/for-next (176412f8674b pinctrl: intel: Kconfig: Add configuration menu to Intel pin control)
Merging pinctrl-renesas/renesas-pinctrl (fcfb63148c24 pinctrl: renesas: rzg2l: Fix missing port register 21h)
Merging pinctrl-samsung/for-next (6880fa6c5660 Linux 5.15-rc1)
Merging pwm/for-next (3f2b16734914 pwm: mtk-disp: Implement atomic API .get_state())
Merging userns/for-next (a3be01837fc9 Merge of ucount-fixes-for-5.14, siginfo-si_trapno-for-v5.15, and exit-cleanups-for-v5.15 for testing in linux-next)
CONFLICT (content): Merge conflict in include/linux/sched/signal.h
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
Merging kselftest/next (6880fa6c5660 Linux 5.15-rc1)
Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next)
Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection())
Merging rtc/rtc-next (27ff63eb076c rtc: msc313: fix missing include)
Merging nvdimm/libnvdimm-for-next (e765f13ed126 nvdimm/pmem: move dax_attribute_group from dax to pmem)
Merging at24/at24/for-next (762925405482 dt-bindings: at24: add ON Semi CAT24C04 and CAT24C05)
Merging ntb/ntb-next (f96cb827ce49 ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data)
Merging seccomp/for-next/seccomp (d9bbdbf324cd x86: deduplicate the spectre_v2_user documentation)
Merging kspp/for-next/kspp (e6f21e8a3c4f Merge branch 'for-next/overflow' into for-next/kspp)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons)
Merging fsi/next (9ab1428dfe2c fsi/sbefifo: Fix reset timeout)
Merging slimbus/for-next (6880fa6c5660 Linux 5.15-rc1)
Merging nvmem/for-next (d162d84b27c8 nvmem: Fix shift-out-of-bound (UBSAN) with byte size cells)
Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1)
Merging hyperv/hyperv-next (9d68cd9120e4 hv_utils: Set the maximum packet size for VSS driver to the length of the receive buffer)
Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions)
Merging kgdb/kgdb/for-next (f8416aa29185 kernel: debug: Convert to SPDX identifier)
Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1)
Merging fpga/for-next (57b44817a8d6 MAINTAINERS: Drop outdated FPGA Manager website)
Merging kunit/test (6880fa6c5660 Linux 5.15-rc1)
Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3)
Merging kunit-next/kunit (3b29021ddd10 kunit: tool: allow filtering test cases via glob)
Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mhi/mhi-next (813272ed5238 Merge 5.14-rc5 into char-misc-next)
Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
Merging rust/rust-next (5d3986cf8ed6 MAINTAINERS: Rust)
CONFLICT (content): Merge conflict in include/linux/kallsyms.h
CONFLICT (content): Merge conflict in Makefile
Applying: fixup for rust integration with Makefile.clang creation
Merging cxl/next (ed97afb53365 cxl/pci: Disambiguate cxl_pci further from cxl_mem)
Merging folio/for-next (27b231798da1 mm/writeback: Add folio_write_one)
CONFLICT (modify/delete): fs/cachefiles/rdwr.c deleted in HEAD and modified in folio/for-next. Version folio/for-next of fs/cachefiles/rdwr.c left in tree.
$ git rm -f fs/cachefiles/rdwr.c
Applying: fix up for "9p: Convert to using the netfs helper lib to do reads and caching"
Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string)
Merging akpm-current/current (dd22e0752770 ipc/ipc_sysctl.c: remove fallback for !CONFIG_PROC_SYSCTL)
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (506ac22b3b7e mm: unexport {,un}lock_page_memcg)

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

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

* Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate)
  2021-10-05  8:06 linux-next: Tree for Oct 5 Stephen Rothwell
@ 2021-10-05 20:46 ` Randy Dunlap
  2021-10-06 14:52   ` Dave Hansen
  2021-10-06 21:22   ` Steven Rostedt
  0 siblings, 2 replies; 20+ messages in thread
From: Randy Dunlap @ 2021-10-05 20:46 UTC (permalink / raw)
  To: Stephen Rothwell, Linux Next Mailing List
  Cc: Linux Kernel Mailing List, linux-mm, Andrew Morton, Steven Rostedt

On 10/5/21 1:06 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20211001:
> 

on x86_64:

a. randconfig: KCONFIG_SEED=0xBFBEA13C
../kernel/trace/trace.c:1712:13: error: 'trace_create_maxlat_file' defined but not used [-Werror=unused-function]
  static void trace_create_maxlat_file(struct trace_array *tr,

b. randconfig: KCONFIG_SEED=0xFD1CE406

../mm/migrate.c:3216:22: error: 'migrate_on_reclaim_callback' defined but not used [-Werror=unused-function]
  static int __meminit migrate_on_reclaim_callback(struct notifier_block *self,
                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~
../mm/migrate.c:3197:13: error: 'set_migration_target_nodes' defined but not used [-Werror=unused-function]
  static void set_migration_target_nodes(void)
              ^~~~~~~~~~~~~~~~~~~~~~~~~~


(example usage to get the randconfig files:
KCONFIG_SEED=0xBFBEA13C make [ARCH=x86_64] randconfig
)

-- 
~Randy

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

* Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate)
  2021-10-05 20:46 ` linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate) Randy Dunlap
@ 2021-10-06 14:52   ` Dave Hansen
  2021-10-06 14:56     ` Steven Rostedt
  2021-10-06 16:33     ` Randy Dunlap
  2021-10-06 21:22   ` Steven Rostedt
  1 sibling, 2 replies; 20+ messages in thread
From: Dave Hansen @ 2021-10-06 14:52 UTC (permalink / raw)
  To: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List
  Cc: Linux Kernel Mailing List, linux-mm, Andrew Morton, Steven Rostedt

On 10/5/21 1:46 PM, Randy Dunlap wrote:
> On 10/5/21 1:06 AM, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20211001:
> 
> on x86_64:
...
> b. randconfig: KCONFIG_SEED=0xFD1CE406
> 
> ../mm/migrate.c:3216:22: error: 'migrate_on_reclaim_callback' defined
> but not used [-Werror=unused-function]
>  static int __meminit migrate_on_reclaim_callback(struct notifier_block
> *self,
>                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../mm/migrate.c:3197:13: error: 'set_migration_target_nodes' defined but
> not used [-Werror=unused-function]
>  static void set_migration_target_nodes(void)
>              ^~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> 
> (example usage to get the randconfig files:
> KCONFIG_SEED=0xBFBEA13C make [ARCH=x86_64] randconfig
> )

Hi Randy,

I'm having a heck of a time reproducing this one.  Any chance you could
share an exact sha1 for the tree where you're hitting this, and maybe
even the actual .config (just in case the KCONFIG_SEED isn't working
somehow).

I've tried a few linux-next trees as well as the mmotm, mmots and
mainline with the culprit patch applied.  No luck reproducing this so far.

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

* Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate)
  2021-10-06 14:52   ` Dave Hansen
@ 2021-10-06 14:56     ` Steven Rostedt
  2021-10-06 16:39       ` Randy Dunlap
  2021-10-06 16:33     ` Randy Dunlap
  1 sibling, 1 reply; 20+ messages in thread
From: Steven Rostedt @ 2021-10-06 14:56 UTC (permalink / raw)
  To: Dave Hansen
  Cc: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, linux-mm, Andrew Morton

On Wed, 6 Oct 2021 07:52:07 -0700
Dave Hansen <dave.hansen@intel.com> wrote:

> On 10/5/21 1:46 PM, Randy Dunlap wrote:
> > On 10/5/21 1:06 AM, Stephen Rothwell wrote:  
> >> Hi all,
> >>
> >> Changes since 20211001:  
> > 
> > on x86_64:  
> ...
> > b. randconfig: KCONFIG_SEED=0xFD1CE406
> > 
> > ../mm/migrate.c:3216:22: error: 'migrate_on_reclaim_callback' defined
> > but not used [-Werror=unused-function]
> >  static int __meminit migrate_on_reclaim_callback(struct notifier_block
> > *self,
> >                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> > ../mm/migrate.c:3197:13: error: 'set_migration_target_nodes' defined but
> > not used [-Werror=unused-function]
> >  static void set_migration_target_nodes(void)
> >              ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > 
> > 
> > (example usage to get the randconfig files:
> > KCONFIG_SEED=0xBFBEA13C make [ARCH=x86_64] randconfig
> > )  
> 
> Hi Randy,
> 
> I'm having a heck of a time reproducing this one.  Any chance you could
> share an exact sha1 for the tree where you're hitting this, and maybe
> even the actual .config (just in case the KCONFIG_SEED isn't working
> somehow).
> 
> I've tried a few linux-next trees as well as the mmotm, mmots and
> mainline with the culprit patch applied.  No luck reproducing this so far.

also, just sending the .config that broke would be much better than
supplying the seed you used to make it. I'm assuming if we don't use the
exact kernel image, with different configs available between versions, the
seed will produce different results.

Not to mention, I'll spend the time to look at a .config and less likely to
spend the time trying to figure out how to create that config.

-- Steve

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

* Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate)
  2021-10-06 14:52   ` Dave Hansen
  2021-10-06 14:56     ` Steven Rostedt
@ 2021-10-06 16:33     ` Randy Dunlap
  1 sibling, 0 replies; 20+ messages in thread
From: Randy Dunlap @ 2021-10-06 16:33 UTC (permalink / raw)
  To: Dave Hansen, Stephen Rothwell, Linux Next Mailing List
  Cc: Linux Kernel Mailing List, linux-mm, Andrew Morton, Steven Rostedt

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

On 10/6/21 7:52 AM, Dave Hansen wrote:
> On 10/5/21 1:46 PM, Randy Dunlap wrote:
>> On 10/5/21 1:06 AM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20211001:
>>
>> on x86_64:
> ...
>> b. randconfig: KCONFIG_SEED=0xFD1CE406
>>
>> ../mm/migrate.c:3216:22: error: 'migrate_on_reclaim_callback' defined
>> but not used [-Werror=unused-function]
>>   static int __meminit migrate_on_reclaim_callback(struct notifier_block
>> *self,
>>                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>> ../mm/migrate.c:3197:13: error: 'set_migration_target_nodes' defined but
>> not used [-Werror=unused-function]
>>   static void set_migration_target_nodes(void)
>>               ^~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>>
>> (example usage to get the randconfig files:
>> KCONFIG_SEED=0xBFBEA13C make [ARCH=x86_64] randconfig
>> )
> 
> Hi Randy,
> 
> I'm having a heck of a time reproducing this one.  Any chance you could
> share an exact sha1 for the tree where you're hitting this, and maybe
> even the actual .config (just in case the KCONFIG_SEED isn't working
> somehow).
> 
> I've tried a few linux-next trees as well as the mmotm, mmots and
> mainline with the culprit patch applied.  No luck reproducing this so far.
> 

Hi Dave,

This is just whatever is in linux-next-20211005, which looks like:

commit 29616f67fcbd (HEAD, tag: next-20211005, origin/master, origin/HEAD)
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date:   Tue Oct 5 19:00:37 2021 +1100

     Add linux-next specific files for 20211005
     
     Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>


I have 2 randconfig files that show this build warning.
One of them is attached.

-- 
~Randy

[-- Attachment #2: config-r9613.gz --]
[-- Type: application/gzip, Size: 25551 bytes --]

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

* Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate)
  2021-10-06 14:56     ` Steven Rostedt
@ 2021-10-06 16:39       ` Randy Dunlap
  2021-10-06 18:16         ` Dave Hansen
  0 siblings, 1 reply; 20+ messages in thread
From: Randy Dunlap @ 2021-10-06 16:39 UTC (permalink / raw)
  To: Steven Rostedt, Dave Hansen
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, linux-mm, Andrew Morton

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

On 10/6/21 7:56 AM, Steven Rostedt wrote:
> On Wed, 6 Oct 2021 07:52:07 -0700
> Dave Hansen <dave.hansen@intel.com> wrote:
> 
>> On 10/5/21 1:46 PM, Randy Dunlap wrote:
>>> On 10/5/21 1:06 AM, Stephen Rothwell wrote:
>>>> Hi all,
>>>>
>>>> Changes since 20211001:
>>>
>>> on x86_64:
>> ...
>>> b. randconfig: KCONFIG_SEED=0xFD1CE406
>>>
>>> ../mm/migrate.c:3216:22: error: 'migrate_on_reclaim_callback' defined
>>> but not used [-Werror=unused-function]
>>>   static int __meminit migrate_on_reclaim_callback(struct notifier_block
>>> *self,
>>>                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>>> ../mm/migrate.c:3197:13: error: 'set_migration_target_nodes' defined but
>>> not used [-Werror=unused-function]
>>>   static void set_migration_target_nodes(void)
>>>               ^~~~~~~~~~~~~~~~~~~~~~~~~~
>>>
>>>
>>> (example usage to get the randconfig files:
>>> KCONFIG_SEED=0xBFBEA13C make [ARCH=x86_64] randconfig
>>> )
>>
>> Hi Randy,
>>
>> I'm having a heck of a time reproducing this one.  Any chance you could
>> share an exact sha1 for the tree where you're hitting this, and maybe
>> even the actual .config (just in case the KCONFIG_SEED isn't working
>> somehow).
>>
>> I've tried a few linux-next trees as well as the mmotm, mmots and
>> mainline with the culprit patch applied.  No luck reproducing this so far.
> 
> also, just sending the .config that broke would be much better than
> supplying the seed you used to make it. I'm assuming if we don't use the
> exact kernel image, with different configs available between versions, the
> seed will produce different results.
> 
> Not to mention, I'll spend the time to look at a .config and less likely to
> spend the time trying to figure out how to create that config.

OK, so a failed experiment. :(

The failing randconfig file is attached (for a. trace).

thanks.
-- 
~Randy

[-- Attachment #2: config-r9615.gz --]
[-- Type: application/gzip, Size: 38068 bytes --]

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

* Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate)
  2021-10-06 16:39       ` Randy Dunlap
@ 2021-10-06 18:16         ` Dave Hansen
  0 siblings, 0 replies; 20+ messages in thread
From: Dave Hansen @ 2021-10-06 18:16 UTC (permalink / raw)
  To: Randy Dunlap, Steven Rostedt
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, linux-mm, Andrew Morton

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

On 10/6/21 9:39 AM, Randy Dunlap wrote:
>>>> ../mm/migrate.c:3216:22: error: 'migrate_on_reclaim_callback' defined
>>>> but not used [-Werror=unused-function]
>>>>   static int __meminit migrate_on_reclaim_callback(struct
>>>> notifier_block
>>>> *self,
>>>>                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>> ../mm/migrate.c:3197:13: error: 'set_migration_target_nodes' defined
>>>> but
>>>> not used [-Werror=unused-function]
>>>>   static void set_migration_target_nodes(void)
>>>>               ^~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>
>>>>
>>>> (example usage to get the randconfig files:
>>>> KCONFIG_SEED=0xBFBEA13C make [ARCH=x86_64] randconfig
>>>> )

Randy, thanks for the .config!  That did the trick.

Andrew, attached is a replacement patch for

	mm-migrate-add-cpu-hotplug-to-demotion-ifdef.patch

I could do an incremental as well if that would be easier.  But, the fix
here required a bit of a change of tactics from the original and
necessitated a rewrite of the changelog.

[-- Attachment #2: mm-migrate-separate-CPU-and-memory-hotplug-notifiers.patch --]
[-- Type: text/x-patch, Size: 4713 bytes --]

Subject: [PATCH] mm/migrate: separate CPU and memory hotplug notifiers
Date: Wed, 6 Oct 2021 11:08:46 -0700
Message-ID: <20211006180846.3321352-1-dave.hansen@intel.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20210924161255.E5FE8F7E@davehans-spike.ostc.intel.com>
References: <20210924161255.E5FE8F7E@davehans-spike.ostc.intel.com>

From: Dave Hansen <dave.hansen@linux.intel.com>

Once upon a time, the node demotion updates were driven solely by memory
hotplug events.  But now, there are handlers for both CPU and memory
hotplug.

However, the #ifdef around the code checks only memory hotplug.  A system
that has HOTPLUG_CPU=y but MEMORY_HOTPLUG=n would miss CPU hotplug events.

Update the #ifdef around the common code.  Add memory and CPU-specific
option are off.  Move some CPU-hotplug-specific functions to reside under
their specific #ifdef.

Link: https://lkml.kernel.org/r/20210924161255.E5FE8F7E@davehans-spike.ostc.intel.com
Fixes: 884a6e5d1f93 ("mm/migrate: update node demotion order on hotplug events")
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Wei Xu <weixugc@google.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Greg Thelen <gthelen@google.com>
Cc: Yang Shi <yang.shi@linux.alibaba.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
---
 mm/migrate.c | 78 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 34 deletions(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index a6311e46f605..5282157575ba 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -3066,7 +3066,7 @@ void migrate_vma_finalize(struct migrate_vma *migrate)
 EXPORT_SYMBOL(migrate_vma_finalize);
 #endif /* CONFIG_DEVICE_PRIVATE */
 
-#if defined(CONFIG_MEMORY_HOTPLUG)
+#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_HOTPLUG_CPU)
 /* Disable reclaim-based migration. */
 static void __disable_all_migrate_targets(void)
 {
@@ -3198,35 +3198,7 @@ static void __set_migration_target_nodes(void)
 		goto again;
 }
 
-/*
- * For callers that do not hold get_online_mems() already.
- */
-static void set_migration_target_nodes(void)
-{
-	get_online_mems();
-	__set_migration_target_nodes();
-	put_online_mems();
-}
-
-/*
- * React to hotplug events that might affect the migration targets
- * like events that online or offline NUMA nodes.
- *
- * The ordering is also currently dependent on which nodes have
- * CPUs.  That means we need CPU on/offline notification too.
- */
-static int migration_online_cpu(unsigned int cpu)
-{
-	set_migration_target_nodes();
-	return 0;
-}
-
-static int migration_offline_cpu(unsigned int cpu)
-{
-	set_migration_target_nodes();
-	return 0;
-}
-
+#if defined(CONFIG_MEMORY_HOTPLUG)
 /*
  * This leaves migrate-on-reclaim transiently disabled between
  * the MEM_GOING_OFFLINE and MEM_OFFLINE events.  This runs
@@ -3284,7 +3256,45 @@ static int __meminit migrate_on_reclaim_callback(struct notifier_block *self,
 	return notifier_from_errno(0);
 }
 
-static int __init migrate_on_reclaim_init(void)
+static int __init migrate_on_reclaim_init_memhp(void)
+{
+	hotplug_memory_notifier(migrate_on_reclaim_callback, 100);
+	return 0;
+}
+late_initcall(migrate_on_reclaim_init_memhp);
+#endif /* CONFIG_MEMORY_HOTPLUG */
+
+#ifdef CONFIG_HOTPLUG_CPU
+/*
+ * For callers that do not hold get_online_mems() already.
+ */
+static void set_migration_target_nodes(void)
+{
+	get_online_mems();
+	__set_migration_target_nodes();
+	put_online_mems();
+}
+
+/*
+ * React to hotplug events that might affect the migration targets
+ * like events that online or offline NUMA nodes.
+ *
+ * The ordering is also currently dependent on which nodes have
+ * CPUs.  That means we need CPU on/offline notification too.
+ */
+static int migration_online_cpu(unsigned int cpu)
+{
+	set_migration_target_nodes();
+	return 0;
+}
+
+static int migration_offline_cpu(unsigned int cpu)
+{
+	set_migration_target_nodes();
+	return 0;
+}
+
+static int __init migrate_on_reclaim_init_cpuhp(void)
 {
 	int ret;
 
@@ -3299,8 +3309,8 @@ static int __init migrate_on_reclaim_init(void)
 	 */
 	WARN_ON(ret < 0);
 
-	hotplug_memory_notifier(migrate_on_reclaim_callback, 100);
 	return 0;
 }
-late_initcall(migrate_on_reclaim_init);
-#endif /* CONFIG_MEMORY_HOTPLUG */
+late_initcall(migrate_on_reclaim_init_cpuhp);
+#endif /* CONFIG_HOTPLUG_CPU */
+#endif /* CONFIG_MEMORY_HOTPLUG || CONFIG_HOTPLUG_CPU */
-- 
2.25.1


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

* Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate)
  2021-10-05 20:46 ` linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate) Randy Dunlap
  2021-10-06 14:52   ` Dave Hansen
@ 2021-10-06 21:22   ` Steven Rostedt
  2021-10-06 21:32     ` Randy Dunlap
  1 sibling, 1 reply; 20+ messages in thread
From: Steven Rostedt @ 2021-10-06 21:22 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, linux-mm, Andrew Morton

On Tue, 5 Oct 2021 13:46:52 -0700
Randy Dunlap <rdunlap@infradead.org> wrote:

> a. randconfig: KCONFIG_SEED=0xBFBEA13C
> ../kernel/trace/trace.c:1712:13: error: 'trace_create_maxlat_file' defined but not used [-Werror=unused-function]
>   static void trace_create_maxlat_file(struct trace_array *tr,

Does this fix it?

-- Steve

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 7896d30d90f7..4520cbab0da5 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1744,16 +1744,15 @@ void latency_fsnotify(struct trace_array *tr)
 	irq_work_queue(&tr->fsnotify_irqwork);
 }
 
-/*
- * (defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)) && \
- *  defined(CONFIG_FSNOTIFY)
- */
-#else
+/* CONFIG_FSNOTIFY else */
+#elif CREATE_MAX_TRACE_FILE
 
 #define trace_create_maxlat_file(tr, d_tracer)				\
 	trace_create_file("tracing_max_latency", 0644, d_tracer,	\
 			  &tr->max_latency, &tracing_max_lat_fops)
 
+#else
+#define trace_create_maxlat_file(tr, d_tracer) do { } while (0)
 #endif
 
 #ifdef CONFIG_TRACER_MAX_TRACE
@@ -9473,9 +9472,7 @@ init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer)
 
 	create_trace_options_dir(tr);
 
-#if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)
 	trace_create_maxlat_file(tr, d_tracer);
-#endif
 
 	if (ftrace_create_function_files(tr, d_tracer))
 		MEM_FAIL(1, "Could not allocate function filter files");
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index b7c0f8e160fb..680935949aef 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -679,8 +679,11 @@ void update_max_tr_single(struct trace_array *tr,
 #endif /* CONFIG_TRACER_MAX_TRACE */
 
 #if (defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER) \
-	|| defined(CONFIG_OSNOISE_TRACER)) && defined(CONFIG_FSNOTIFY)
-#define LATENCY_FS_NOTIFY
+	|| defined(CONFIG_OSNOISE_TRACER))
+# define CREATE_MAX_TRACE_FILE
+# ifdef CONFIG_FSNOTIFY
+#  define LATENCY_FS_NOTIFY
+# endif
 #endif
 
 #ifdef LATENCY_FS_NOTIFY

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

* Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate)
  2021-10-06 21:22   ` Steven Rostedt
@ 2021-10-06 21:32     ` Randy Dunlap
  2021-10-06 22:06       ` Steven Rostedt
  2021-10-07  1:10       ` Steven Rostedt
  0 siblings, 2 replies; 20+ messages in thread
From: Randy Dunlap @ 2021-10-06 21:32 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, linux-mm, Andrew Morton

On 10/6/21 2:22 PM, Steven Rostedt wrote:
> On Tue, 5 Oct 2021 13:46:52 -0700
> Randy Dunlap <rdunlap@infradead.org> wrote:
> 
>> a. randconfig: KCONFIG_SEED=0xBFBEA13C
>> ../kernel/trace/trace.c:1712:13: error: 'trace_create_maxlat_file' defined but not used [-Werror=unused-function]
>>    static void trace_create_maxlat_file(struct trace_array *tr,
> 
> Does this fix it?
> 
> -- Steve

Yes, thanks.

Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested


> 
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index 7896d30d90f7..4520cbab0da5 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -1744,16 +1744,15 @@ void latency_fsnotify(struct trace_array *tr)
>   	irq_work_queue(&tr->fsnotify_irqwork);
>   }
>   
> -/*
> - * (defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)) && \
> - *  defined(CONFIG_FSNOTIFY)
> - */
> -#else
> +/* CONFIG_FSNOTIFY else */
> +#elif CREATE_MAX_TRACE_FILE
>   
>   #define trace_create_maxlat_file(tr, d_tracer)				\
>   	trace_create_file("tracing_max_latency", 0644, d_tracer,	\
>   			  &tr->max_latency, &tracing_max_lat_fops)
>   
> +#else
> +#define trace_create_maxlat_file(tr, d_tracer) do { } while (0)
>   #endif
>   
>   #ifdef CONFIG_TRACER_MAX_TRACE
> @@ -9473,9 +9472,7 @@ init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer)
>   
>   	create_trace_options_dir(tr);
>   
> -#if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)
>   	trace_create_maxlat_file(tr, d_tracer);
> -#endif
>   
>   	if (ftrace_create_function_files(tr, d_tracer))
>   		MEM_FAIL(1, "Could not allocate function filter files");
> diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
> index b7c0f8e160fb..680935949aef 100644
> --- a/kernel/trace/trace.h
> +++ b/kernel/trace/trace.h
> @@ -679,8 +679,11 @@ void update_max_tr_single(struct trace_array *tr,
>   #endif /* CONFIG_TRACER_MAX_TRACE */
>   
>   #if (defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER) \
> -	|| defined(CONFIG_OSNOISE_TRACER)) && defined(CONFIG_FSNOTIFY)
> -#define LATENCY_FS_NOTIFY
> +	|| defined(CONFIG_OSNOISE_TRACER))
> +# define CREATE_MAX_TRACE_FILE
> +# ifdef CONFIG_FSNOTIFY
> +#  define LATENCY_FS_NOTIFY
> +# endif
>   #endif
>   
>   #ifdef LATENCY_FS_NOTIFY
> 


-- 
~Randy

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

* Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate)
  2021-10-06 21:32     ` Randy Dunlap
@ 2021-10-06 22:06       ` Steven Rostedt
  2021-10-07  1:10       ` Steven Rostedt
  1 sibling, 0 replies; 20+ messages in thread
From: Steven Rostedt @ 2021-10-06 22:06 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, linux-mm, Andrew Morton

On Wed, 6 Oct 2021 14:32:21 -0700
Randy Dunlap <rdunlap@infradead.org> wrote:

> >> a. randconfig: KCONFIG_SEED=0xBFBEA13C
> >> ../kernel/trace/trace.c:1712:13: error: 'trace_create_maxlat_file' defined but not used [-Werror=unused-function]
> >>    static void trace_create_maxlat_file(struct trace_array *tr,  
> > 
> > Does this fix it?
> > 
> > -- Steve  
> 
> Yes, thanks.
> 
> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
> 

I believe the proper tags are:

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

-- Steve

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

* Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate)
  2021-10-06 21:32     ` Randy Dunlap
  2021-10-06 22:06       ` Steven Rostedt
@ 2021-10-07  1:10       ` Steven Rostedt
  2021-10-07  3:13         ` Randy Dunlap
  1 sibling, 1 reply; 20+ messages in thread
From: Steven Rostedt @ 2021-10-07  1:10 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, linux-mm, Andrew Morton, Jackie Liu

On Wed, 6 Oct 2021 14:32:21 -0700
Randy Dunlap <rdunlap@infradead.org> wrote:

> On 10/6/21 2:22 PM, Steven Rostedt wrote:
> > On Tue, 5 Oct 2021 13:46:52 -0700
> > Randy Dunlap <rdunlap@infradead.org> wrote:
> >   
> >> a. randconfig: KCONFIG_SEED=0xBFBEA13C
> >> ../kernel/trace/trace.c:1712:13: error: 'trace_create_maxlat_file' defined but not used [-Werror=unused-function]
> >>    static void trace_create_maxlat_file(struct trace_array *tr,  
> > 
> > Does this fix it?
> > 
> > -- Steve  
> 
> Yes, thanks.
> 
> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested

Plumbers followed by Open Source Summit totally blew my brain cache. I
have a fix for this in my queue from Jackie Liu that I haven't
processed yet (just going through my queue now when I noticed it).

Can you test this patch instead?

   https://lore.kernel.org/r/20210922025122.3268022-1-liu.yun@linux.dev

Thanks!

-- Steve


> 
> 
> > 
> > diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> > index 7896d30d90f7..4520cbab0da5 100644
> > --- a/kernel/trace/trace.c
> > +++ b/kernel/trace/trace.c
> > @@ -1744,16 +1744,15 @@ void latency_fsnotify(struct trace_array *tr)
> >   	irq_work_queue(&tr->fsnotify_irqwork);
> >   }
> >   
> > -/*
> > - * (defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)) && \
> > - *  defined(CONFIG_FSNOTIFY)
> > - */
> > -#else
> > +/* CONFIG_FSNOTIFY else */
> > +#elif CREATE_MAX_TRACE_FILE
> >   
> >   #define trace_create_maxlat_file(tr, d_tracer)				\
> >   	trace_create_file("tracing_max_latency", 0644, d_tracer,	\
> >   			  &tr->max_latency, &tracing_max_lat_fops)
> >   
> > +#else
> > +#define trace_create_maxlat_file(tr, d_tracer) do { } while (0)
> >   #endif
> >   
> >   #ifdef CONFIG_TRACER_MAX_TRACE
> > @@ -9473,9 +9472,7 @@ init_tracer_tracefs(struct trace_array *tr, struct dentry *d_tracer)
> >   
> >   	create_trace_options_dir(tr);
> >   
> > -#if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)
> >   	trace_create_maxlat_file(tr, d_tracer);
> > -#endif
> >   
> >   	if (ftrace_create_function_files(tr, d_tracer))
> >   		MEM_FAIL(1, "Could not allocate function filter files");
> > diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
> > index b7c0f8e160fb..680935949aef 100644
> > --- a/kernel/trace/trace.h
> > +++ b/kernel/trace/trace.h
> > @@ -679,8 +679,11 @@ void update_max_tr_single(struct trace_array *tr,
> >   #endif /* CONFIG_TRACER_MAX_TRACE */
> >   
> >   #if (defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER) \
> > -	|| defined(CONFIG_OSNOISE_TRACER)) && defined(CONFIG_FSNOTIFY)
> > -#define LATENCY_FS_NOTIFY
> > +	|| defined(CONFIG_OSNOISE_TRACER))
> > +# define CREATE_MAX_TRACE_FILE
> > +# ifdef CONFIG_FSNOTIFY
> > +#  define LATENCY_FS_NOTIFY
> > +# endif
> >   #endif
> >   
> >   #ifdef LATENCY_FS_NOTIFY
> >   
> 
> 


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

* Re: linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate)
  2021-10-07  1:10       ` Steven Rostedt
@ 2021-10-07  3:13         ` Randy Dunlap
  0 siblings, 0 replies; 20+ messages in thread
From: Randy Dunlap @ 2021-10-07  3:13 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, linux-mm, Andrew Morton, Jackie Liu

On 10/6/21 6:10 PM, Steven Rostedt wrote:
> On Wed, 6 Oct 2021 14:32:21 -0700
> Randy Dunlap <rdunlap@infradead.org> wrote:
> 
>> On 10/6/21 2:22 PM, Steven Rostedt wrote:
>>> On Tue, 5 Oct 2021 13:46:52 -0700
>>> Randy Dunlap <rdunlap@infradead.org> wrote:
>>>    
>>>> a. randconfig: KCONFIG_SEED=0xBFBEA13C
>>>> ../kernel/trace/trace.c:1712:13: error: 'trace_create_maxlat_file' defined but not used [-Werror=unused-function]
>>>>     static void trace_create_maxlat_file(struct trace_array *tr,
>>>
>>> Does this fix it?
>>>
>>> -- Steve
>>
>> Yes, thanks.
>>
>> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
> 
> Plumbers followed by Open Source Summit totally blew my brain cache. I
> have a fix for this in my queue from Jackie Liu that I haven't
> processed yet (just going through my queue now when I noticed it).
> 
> Can you test this patch instead?
> 
>     https://lore.kernel.org/r/20210922025122.3268022-1-liu.yun@linux.dev


Sure, done. Same good result.

thanks.
-- 
~Randy

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

* Re: linux-next: Tree for Oct 5
  2018-10-05  6:39 linux-next: Tree for Oct 5 Stephen Rothwell
@ 2018-10-05 13:48 ` Guenter Roeck
  0 siblings, 0 replies; 20+ messages in thread
From: Guenter Roeck @ 2018-10-05 13:48 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List

On Fri, Oct 05, 2018 at 04:39:43PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20181004:
> 
> I added a supplied patch to the dma-mapping tree to fix overnight boot
> problems.
> 
> I added a supplied patch to the nfs tree to fix an overnight build
> problem.
> 
> The nfsd tree gained a build failure due to an interaction with the nfs
> tree for which I applied a merge fix patch. And another build failure
> so I used the version from next-20181004.
> 
> The bpf-next tree lost its build failure.
> 
> The drm-msm tree gained a build failure, so I used the version from
> next-20181004.
> 
> The tty tree lost its build failure.
> 
> The slave-dma tree lost its build failure.
> 
> The akpm-current tree gained a conflict against the btrfs-kdave tree.
> 
> The akpm tree gained a build failure due to an interaction with the
> powerpc tree for which I added a merge fix patch.
> 
> Non-merge commits (relative to Linus' tree): 8415
>  8136 files changed, 377585 insertions(+), 173429 deletions(-)
> 

Build results:
	total: 135 pass: 129 fail: 6
Failed builds: 
	mips:allmodconfig 
	powerpc:ppc6xx_defconfig
	s390:defconfig 
	s390:allmodconfig 
	s390:allnoconfig 
	sparc32:allmodconfig 
Qemu test results:
	total: 318 pass: 315 fail: 3
Failed tests: 
	s390:defconfig:initrd 
	s390:defconfig:virtio-blk-ccw:rootfs 
	s390:defconfig:scsi[virtio-ccw]:rootfs

---
mips:allmodconfig, powerpc:ppc6xx_defconfig;

net/sunrpc/auth_gss/gss_krb5_seal.c: In function 'gss_seq_send64_fetch_and_inc':
net/sunrpc/auth_gss/gss_krb5_seal.c:144:3: error:
	implicit declaration of function 'cmpxchg64'

---
s390:

s390-linux-ld:./arch/s390/kernel/vmlinux.lds:41: syntax error

qemu tests also affected. Fixed with:

https://lore.kernel.org/patchwork/patch/993576/

---
sparc32:allmodconfig:

Various "relocation truncated to fit" errors. Also seen in mainline.
It is probably time to drop the build.

---

Guenter

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

* linux-next: Tree for Oct 5
@ 2018-10-05  6:39 Stephen Rothwell
  2018-10-05 13:48 ` Guenter Roeck
  0 siblings, 1 reply; 20+ messages in thread
From: Stephen Rothwell @ 2018-10-05  6:39 UTC (permalink / raw)
  To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20181004:

I added a supplied patch to the dma-mapping tree to fix overnight boot
problems.

I added a supplied patch to the nfs tree to fix an overnight build
problem.

The nfsd tree gained a build failure due to an interaction with the nfs
tree for which I applied a merge fix patch. And another build failure
so I used the version from next-20181004.

The bpf-next tree lost its build failure.

The drm-msm tree gained a build failure, so I used the version from
next-20181004.

The tty tree lost its build failure.

The slave-dma tree lost its build failure.

The akpm-current tree gained a conflict against the btrfs-kdave tree.

The akpm tree gained a build failure due to an interaction with the
powerpc tree for which I added a merge fix patch.

Non-merge commits (relative to Linus' tree): 8415
 8136 files changed, 377585 insertions(+), 173429 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 290 trees (counting Linus' and 66 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 (010bd965f971 Merge tag 'ovl-fixes-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs)
Merging fixes/master (72358c0b59b7 linux-next: build warnings from the build of Linus' tree)
Merging kbuild-current/fixes (ef8c4ed9db80 kbuild: allow to use GCC toolchain not in Clang search path)
Merging arc-current/for-curr (40660f1fcee8 ARC: build: Don't set CROSS_COMPILE in arch's Makefile)
Merging arm-current/fixes (3a58ac65e2d7 ARM: 8799/1: mm: fix pci_ioremap_io() offset check)
Merging arm64-fixes/for-next/fixes (2a3f93459d68 arm64: KVM: Sanitize PSTATE.M when being set from userspace)
Merging m68k-current/for-linus (0986b16ab49b m68k/mac: Use correct PMU response format)
Merging powerpc-fixes/fixes (b45ba4a51cde powerpc/lib: fix book3s/32 boot failure due to code patching)
Merging sparc/master (df2def49c57b Merge tag 'acpi-4.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (471b83bd8bbe team: Forbid enslaving team device to itself)
Merging bpf/master (b0584ea66d73 bpf: don't accept cgroup local storage with zero value size)
Merging ipsec/master (4da402597c2b xfrm: fix gro_cells leak when remove virtual xfrm interfaces)
Merging netfilter/master (1ad98e9d1bdf tcp/dccp: fix lockdep issue when SYN is backlogged)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set)
Merging wireless-drivers/master (3baafeffa48a iwlwifi: 1000: set the TFD queue size)
Merging mac80211/master (1db585294547 cfg80211: fix use-after-free in reg_process_hint())
Merging rdma-fixes/for-rc (5c5702e259dc RDMA/core: Set right entry state before releasing reference)
Merging sound-current/for-linus (709ae62e8e6d ALSA: hda/realtek - Cannot adjust speaker's volume on Dell XPS 27 7760)
Merging sound-asoc-fixes/for-linus (bdd20526b50c Merge branch 'asoc-4.19' into asoc-linus)
Merging regmap-fixes/for-linus (7876320f8880 Linux 4.19-rc4)
Merging regulator-fixes/for-linus (17b57b1883c1 Linux 4.19-rc6)
Merging spi-fixes/for-linus (17b57b1883c1 Linux 4.19-rc6)
Merging pci-current/for-linus (95375f2ab296 PCI: mvebu: Fix PCI I/O mapping creation sequence)
Merging driver-core.current/driver-core-linus (7876320f8880 Linux 4.19-rc4)
Merging tty.current/tty-linus (5b162cc4ac27 Revert "serial: sh-sci: Allow for compressed SCIF address")
Merging usb.current/usb-linus (555df5820e73 usb: xhci-mtk: resume USB3 roothub first)
Merging usb-gadget-fixes/fixes (d9707490077b usb: dwc2: Fix call location of dwc2_check_core_endianness)
Merging usb-serial-fixes/usb-linus (f5fad711c06e USB: serial: simple: add Motorola Tetra MTP6550 id)
Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code)
Merging phy/fixes (5b394b2ddf03 Linux 4.19-rc1)
Merging staging.current/staging-linus (7876320f8880 Linux 4.19-rc4)
Merging char-misc.current/char-misc-linus (eafa717bc145 thunderbolt: Initialize after IOMMUs)
Merging soundwire-fixes/fixes (8d6ccf5cebbc soundwire: Fix acquiring bus lock twice during master release)
Merging input-current/for-linus (4fef1250eafd Input: uinput - allow for max == min during input_absinfo validation)
Merging crypto-current/master (ba439a6cbfa2 crypto: qat - Fix KASAN stack-out-of-bounds bug in adf_probe())
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 (111b009f7e8b dmaengine: mic_x100_dma: use devm_kzalloc to fix an issue)
Merging backlight-fixes/for-backlight-fixes (ce397d215ccd Linux 4.18-rc1)
Merging mtd-fixes/master (6bf4ca7fbc85 Linux 4.19-rc5)
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 (ad608fbcf166 media: v4l: event: Prevent freeing event subscriptions while accessed)
Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0)
Merging mips-fixes/mips-fixes (e7e86f42fa68 MAINTAINERS: MIPS/LOONGSON2 ARCHITECTURE - Use the normal wildcard style)
Merging at91-fixes/at91-fixes (379e36d3f591 ARM: dts: at91: sama5d2_ptc_ek: fix nand pinctrl)
Merging omap-fixes/fixes (c265c0ca76fb ARM: dts: logicpd-som-lv: Fix OMAP35/DM37 Compatibility issues)
Merging kvm-fixes/master (7e7126846c95 kvm: nVMX: fix entry with pending interrupt if APICv is enabled)
Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs)
Merging hwmon-fixes/hwmon (234b69e3e089 ocfs2: fix ocfs2 read block panic)
Merging nvdimm-fixes/libnvdimm-fixes (f52afc93cd01 dax: Fix deadlock in dax_lock_mapping_entry())
Merging btrfs-fixes/next-fixes (675c168b2b92 Merge branch 'misc-4.19' into next-fixes)
Merging vfs-fixes/fixes (ffc4c92227db sysfs: Do not return POSIX ACL xattrs via listxattr)
Merging dma-mapping-fixes/for-linus (46bbeb69ff2f dma-mapping: add the missing ARCH_HAS_SYNC_DMA_FOR_CPU_ALL declaration)
Merging drivers-x86-fixes/fixes (6bf4ca7fbc85 Linux 4.19-rc5)
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 (e54192b48da7 of: fix phandle cache creation for DTs with no phandles)
Merging scsi-fixes/fixes (3cc5746e5ad7 scsi: qedi: Initialize the stats mutex lock)
Merging drm-fixes/drm-fixes (d8938c981f58 Merge branch 'drm-tda9950-fixes' of git://git.armlinux.org.uk/~rmk/linux-arm into drm-fixes)
Merging drm-intel-fixes/for-linux-next-fixes (4c9613ce556f drm/i915: Handle incomplete Z_FINISH for compressed error states)
Merging mmc-fixes/fixes (1b09d9c232cd mmc: slot-gpio: Fix debounce time to use miliseconds again)
Merging rtc-fixes/rtc-fixes (5b394b2ddf03 Linux 4.19-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (db05c4819775 drm: fb-helper: Reject all pixel format changing requests)
Merging kbuild/for-next (55b27e93208a Merge branch 'kbuild' into for-next)
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 (6db37ad7c27b dma-mapping: move dma_default_get_required_mask under ifdef)
CONFLICT (content): Merge conflict in kernel/dma/Kconfig
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 (851d690c71bd 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 (4f021311473b arm-soc: 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 (90133eb56b76 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 (128f53d05feb Merge branches 'at91-drivers', 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
Merging bcm2835/for-next (ca5b45b7c5cd Merge branch 'bcm2835-defconfig-next' into for-next)
Merging imx-mxs/for-next (8bcab2453884 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 (b161216b621f Merge branch 'omap-for-v4.20/ti-sysc-take2' into for-next)
Merging reset/reset/next (34845c939082 reset: Grammar s/more then once/more than once/)
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 (2586035c01f6 Merge branches 'arm-defconfig-for-v4.20', 'arm-dt-for-v4.20', 'arm-soc-for-v4.20', 'arm64-dt-for-v4.20' and 'drivers-for-v4.20' into next)
Merging rockchip/for-next (276647f89f9c Merge branch 'v4.20-armsoc/defconfig64' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (b9acde832ba8 Merge branch 'next/soc' into for-next)
Merging sunxi/sunxi/for-next (25c5fc5a4923 Merge branch 'sunxi/h3-h5-for-4.20' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-h3.dtsi
Merging tegra/for-next (22fed951fe3b Merge branch for-4.20/arm64/dt into for-next)
Merging arm64/for-next/core (c219bc4e9205 arm64: Trap WFI executed in userspace)
Merging clk/clk-next (488cd4a6db84 Merge branch 'clk-k3-tisci' into clk-next)
Merging clk-samsung/for-next (0cd70a1f69af clk: samsung: Use clk_hw API for calling clk framework from clk notifiers)
Merging c6x/for-linux-next (929ba9300082 c6x: switch to NO_BOOTMEM)
Merging csky/linux-next (c4b17dd4a3cc csky: remove NSIGXXX in abiv2/fpu.c)
Merging h8300/h8300-next (4bdf61ccbe76 h8300: fix IRQ no)
Merging ia64/next (02b4da5f84d1 intel-iommu: mark intel_dma_ops static)
Merging m68k/for-next (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode)
Merging m68knommu/for-next (da56cb950fb6 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 (2f0b649b3b4a MIPS: stop using _PTRS_PER_PGD)
Merging nds32/next (3350139c0ff3 nds32: linker script: GCOV kernel may refers data in __exit)
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 (2c18d35d677d parisc: Remove PTE load and fault check from L2_ptep macro)
Merging powerpc/next (d90fe2acd9b2 powerpc: Wire up memtest)
Merging hvc/topic/hvc (9f65b81f36e3 tty: hvc: introduce the hv_ops.flush operation for hvc drivers)
Merging fsl/next (bd96461249bd powerpc/dts/fsl: t2080rdb: use the Cortina PHY driver compatible)
Merging risc-v/for-next (17b57b1883c1 Linux 4.19-rc6)
Merging s390/features (ccc413f62143 s390/qdio: clean up AOB handling)
Merging sparc-next/master (1aaccb5fa0ea Merge tag 'rtc-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
Merging uml/linux-next (d9cbd0e8f667 um: NULL check before kfree is not needed)
Merging xtensa/xtensa-for-next (c9efd0d7beb3 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 (33dc82dfd6e1 Merge branch 'for-next-next-v4.20-20181003' into for-next-20181003)
Merging ceph/master (e92c0eaf7543 rbd: support cloning across namespaces)
Merging cifs/for-next (7af929d6d05b smb3: fix lease break problem introduced by compounding)
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 (990f62ec34e7 Pull fanotify support for reporting PID instead of TGID and other fsnotify cleanups.)
Merging ext4/dev (de6c3910e334 ext4: propagate error from dquot_initialize() in EXT4_IOC_FSSETXATTR)
Merging f2fs/dev (eaea083fa7c0 f2fs: submit cached bio to avoid endless PageWriteback)
Merging fuse/for-next (e52a8250480a fuse: realloc page array)
Merging jfs/jfs-next (1390643d1d5c jfs: remove redundant dquot_initialize() in jfs_evict_inode())
Merging nfs/linux-next (c7944ebb9ce9 NFSv4: Fix lookup revalidate of regular files)
Applying: SUNRPC: use cmpxchg64() in gss_seq_send64_fetch_and_inc()
Merging nfs-anna/linux-next (9f0c5124f4a8 NFS: Don't open code clearing of delegation state)
Merging nfsd/nfsd-next (619dd18b6f70 svcrdma: Increase the default connection credit limit)
Applying: svcrdma: fix up for recv_lock rename
$ git reset --hard HEAD^
Merging next-20181004 version of nfsd
Merging orangefs/for-next (a3bb1b184669 Orangefs: some error code paths missed kmem_cache_free to bad effect.)
Merging overlayfs/overlayfs-next (1a8f8d2a443e ovl: fix format of setxattr debug)
Merging ubifs/linux-next (f061c1cc404a Revert "ubifs: xattr: Don't operate on deleted inodes")
Merging v9fs/9p-next (76b600d46911 9p: potential NULL dereference)
Merging xfs/for-next (e55ec4ddbef9 xfs: fix error handling in xfs_bmap_extents_to_btree)
Merging file-locks/locks-next (10f3e23f07cb Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging vfs/for-next (f022b08a0a9b Merge branches 'work.mount', 'work.alpha' and 'work.compat' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/super.c
Applying: f2fs: update for MS_* flags mostly going away
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (a6ae928c2583 Revert "printk: make sure to print log on console.")
Merging pci/next (1837afcfc0d5 Merge branch 'remotes/lorenzo/pci/mediatek')
Merging pstore/for-next/pstore (bac6f6cda206 pstore/ram: Fix failure-path memory leak in ramoops_init)
Merging hid/for-next (4c2b9385b4d4 Merge branch 'for-4.20/logitech-highres' into for-next)
Merging i2c/i2c/for-next (210932079eb9 Merge branch 'i2c/for-4.20' into i2c/for-next)
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (a3fa12e10ce1 hwmon: (ina3221) mark PM functions as __maybe_unused)
Merging jc_docs/docs-next (ff348763775e doc: Fix acronym "FEKEK" in ecryptfs)
Merging v4l-dvb/master (e7898055ad40 media: i2c: adv748x: fix typo in comment for TXB CSI-2 transmitter power down)
Merging v4l-dvb-next/master (357b50f3ccc8 drm: amd: dc: don't use FP math when Kcov is enabled)
Merging fbdev/fbdev-for-next (7c968791f775 video/fbdev/stifb: Fix spelling mistake in fall-through annotation)
Merging pm/linux-next (074279a39f52 Merge branch 'pm-core' into linux-next)
Merging cpupower/cpupower (8a7e2d2ea080 cpupower: remove stringop-truncation waring)
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (5ed4cecd75e9 OPP: Pass OPP table to _of_add_opp_table_v{1|2}())
Merging thermal/next (d7a4303b8d1f dt-bindings: thermal: Allow multiple devices to share cooling map)
Merging thermal-soc/next (152395fd03d4 thermal: of-thermal: disable passive polling when thermal zone is disabled)
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 (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent)
Merging rdma/for-next (41ab1cb7d1cd RDMA/cma: Introduce and use cma_ib_acquire_dev())
CONFLICT (content): Merge conflict in drivers/infiniband/core/cache.c
Merging net-next/master (a97d97bac49d geneve: allow to clear ttl inherit)
CONFLICT (modify/delete): Documentation/networking/00-INDEX deleted in HEAD and modified in net-next/master. Version net-next/master of Documentation/networking/00-INDEX left in tree.
$ git rm -f Documentation/networking/00-INDEX
Merging bpf-next/master (7ccc4f188751 bpf: typo fix in Documentation/networking/af_xdp.rst)
Merging ipsec-next/master (6140cc20caf7 Merge branch 'Support-of-Flow-Director-in-HNS3-Ethernet-Driver-for-HiP08-Rev2-SoC')
Merging mlx5-next/mlx5-next (bd37197554eb net/mlx5: Update mlx5_ifc with DEVX UID bits)
Merging netfilter-next/master (e9837e55b020 netfilter: xt_quota: fix the behavior of xt_quota module)
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 (9434dca95117 Merge tag 'mt76-for-kvalo-2018-10-01' of https://github.com/nbd168/wireless)
Merging bluetooth/master (3c89f1404396 Bluetooth: btsdio: Do not bind to non-removable BCM43430)
Merging mac80211-next/master (5207ca554bfc cfg80211: sort tracing properly)
Merging gfs2/for-next (4f36cb36c9d1 gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated)
Merging mtd/mtd/next (e42e175ae319 mtd: physmap_of: Remove unused struct of_device_id)
Merging nand/nand/next (40667c037a3d mtd: rawnand: Allow selection of ECC byte ordering at runtime)
Merging spi-nor/spi-nor/next (496c415717b8 mtd: spi-nor: fsl-quadspi: Don't let -EINVAL on the bus)
Merging crypto/master (79517e8f8e6d crypto: cavium - remove redundant null pointer check before kfree)
Merging drm/drm-next (c530174b90fa Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld 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 (98a9bce38b3d drm/i915: Avoid compiler warning for maybe unused gu_misc_iir)
Merging drm-tegra/drm/tegra/for-next (5ac93f81096a drm/tegra: Detach devices from IOMMU DMA domain on arm32)
Merging drm-misc/for-linux-next (4be9bd10e22d drm/fb_helper: Allow leaking fbdev smem_start)
Merging drm-msm/msm-next (3fd314e1b0f6 drm/msm: a5xx: Fix improper u64 division)
$ git reset --hard HEAD^
Merging next-20181004 version of drm-msm
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (3dae1c0919d8 drm/arm/malidp: Implemented the size validation for AFBC framebuffers)
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 (5c41bb607125 gpu: ipu-v3: add support for XRGB32 and XBGR32 V4L2 pixel formats)
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 (fadf3e019411 Merge remote-tracking branch 'regmap/topic/single-rw' into regmap-next)
Merging sound/for-next (d153135e93a5 ALSA: hda/sigmatel - Disable automute for Elo VuPoint)
Merging sound-asoc/for-next (efd8f85bea30 Merge branch 'asoc-4.20' into asoc-next)
Merging modules/modules-next (9be936f4b3a2 kernel/module: Use kmemdup to replace kmalloc+memcpy)
Merging input/next (5d68fa587a62 Input: xilinx_ps2 - convert to using %pOFn instead of device_node.name)
Merging block/for-next (19538d59ac0b Merge branch 'for-4.20/libata' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (5d07384a666d dm cache: fix resize crash if user doesn't reload cache table)
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (a1d467600ca6 Merge branch 'fixes' into next)
Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
Merging md/for-next (059421e041eb md: allow metadata updates while suspending an array - fix)
Merging mfd/for-mfd-next (92d6ba4ff700 mfd: ti-lmu: constify mfd_cell tables)
Merging backlight/for-backlight-next (633786736ed5 backlight: pwm_bl: Fix uninitialized variable)
Merging battery/for-next (a4ac1f5ced58 power: reset: qcom-pon: Add pms405 pon support)
Merging regulator/for-next (a6645cf454d9 Merge remote-tracking branches 'regulator/topic/bd718xx' and 'regulator/topic/pfuze100' into regulator-next)
Merging security/next-testing (ad33b870a66b Merge branch 'next-general' into next-testing)
Merging apparmor/apparmor-next (250f2da49cb8 apparmor: Fix uninitialized value in aa_split_fqname)
Merging integrity/next-integrity (3dd0f18c70d9 EVM: fix return value check in evm_write_xattrs())
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
Merging selinux/next (4458bba09788 selinux: Add __GFP_NOWARN to allocation at str_read())
Merging tpmdd/next (8abac8d7b90d tpm: Restore functionality to xen vtpm driver.)
Merging watchdog/master (d72e8256c209 dt-bindings: watchdog: renesas-wdt: Add support for R7S9210)
Merging iommu/next (6eb628e57e51 Merge branches 'arm/renesas', 'arm/smmu', 'ppc/pamu', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
Merging vfio/next (cf3f98c7f466 drivers/vfio: Allow type-1 IOMMU instantiation with all ARM/ARM64 IOMMUs)
CONFLICT (content): Merge conflict in drivers/vfio/Kconfig
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
Merging audit/next (57361846b52b Linux 4.19-rc2)
Merging devicetree/for-next (4355151de47c Merge branch 'all-dtbs' into dt/next)
CONFLICT (content): Merge conflict in drivers/soc/qcom/apr.c
CONFLICT (content): Merge conflict in arch/c6x/kernel/setup.c
Merging mailbox/mailbox-for-next (9f0a0a381c5d mailbox: mediatek: Add check for possible failure of kzalloc)
Merging spi/for-next (4925720b58ef Merge remote-tracking branch 'spi/topic/of' into spi-next)
Merging tip/auto-latest (3b78dbfb8fbe Merge branch 'x86/urgent')
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 (432de7fd7630 EDAC, {i7core,sb,skx}_edac: Fix uncorrected error counting)
Merging irqchip/irq/irqchip-next (2130b789b3ef irqchip/gic: Unify GIC priority definitions)
Merging ftrace/for-next (5a5e3d3ceae2 perf probe: Support SDT markers having reference counter (semaphore))
Merging rcu/rcu/next (0b1aba265b93 Merge LKMM and RCU branches)
Merging kvm/linux-next (dd5bd0a65ff6 Merge tag 'kvm-s390-next-4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (fd2ef358282c KVM: arm/arm64: Ensure only THP is candidate for adjustment)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_mmu.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_arm.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/kvm_mmu.h
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (46dec40fb741 KVM: PPC: Book3S HV: Don't truncate HPTE index in xlate function)
Merging kvms390/next (55d09dd4c860 Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext)
Merging xen-tip/linux-next (811e0345cfc1 xen/balloon: Grammar s/Is it/It is/)
Merging percpu/for-next (b5bb42587118 arm64: percpu: Initialize ret in the default case)
Merging workqueues/for-next (87915adc3f0a workqueue: re-add lockdep dependencies for flushing)
Merging drivers-x86/for-next (5aa389aa29ce MAINTAINERS: intel_pmc_core: Update MAINTAINERS)
Merging chrome-platform/for-next (40291fb75123 Merge tag 'ib-platform-chrome-mfd-move-cros-ec-transport-for-4.19' into working-branch-for-4.19)
Merging hsi/for-next (5b394b2ddf03 Linux 4.19-rc1)
Merging leds/for-next (2d00f35c55e7 leds: add Panasonic AN30259A support)
Merging ipmi/for-next (10042504ed92 ipmi:ssif: Add support for multi-part transmit messages > 2 parts)
Merging driver-core/driver-core-next (a75e78f21f9a kernfs: Fix range checks in kernfs_get_target_path)
Merging usb/usb-next (3c168909002e usb: gadget: fix spelling mistakeis "[En]queing" -> "[En]queuing")
Merging usb-gadget/next (5b394b2ddf03 Linux 4.19-rc1)
Merging usb-serial/usb-next (ba93cc7da896 USB: serial: ftdi_sio: implement GPIO support for FT-X devices)
Merging usb-chipidea-next/ci-for-usb-next (35a334659bcc usb: chipidea: imx: make MODULE_LICENCE and SPDX-identifier match)
Merging phy-next/next (566b388440bb phy: renesas: convert to SPDX identifiers)
Merging tty/tty-next (8ebfe885c65e TTY: sn_console: Replace spin_is_locked() with spin_trylock())
Merging char-misc/char-misc-next (8f523d6db7ed VMCI: remove set but not used variable 'cid')
Merging extcon/extcon-next (2e464ff0a9b1 extcon: int3496: Convert to use SPDX identifier)
Merging soundwire/next (502c00d9c315 Documentation: soundwire: fix stream.rst markup warnings)
Merging staging/staging-next (e24c1f8658c9 staging: rtl8712: add SPDX identifiers)
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (modify/delete): Documentation/filesystems/00-INDEX deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of Documentation/filesystems/00-INDEX left in tree.
$ git rm -f Documentation/filesystems/00-INDEX
Merging mux/for-next (2c01260df661 mux: add mux_control_get_optional() API)
Merging icc/icc-next (8f023d0cb757 interconnect: core: Fix unused variable compiler warning)
Merging slave-dma/next (ca744435ec93 Merge branch 'topic/stm' into next)
Merging cgroup/for-next (b4eb6bdca334 Merge branch 'for-4.19-fixes' into for-next)
Merging scsi/for-next (257f0d4d404c Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (ef801f07e7b3 scsi: qla2xxx: Return switch command on a timeout)
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 (1e05b62ae4bd sh: use the the PCI channels's io_map_base)
Merging rpmsg/for-next (7971e3e2e85c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (3881364c362f Merge branch 'devel' into for-next)
Merging pinctrl/for-next (de0c18a87cfa pinctrl: msm: Actually use function 0 for gpio selection)
Merging pinctrl-samsung/for-next (5b394b2ddf03 Linux 4.19-rc1)
Merging pwm/for-next (8cdc43afbb2c pwm: mediatek: Add MT7628 support)
Merging userns/for-next (4ce5f9c9e754 signal: Use a smaller struct siginfo in the kernel)
CONFLICT (content): Merge conflict in kernel/signal.c
CONFLICT (content): Merge conflict in arch/x86/kernel/traps.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/traps.c
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 (b76c2bbcb049 selftests: watchdog: Fix ioctl SET* error paths to take oneshot exit path)
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 (29c222d1a9f5 Merge 4.19-rc6)
Merging rtc/rtc-next (bc51098cdd95 rtc: cmos: Remove the `use_acpi_alarm' module parameter for !ACPI)
Merging nvdimm/libnvdimm-for-next (be5ba2ca053d dax: Fix use of zero page)
Merging at24/at24/for-next (9a9e295e7c5c eeprom: at24: fix unexpected timeout under high load)
Merging ntb/ntb-next (b1ce023ae8a2 ntb_netdev: fix sleep time mismatch)
Merging kspp/for-next/kspp (329d8c84391b Merge branch 'for-next/vla' into for-next/kspp)
CONFLICT (content): Merge conflict in drivers/misc/lkdtm/core.c
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 (f176eda90aeb radix tree: Remove multiorder support)
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in fs/dax.c
Applying: dma-direct: Fix return value of dma_direct_supported
Merging akpm-current/current (bf11f926d760 lib/lz4: update LZ4 decompressor module)
CONFLICT (content): Merge conflict in mm/workingset.c
CONFLICT (content): Merge conflict in mm/swap_state.c
CONFLICT (content): Merge conflict in kernel/memremap.c
CONFLICT (content): Merge conflict in include/linux/swap.h
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in block/blk-iolatency.c
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: percpu: remove PER_CPU_DEF_ATTRIBUTES macro
Applying: mm: remove CONFIG_NO_BOOTMEM
Applying: mm: remove now defunct NO_BOOTMEM from depends list for deferred init
Applying: mm: remove CONFIG_HAVE_MEMBLOCK
Applying: of/fdt: fixup #ifdefs after removal of HAVE_MEMBLOCK config option
Applying: csky: fixups after bootmem removal
Applying: memblock: remove stale #else and the code it protects
Applying: mm: remove bootmem allocator implementation.
Applying: mm: nobootmem: remove dead code
Applying: memblock: rename memblock_alloc{_nid,_try_nid} to memblock_phys_alloc*
Applying: memblock: remove _virt from APIs returning virtual address
Applying: memblock: replace alloc_bootmem_align with memblock_alloc
Applying: memblock: replace alloc_bootmem_low with memblock_alloc_low
Applying: memblock: replace __alloc_bootmem_node_nopanic with memblock_alloc_try_nid_nopanic
Applying: memblock: replace alloc_bootmem_pages_nopanic with memblock_alloc_nopanic
Applying: memblock: replace alloc_bootmem_low with memblock_alloc_low (2)
Applying: memblock: replace __alloc_bootmem_nopanic with memblock_alloc_from_nopanic
Applying: memblock: add align parameter to memblock_alloc_node()
Applying: memblock: replace alloc_bootmem_pages_node with memblock_alloc_node
Applying: memblock: replace __alloc_bootmem_node with appropriate memblock_ API
Applying: memblock: replace alloc_bootmem_node with memblock_alloc_node
Applying: memblock: replace alloc_bootmem_low_pages with memblock_alloc_low
Applying: memblock: replace alloc_bootmem_pages with memblock_alloc
Applying: memblock: replace __alloc_bootmem with memblock_alloc_from
Applying: memblock: replace alloc_bootmem with memblock_alloc
Applying: mm: nobootmem: remove bootmem allocation APIs
Applying: memblock: replace free_bootmem{_node} with memblock_free
Applying: memblock: replace free_bootmem_late with memblock_free_late
Applying: memblock: rename free_all_bootmem to memblock_free_all
Applying: memblock: rename __free_pages_bootmem to memblock_free_pages
Applying: mm: remove nobootmem
Applying: memblock: replace BOOTMEM_ALLOC_* with MEMBLOCK variants
Applying: mm: remove include/linux/bootmem.h
Applying: dma-direct: fix up for the removal of linux/bootmem.h
Applying: docs/boot-time-mm: remove bootmem documentation
Applying: drivers/android/binder_alloc.c: replace vm_insert_page with vmf_insert_page
Applying: mm/memory_hotplug: make remove_memory() take the device_hotplug_lock
Applying: mm/memory_hotplug: make add_memory() take the device_hotplug_lock
Applying: mm/memory_hotplug: fix online/offline_pages called w.o. mem_hotplug_lock
Applying: powerpc/powernv: hold device_hotplug_lock when calling device_online()
Applying: powerpc/powernv: hold device_hotplug_lock when calling memtrace_offline_pages()
Applying: powerpc-powernv-hold-device_hotplug_lock-when-calling-memtrace_offline_pages-v3
Applying: memory-hotplug.txt: add some details about locking internals
Applying: mm: Fix warning in insert_pfn()
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 (81cbc47b8c6a drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
Applying: powerpc: fix up for removal of linux/bootmem.h

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

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

* linux-next: Tree for Oct 5
@ 2016-10-05  5:14 Stephen Rothwell
  0 siblings, 0 replies; 20+ messages in thread
From: Stephen Rothwell @ 2016-10-05  5:14 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

There will be no linux-next release on Friday.

Please do *not* add any v4.10 material to your linux-next included trees
until v4.9-rc1 has been released i.e. the merge window closes.

Changes since 20161004:

Non-merge commits (relative to Linus' tree): 11868
 8531 files changed, 482011 insertions(+), 278917 deletions(-)

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

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

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

Below is a summary of the state of the merge.

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

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

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

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

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (ce866e2d182b Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma)
Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured)
Merging arc-current/for-curr (3eab887a5542 Linux 4.8-rc4)
Merging arm-current/fixes (117e5e9c4cfc ARM: 8618/1: decompressor: reset ttbcr fields to use TTBR0 on ARMv7)
Merging m68k-current/for-linus (6736e65effc3 m68k: Migrate exception table users off module.h and onto extable.h)
Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init())
Merging powerpc-fixes/fixes (b79331a5eb9f powerpc/powernv/pci: Fix m64 checks for SR-IOV and window alignment)
Merging sparc/master (c8d2bc9bc39e Linux 4.8)
Merging net/master (c8d2bc9bc39e Linux 4.8)
Merging ipsec/master (b1f2beb87bb0 Merge tag 'media/v4.8-7' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging netfilter/master (c8d2bc9bc39e Linux 4.8)
Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging wireless-drivers/master (db64c5fa590b Merge tag 'iwlwifi-for-kalle-2016-09-15' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (c8d2bc9bc39e Linux 4.8)
Merging sound-current/for-linus (eeea8b40cd28 Merge tag 'asoc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next)
Merging pci-current/for-linus (035ee288ae7a PCI: Fix bridge_d3 update on device removal)
Merging driver-core.current/driver-core-linus (c6935931c189 Linux 4.8-rc5)
Merging tty.current/tty-linus (c6935931c189 Linux 4.8-rc5)
Merging usb.current/usb-linus (21f54ddae449 Using BUG_ON() as an assert() is _never_ acceptable)
Merging usb-gadget-fixes/fixes (d8a4100ddc75 usb: gadget: udc: atmel: fix endpoint name)
Merging usb-serial-fixes/usb-linus (f190fd92458d USB: serial: simple: add support for another Infineon flashloader)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f3c4fb6d05e usb: chipidea: udc: fix NULL ptr dereference in isr_setup_status_phase)
Merging staging.current/staging-linus (9395452b4aab Linux 4.8-rc6)
Merging char-misc.current/char-misc-linus (c6935931c189 Linux 4.8-rc5)
Merging input-current/for-linus (c758f96a8c34 Merge branch 'next' into for-linus)
Merging crypto-current/master (80da44c29d99 crypto: vmx - Fix memory corruption caused by p8_ghash)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling)
Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1)
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 (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
Merging drm-intel-fixes/for-linux-next-fixes (08895a8b6b06 Linux 4.8-rc8)
Merging kbuild/for-next (b12a295d66bb Merge branch 'kbuild/misc' into kbuild/for-next)
CONFLICT (content): Merge conflict in arch/x86/lib/memcpy_64.S
CONFLICT (modify/delete): arch/x86/kernel/x8664_ksyms_64.c deleted in kbuild/for-next and modified in HEAD. Version HEAD of arch/x86/kernel/x8664_ksyms_64.c left in tree.
CONFLICT (content): Merge conflict in arch/Kconfig
$ git rm -f arch/x86/kernel/x8664_ksyms_64.c
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
Merging arc/for-next (ef25bacbb019 ARC: [plat*] enables MODULE*)
Merging arm/for-next (70fe0fd28524 Merge branch 'fixes' into for-next)
Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2)
Merging arm-soc/for-next (bcaf9dcf55fd ARM: SoC: Document merges)
Merging pinctrl/for-next (6bcf3f63394b pinctrl: qcom: fix masking of pinmux functions)
Merging amlogic/for-next (8148ca0d95ec Merge branch 'v4.8/dt64-2' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (9336be5db24d Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (70da51e698c7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (a9c51ff3121f Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (624018387bcf Merge branch 'omap-for-v4.9/dt-v2' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (4feeec0c6e6d Merge tag 'qcom-arm64-defconfig-for-4.9' into all-for-4.8)
Merging renesas/next (a64ca8158b21 Merge branches 'fixes-for-v4.8', 'arm64-defconfig-for-v4.9', 'arm64-dt-for-v4.9', 'defconfig-for-v4.9', 'dt-for-v4.9' and 'soc-for-v4.9' into next)
Merging rockchip/for-next (e80be333a38f Merge branch 'v4.9-armsoc/dts32' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
Merging samsung-krzk/for-next (ea24fc2674ef Merge branch 'next/dt' into for-next)
Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next)
Merging arm64/for-next/core (db68f3e7594a arm64: tlbflush.h: add __tlbi() macro)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (2dc024e94578 cris: return of class_create should be considered)
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 (6736e65effc3 m68k: Migrate exception table users off module.h and onto extable.h)
Merging m68knommu/for-next (742859adc721 m68k: let clk_disable() return immediately if clk is NULL)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (6a44eb2884ca MIPS: BMIPS: Use interrupt-controller node name)
Merging nios2/for-next (65f836ae4de0 nios2: use of_property_read_bool)
Merging parisc-hd/for-next (92420bd0d01f parisc: Fix self-detected CPU stall warnings on Mako machines)
Merging powerpc/next (b7b7013cac55 powerpc/bpf: Add support for bpf constant blinding)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_64.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_32.S
Merging fsl/next (e0b80f00bb96 arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (6cd997db911f s390/con3270: fix insufficient space padding)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (1ace5d1e3d4b unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (a4c6be5ad1d0 xtensa: disable MMU initialization option on MMUv2 cores)
CONFLICT (content): Merge conflict in arch/xtensa/kernel/setup.c
Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (819d18cf0d4a Merge branch 'for-next-next-4.9-20160927' into for-next-20160927)
Merging ceph/master (464691bd52b4 libceph: ceph_build_auth() doesn't need ceph_auth_build_hello())
Merging cifs/for-next (08e36afdd53c Expose cifs module parameters in sysfs)
Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.)
Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
Merging ext3/for_next (225c5161b118 ext2: Unmap metadata when zeroing blocks)
Merging ext4/dev (752f253563a3 ext4: remove unused variable)
Merging f2fs/dev (e4c5d8489a41 f2fs: introduce update_ckpt_flags to clean up)
CONFLICT (content): Merge conflict in fs/f2fs/dir.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (63401ccdb2ca fuse: limit xattr returned size)
Merging gfs2/for-next (332f51d7db13 gfs2: Initialize atime of I_NEW inodes)
Merging jfs/jfs-next (240c5185c52d jfs: Simplify code)
Merging nfs/linux-next (4d2899d73c47 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
Merging nfsd/nfsd-next (81e6ed5c87c7 nfs: fix false positives in nfs40_walk_client_list())
Merging orangefs/for-next (f60fbdbf41c8 Revert "orangefs: bump minimum userspace version")
Merging overlayfs/overlayfs-next (b6495a35e189 ovl: use vfs_get_link())
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (17ce1eb0b64e ubifs: Fix xattr generic handler usage)
Merging xfs/for-next (155cd433b516 Merge branch 'xfs-4.9-log-recovery-fixes' into for-next)
Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns)
Merging vfs/for-next (6c2a0be5fc20 Merge vfs-jk into for-next)
CONFLICT (content): Merge conflict in fs/fuse/dir.c
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (afdf410d53e0 Merge branch 'pipeops' into next)
CONFLICT (content): Merge conflict in lib/iov_iter.c
CONFLICT (content): Merge conflict in fs/splice.c
Merging pci/next (1da64c77b71f Merge branches 'pci/host-aardvark', 'pci/host-altera', 'pci/host-artpec', 'pci/host-designware', 'pci/host-hv', 'pci/host-keystone', 'pci/host-rcar', 'pci/host-rockchip', 'pci/host-tegra', 'pci/host-vmd' and 'pci/host-xilinx' into next)
Merging pstore/for-next/pstore (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking)
Merging hid/for-next (419c103f0833 Merge branch 'for-4.9/upstream' into for-next)
Merging i2c/i2c/for-next (7cbca2b38734 Merge branch 'i2c/for-4.9' 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 (0deb6b2c087a dmi-id: don't free dev structure after calling device_register)
Merging hwmon-staging/hwmon-next (7ce4190c4ca4 hwmon: (nct6775) Add support for multiple virtual temperature sources)
Merging jc_docs/docs-next (02e69d5b97f0 Merge branch 'doc/4.9' into docs-next)
Merging v4l-dvb/master (02a628e5c024 Merge branch 'v4l_for_linus' into to_next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pm/linux-next (c55f070e3d33 Merge branch 'acpi' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (43720df96023 thermal: int3403: Process trip change notification)
Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5)
Merging ieee1394/for-next (c8d2bc9bc39e Linux 4.8)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging net-next/master (9a8dd213d2a3 Merge branch 'ncsi-next')
Applying: netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
Merging ipsec-next/master (2258d927a691 xfrm: remove unused helper)
Merging netfilter-next/master (1f827f513829 netfilter: xt_hashlimit: Fix link error in 32bit arch because of 64bit division)
Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL)
Merging wireless-drivers-next/master (15b95a159502 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (1514d858b946 Bluetooth: btusb: add entry for Marvell 8997 chipset)
Merging mac80211-next/master (1e1430d5282b Merge remote-tracking branch 'net-next/master' into mac80211-next)
Merging rdma/for-next (61347fa60878 IB/rdmavt: Trivial function comment corrected.)
Applying: starging/lustre: disable LNET infiniband support
Merging rdma-leon/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging rdma-leon-test/testing/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
Merging l2-mtd/master (f5b88de28493 mtd: nand: fix trivial spelling error)
Merging nand/nand/next (d44154f969a4 mtd: nand: Provide nand_cleanup() function to free NAND related resources)
Merging crypto/master (f97581cfa6e7 crypto: caam - treat SGT address pointer as u64)
Merging drm/drm-next (c2cbc38b9715 drm: virtio: reinstate drm_virtio_set_busid())
CONFLICT (content): Merge conflict in Documentation/gpu/index.rst
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
Merging drm-intel/for-linux-next (615e5000830d drm/i915: silence io mapping/unmapping sparse warnings on different address spaces)
Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption)
Merging drm-misc/topic/drm-misc (0546d685f07c drm/rockchip: analogix_dp: Refuse to enable PSR if panel doesn't support it)
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 (7a3bcc0a8e2a drm/msm: bump kernel api version for explicit fencing)
Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (d035f1204017 Merge branches 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/config64-for-4.9', tags 'sunxi-clk-fixes-for-4.8' and 'sunxi-fixes-for-4.8' into sunxi/for-next)
Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (ca4c3b36769f Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next)
Merging sound/for-next (eeea8b40cd28 Merge tag 'asoc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next)
Merging sound-asoc/for-next (513e43efafe3 Merge remote-tracking branches 'asoc/topic/tpa6130a2', 'asoc/topic/ux500', 'asoc/topic/wm8960', 'asoc/topic/wm8962' and 'asoc/topic/wm8991' into asoc-next)
Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit)
Merging input/next (f9a703a54d16 Input: elantech - force needed quirks on Fujitsu H760)
Merging block/for-next (69a83f9cc81e Merge branch 'for-4.9/block' into for-next)
Merging lightnvm/for-next (1a6fe74dfd1b nvme: Pass pointers, not dma addresses, to nvme_get/set_features())
Merging device-mapper/for-next (8ff232c1a819 dm mpath: always return reservation conflict without failing over)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (0f75c404503c mmc: dw_mmc: remove the deprecated "supports-highspeed" property)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (bb086a89a406 md: set rotational bit)
CONFLICT (content): Merge conflict in include/linux/raid/pq.h
Merging mfd/for-mfd-next (29e7abd14dc9 mfd: arizona: Handle probe deferral for reset GPIO)
Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
Merging battery/for-next (1d72706f0485 power: supply: bq27xxx_battery: allow kernel poll_interval parameter runtime update)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (b2de85634be3 Merge remote-tracking branch 'regulator/topic/tps80031' into regulator-next)
Merging security/next (1306d8e1c09f Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next)
Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (1306d8e1c09f Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next)
Merging tpmdd/next (b6402edc378f tpm: don't destroy chip device prematurely)
Merging watchdog/master (fc113d54e9d7 watchdog: hpwdt: add support for iLO5)
Merging iommu/next (13a08259187c Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/renesas' and 'arm/smmu' into next)
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (61771468e0a5 vfio_pci: use pci_alloc_irq_vectors)
Merging trivial/for-next (380cc42d5a6c nvme: add missing \n to end of dev_warn message)
Merging audit/next (7ff89ac608d9 audit: add exclude filter extension to feature bitmap)
Merging devicetree/for-next (8ddee393a566 dt-bindings: add vendor prefix for Auvidea GmbH)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings)
Merging spi/for-next (66edf4ed8b58 Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/tools', 'spi/topic/txx9' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (2d7c4200d407 Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (a29d64a45eed EDAC, altera: Add IRQ Flags to disable IRQ while handling)
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well)
CONFLICT (content): Merge conflict in kernel/trace/trace_functions_graph.c
CONFLICT (content): Merge conflict in include/linux/ftrace.h
Merging rcu/rcu/next (bf9b45a60458 torture: Prevent jitter from delaying build-only runs)
Merging kvm/linux-next (d9ab710b8531 Merge tag 'kvm_mips_4.9_1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips into next)
CONFLICT (content): Merge conflict in arch/arm/include/asm/arch_gicv3.h
Merging kvm-arm/next (0099b7701f52 KVM: arm/arm64: vgic: Don't flush/sync without a working vgic)
Merging kvm-mips/next (bf18db4e7bd9 KVM: MIPS: Drop dubious EntryHi optimisation)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (fa73c3b25bd8 KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register)
Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next)
Merging xen-tip/linux-next (b057878b2aad xen/pciback: support driver_override)
CONFLICT (content): Merge conflict in include/linux/cpuhotplug.h
Merging percpu/for-next (799bc3c51b2b percpu: eliminate two sparse warnings)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging workqueues/for-next (863b710b664b workqueue: remove keventd_up())
Merging drivers-x86/for-next (b5643539b825 platform/x86: asus-wmi: Filter buggy scan codes on ASUS Q500A)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (6f3bad967072 leds: triggers: Check return value of kobject_uevent_env())
Merging ipmi/for-next (bd85f4b37ddf ipmi: fix crash on reading version from proc after unregisted bmc)
Merging driver-core/driver-core-next (dd01c75f1df3 drivers: dma-coherent: Move spinlock in dma_alloc_from_coherent())
Merging tty/tty-next (08bf21590041 Revert "serial: pl011: add console matching function")
Merging usb/usb-next (21f54ddae449 Using BUG_ON() as an assert() is _never_ acceptable)
Merging usb-gadget/next (e6be244a8321 usb: gadget: uvc: add V4L2 dependency)
Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables)
Merging usb-chipidea-next/ci-for-usb-next (e74e83724808 usb: chipidea: udc: Use the preferred form for passing a size of a struct)
Merging staging/staging-next (fc1e2c8ea85e Staging: fbtft: Fix bug in fbtft-core)
CONFLICT (content): Merge conflict in drivers/staging/octeon/ethernet-mdio.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/file.c
CONFLICT (content): Merge conflict in MAINTAINERS
Merging char-misc/char-misc-next (c9fef1cc3dd3 drivers/misc/hpilo: Changes to support new security states in iLO5 FW)
Merging extcon/extcon-next (38085c987f52 extcon: Add support for qcom SPMI PMIC USB id detection hardware)
Merging slave-dma/next (8df33b00f57d Merge branch 'for-linus' into next)
Merging cgroup/for-next (4221d2ce6e57 Merge branch 'for-4.9' into for-next)
Merging scsi/for-next (ce50b74722ef Merge branch 'misc' into for-next)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (df073d9e6a7d Merge branch 'for-4.9' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (789ffaecf80b virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (2fdd6c32d6a5 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (e08529406623 gpio: add missing static inline)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-pca953x.c
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mxc.c
CONFLICT (content): Merge conflict in arch/arm64/Kconfig.platforms
CONFLICT (modify/delete): arch/arm/mach-omap2/board-rx51-peripherals.c deleted in HEAD and modified in gpio/for-next. Version gpio/for-next of arch/arm/mach-omap2/board-rx51-peripherals.c left in tree.
$ git rm -f arch/arm/mach-omap2/board-rx51-peripherals.c
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/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 (069d5ac9ae0d autofs:  Fix automounts by using current_real_cred()->uid)
CONFLICT (content): Merge conflict in include/linux/sysctl.h
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (b4626a7f4892 CLK: Add Loongson1C clock support)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (94c630ee73a4 Doc: update 00-INDEX files to reflect the runnable code move)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
Merging coresight/next (45808987495f coresight: stm: return error code instead of zero in .packet())
Merging rtc/rtc-next (00f7f90c51df rtc: cmos: avoid unused function warning)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (371a2fbecadd Merge branch 'for-4.9/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (b9188bd27c49 ipc/sem.c: Add cond_resched in exit_sme)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile
CONFLICT (content): Merge conflict in arch/parisc/Kconfig
Applying: powerpc: merge fix for CONFIG_WORD_SIZE -> BITS rename
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s
Applying: kdump, vmcoreinfo: report memory sections virtual addresses
Applying: mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
Applying: scripts/tags.sh: enable code completion in VIM
Applying: kthread: rename probe_kthread_data() to kthread_probe_data()
Applying: kthread: kthread worker API cleanup
Applying: crypto: engine: fix linux-next merge conflict
Applying: kthread/smpboot: do not park in kthread_create_on_cpu()
Applying: kthread: allow to call __kthread_create_on_node() with va_list args
Applying: kthread: add kthread_create_worker*()
Applying: kthread: add kthread_destroy_worker()
Applying: kthread: detect when a kthread work is used by more workers
Applying: kthread: initial support for delayed kthread work
Applying: kthread: allow to cancel kthread work
Applying: kthread: allow to modify delayed kthread work
Applying: kthread: better support freezable kthread workers
Applying: kthread: add kerneldoc for kthread_create()
Applying: hung_task: allow hung_task_panic when hung_task_warnings is 0
Applying: hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix
Applying: treewide: remove redundant #include <linux/kconfig.h>
Applying: fs: use mapping_set_error instead of opencoded set_bit
Applying: fs-use-mapping_set_error-instead-of-opencoded-set_bit-fix
Applying: mm: split gfp_mask and mapping flags into separate fields
Merging akpm/master (ae52336606c6 mm: split gfp_mask and mapping flags into separate fields)

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

* linux-next: Tree for Oct 5
@ 2012-10-05  4:54 Stephen Rothwell
  0 siblings, 0 replies; 20+ messages in thread
From: Stephen Rothwell @ 2012-10-05  4:54 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Do not add stuff destined for v3.8 to your linux-next included branches
until after v3.7-rc1 is released.

Changes since 201201004:

Conflicts are migrating as trees are merged by Linus.

The net tree lost its build failure.

The crypto tree lost its conflict.

The drm tree lost its conflicts.

The input tree gained a build failure so I sued the version from
next-20121004.

The kvm tree lost its conflicts.

The kvm-ppc tree gained a conflict against Linus' tree.

The arm-soc tree lost a conflict but gained another against the arm64
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. 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 202 trees (counting Linus' and 26 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 (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
Merging kbuild-current/rc-fixes (b1e0d8b kbuild: Fix gcc -x syntax)
Merging arm-current/fixes (7253b85 ARM: 7541/1: Add ARM ERRATA 775420 workaround)
Merging m68k-current/for-linus (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
Merging powerpc-merge/merge (636802e powerpc: Don't use __put_user() in patch_instruction)
Merging sparc/master (ffa9009 sparc64: Fix strace hiccups when force_successful_syscall() triggers.)
Merging net/master (6825a26 ipv6: release reference of ip6_null_entry's dst entry in __ip6_del_rt)
Merging sound-current/for-linus (5d037f9 Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
Merging wireless/master (a7be50b iwlwifi: don't double free the interrupt in failure path)
Merging driver-core.current/driver-core-linus (5698bd7 Linux 3.6-rc6)
Merging tty.current/tty-linus (5698bd7 Linux 3.6-rc6)
Merging usb.current/usb-linus (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging staging.current/staging-linus (5698bd7 Linux 3.6-rc6)
Merging char-misc.current/char-misc-linus (fea7a08 Linux 3.6-rc3)
Merging input-current/for-linus (dde3ada Merge branch 'next' into for-linus)
Merging md-current/for-linus (80b4812 md/raid10: fix "enough" function for detecting if array is failed.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
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 arm/for-next (f537d06 Merge branch 'devel-stable' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-integrator/integrator_cp.c
CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c
CONFLICT (content): Merge conflict in arch/arm/include/asm/timex.h
Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
CONFLICT (modify/delete): arch/arm/mach-tegra/devices.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-tegra/devices.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-bcmring/arch.c deleted in HEAD and modified in arm-perf/for-next/perf. Version arm-perf/for-next/perf of arch/arm/mach-bcmring/arch.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/kernel/hw_breakpoint.c
$ git rm -f arch/arm/mach-tegra/devices.c arch/arm/mach-bcmring/arch.c
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging arm64/upstream (cce72b4 arm64: Use the generic compat_sys_sendfile() implementation)
Merging blackfin/for-linus (6895f97 kbuild: add symbol prefix arg to kallsyms)
Merging c6x/for-linux-next (2e919f7 c6x: remove c6x signal.h)
Merging cris/for-next (d75d806 CRIS: Remove VCS simulator specific code)
Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (39c9a4a [IA64] xen: Fix return value check in xencomm_vtop())
Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
Merging m68knommu/for-next (a255172 m68knommu: fix inconsistent formating in ColdFire 5407 definitions)
Merging microblaze/next (94fda49 Revert "microblaze_mmu_v2: Update signal returning address")
Merging mips/mips-for-linux-next (97541cc MIPS: ath79: Fix CPU/DDR frequency calculation for SRIF PLLs)
CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile
CONFLICT (content): Merge conflict in drivers/net/ethernet/octeon/octeon_mgmt.c
CONFLICT (content): Merge conflict in arch/mips/include/asm/octeon/octeon-model.h
Merging openrisc/for-upstream (4c8faa4 openrisc: mask interrupts in irq_mask_ack function)
Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread())
Merging s390/features (12dce10 s390/mm,pageattr: remove superfluous EXPORT_SYMBOLs)
Merging sh/sh-latest (16d74eb sh: pfc: Fix up GPIO mux type reconfig case.)
Merging sparc-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc)
Merging tile/master (e70cf54 tile: gxio iorpc numbering change for TRIO interface)
Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
Merging xtensa/for_next (ded389d xtensa: Add missing RCU idle APIs on idle loop)
Merging btrfs/next (0b2d449 btrfs: move inline function code to header file)
Merging ceph/master (6285bc2 ceph: avoid 32-bit page index overflow)
Merging cifs/for-next (612a9aa Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
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 (09e05d4 jbd: Fix assertion failure in commit code due to lacking transaction credits)
Merging ext4/dev (16bed34 ext4: fix ext4_flush_completed_IO wait semantics)
Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
Merging gfs2/master (2216db7 GFS2: Write out dirty inode metadata in delayed deletes)
Merging jfs/jfs-next (84f4141 jfs: Fix do_div precision in commit b40c2e66)
Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
Merging nfs/linux-next (5f65753 NFSv4 set open access operation call flag in nfs4_init_opendata_res)
Merging nfsd/nfsd-next (0d22f68 nfsd4: don't allow reclaims of expired clients)
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 (3668b70 UBIFS: print less)
Merging xfs/for-next (2ea0392 xfs: Make inode32 a remountable option)
Merging vfs/for-next (2bd2c19 MAX_LFS_FILESIZE should be a loff_t)
Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next)
Merging powerpc/next (d900bd7 powerpc/iommu: Fix multiple issues with IOMMU pools code)
CONFLICT (content): Merge conflict in drivers/scsi/ipr.c
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
Merging mpc5xxx/next (f3ac712 powerpc/pcm030: add pcm030-audio-fabric to dts)
Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
Merging hid/for-next (0b82411 Merge branch 'hidraw' into for-next)
CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c
Merging quilt/i2c (f7c7e6a i2c: Correct struct i2c_driver doc about detection)
Merging i2c-embedded/i2c-embedded/for-next (2bdbfa9 i2c: davinci: preparation for switch to common clock framework)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging quilt/jdelvare-hwmon (e086be6 hwmon: Drop needless includes of <linux/delay.h>)
Merging hwmon-staging/hwmon-next (967d7fe hwmon: (ads7828) driver cleanup)
Merging v4l-dvb/master (c39504e Merge /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51-peripherals.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c
CONFLICT (modify/delete): Documentation/feature-removal-schedule.txt deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/feature-removal-schedule.txt left in tree.
$ git rm -f Documentation/feature-removal-schedule.txt
Merging kbuild/for-next (f1748a9 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 (5f7e21e Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next)
Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
Merging acpi/next (10eaea0 Merge branch 'misc' into next)
CONFLICT (content): Merge conflict in include/acpi/acpixf.h
CONFLICT (content): Merge conflict in drivers/usb/core/usb-acpi.c
Applying: usb-acpi: Comply with the ACPI API change after usb tree merge
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 (4b69a04 thermal: user_space: Add missing static storage class specifiers)
CONFLICT (content): Merge conflict in drivers/thermal/thermal_sys.c
CONFLICT (content): Merge conflict in drivers/staging/omap-thermal/omap-thermal-common.c
Merging ieee1394/for-next (4d50c44 firewire: addendum to address handler RCU conversion)
Merging ubi/linux-next (76ac66e UBI: Wire-up fastmap)
Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user)
Merging scsi/for-next (3da4202 Merge branch 'misc' into for-next)
Merging target-updates/for-next (cf0eb28 iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values)
Merging target-merge/for-next-merge (d987569 Linux 3.6-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 (d0fc905 dma: tegra: fix interrupt name issue with apb dma.)
CONFLICT (content): Merge conflict in drivers/spi/spi-davinci.c
CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
CONFLICT (content): Merge conflict in drivers/dma/mmp_tdma.c
Applying: DMA: PL330: Fix build error (on linux-next-20120924)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc)
Merging wireless-next/master (5160b46 ath9k: Fix BTCOEX weight initialization)
Merging bluetooth/master (dfee1eb Bluetooth: remove unused member of hci_dev.)
Merging mtd/master (e2d3a35 mtd: nand: detect Samsung K9GBG08U0A, K9GAG08U0F ID)
CONFLICT (content): Merge conflict in drivers/mtd/nand/orion_nand.c
CONFLICT (modify/delete): drivers/mtd/nand/nand_bcm_umi.h deleted in mtd/master and modified in HEAD. Version HEAD of drivers/mtd/nand/nand_bcm_umi.h left in tree.
CONFLICT (modify/delete): drivers/mtd/nand/bcm_umi_nand.c deleted in mtd/master and modified in HEAD. Version HEAD of drivers/mtd/nand/bcm_umi_nand.c left in tree.
CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-imx/clk-imx51-imx53.c
CONFLICT (modify/delete): arch/arm/configs/bcmring_defconfig deleted in HEAD and modified in mtd/master. Version mtd/master of arch/arm/configs/bcmring_defconfig left in tree.
CONFLICT (content): Merge conflict in MAINTAINERS
$ git rm -f arch/arm/configs/bcmring_defconfig drivers/mtd/nand/bcm_umi_nand.c drivers/mtd/nand/nand_bcm_umi.h
Merging l2-mtd/master (404fb6e mtd: slram: invalid checking of absolute end address)
Merging crypto/master (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
Merging drm/drm-next (268d283 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next)
Merging sound/for-next (b7ef37d ARM: SAMSUNG: dma-ops: Fix dmaengine_prep_dma_cyclic() parameter list)
CONFLICT (modify/delete): sound/soc/omap/overo.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/overo.c left in tree.
CONFLICT (modify/delete): sound/soc/omap/omap3evm.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/omap3evm.c left in tree.
CONFLICT (modify/delete): sound/soc/omap/omap3beagle.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/omap3beagle.c left in tree.
CONFLICT (content): Merge conflict in sound/soc/omap/omap-pcm.c
CONFLICT (content): Merge conflict in sound/soc/omap/omap-mcbsp.c
CONFLICT (modify/delete): sound/soc/omap/igep0020.c deleted in sound/for-next and modified in HEAD. Version HEAD of sound/soc/omap/igep0020.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/da8xx.h
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm365.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/dm355.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/davinci.h
$ git rm -f sound/soc/omap/igep0020.c sound/soc/omap/omap3beagle.c sound/soc/omap/omap3evm.c sound/soc/omap/overo.c
Merging sound-asoc/for-next (68d114e Merge branches 'asoc-twl6040' and 'asoc-omap' into for-3.7)
Merging modules/modules-next (cad326d asymmetric keys: fix printk format warning)
CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
CONFLICT (content): Merge conflict in arch/x86/um/Kconfig
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/Kconfig
CONFLICT (content): Merge conflict in Makefile
Merging virtio/virtio-next (ca16f58 lguest: fix occasional crash in example launcher.)
Merging input/next (c90d6b1 Input: samsung-keypad - add clk_prepare and clk_unprepare)
$ git reset --hard HEAD^
Merging refs/next/20121004/input
Merging input-mt/for-next (51c80b7 Input: bcm5974 - Convert to MT-B)
Merging cgroup/for-next (c0a93e2 Merge branch 'for-3.7-hierarchy' into for-next)
Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
CONFLICT (content): Merge conflict in init/Kconfig
Merging quilt/device-mapper (1ca30da Use the recently-added bio front_pad field to allocate struct dm_target_io.)
CONFLICT (content): Merge conflict in drivers/md/dm.c
CONFLICT (content): Merge conflict in drivers/md/dm-thin.c
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 (7f35f42 mmc: rtsx_pci_sdmmc: Add realtek pcie sdmmc host driver)
CONFLICT (content): Merge conflict in drivers/mmc/host/omap.c
CONFLICT (content): Merge conflict in drivers/mmc/host/davinci_mmc.c
Merging kgdb/kgdb-next (08f9553 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
Merging slab/for-next (e2087be Merge branch 'slab/tracing' into slab/for-linus)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (c0c6d3f md: writing to sync_action should clear the read-auto state.)
CONFLICT (content): Merge conflict in fs/bio.c
CONFLICT (content): Merge conflict in drivers/md/raid0.c
Merging mfd/for-next (74d8378 ARM: dts: Enable 88pm860x pmic)
CONFLICT (content): Merge conflict in drivers/video/backlight/88pm860x_bl.c
CONFLICT (content): Merge conflict in drivers/regulator/anatop-regulator.c
CONFLICT (content): Merge conflict in drivers/mfd/tps65217.c
CONFLICT (content): Merge conflict in drivers/mfd/tc3589x.c
CONFLICT (content): Merge conflict in drivers/mfd/max8925-core.c
CONFLICT (content): Merge conflict in drivers/mfd/db8500-prcmu.c
CONFLICT (content): Merge conflict in drivers/mfd/88pm860x-core.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/regulator/tps6586x.txt
Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
CONFLICT (content): Merge conflict in include/linux/mfd/88pm860x.h
Merging fbdev/fbdev-next (ebe9f7b video: exynos_mipi_dsi: Remove unnecessary NULL check)
CONFLICT (content): Merge conflict in drivers/video/msm/mdp_hw.h
CONFLICT (content): Merge conflict in drivers/video/msm/mdp.c
CONFLICT (content): Merge conflict in drivers/video/msm/mddi.c
CONFLICT (modify/delete): drivers/video/epson1355fb.c deleted in HEAD and modified in fbdev/fbdev-next. Version fbdev/fbdev-next of drivers/video/epson1355fb.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-real6410.c
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-mini6410.c
$ git rm -f drivers/video/epson1355fb.c
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)
CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dispc.c
CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-taal.c
CONFLICT (content): Merge conflict in drivers/video/omap/lcd_ams_delta.c
Merging regulator/for-next (6a2027a Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next)
Merging security/next (bf53083 Merge tag 'v3.6-rc7' into next)
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 (0094872 Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next)
Merging vfio/next (f448d31 vfio: Fix PCI INTx disable consistency)
Merging osd/linux-next (7f8d145 pnfs_osd_xdr: Remove unused #include from pnfs_osd_xdr.h)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (9c33c51 doc: fix old config name of kprobetrace)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (df5a2a1 Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394)
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 (cfe5031 edac: edac_mc no longer deals with kobjects directly)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
CONFLICT (content): Merge conflict in Documentation/edac.txt
Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
Merging dt-rh/for-next (36165f5 MAINTAINERS: add scripts/dtc under Devicetree maintainers)
Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
Merging spi-mb/spi-next (536a53a spi: remove completely broken Tegra driver)
Merging tip/auto-latest (cee487a Merge branch 'x86/urgent')
Merging rcu/rcu/next (593d100 Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b)
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 kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
Merging kvm/linux-next (3d11df7 KVM: s390: Fix vcpu_load handling in interrupt code)
Merging kvm-ppc/kvm-ppc-next (d1805bf arch/powerpc/kvm/e500_tlb.c: fix error return code)
CONFLICT (content): Merge conflict in include/linux/kvm.h
Merging oprofile/for-next (61bccf1 oprofile: Remove 'WQ on CPUx, prefer CPUy' warning)
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 (8825f04 Merge branch 'stable/for-linus-3.7' into linux-next)
CONFLICT (content): Merge conflict in drivers/xen/Makefile
CONFLICT (modify/delete): arch/arm/mach-vexpress/Makefile.boot deleted in HEAD and modified in xen-two/linux-next. Version xen-two/linux-next of arch/arm/mach-vexpress/Makefile.boot left in tree.
CONFLICT (content): Merge conflict in arch/arm/Kconfig
$ git rm -f arch/arm/mach-vexpress/Makefile.boot
Applying: The Xen tree tries to add a line to arch/arm/mach-vexpress/Makefile.boot that has been removed by the following commit in Linus' master:
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging workqueues/for-next (2b0f620 Merge branch 'for-3.7' 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 (613dac3 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/irq' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (2f73c39 leds: add output driver configuration for pca9633 led driver)
Merging driver-core/driver-core-next (e0f21e6 memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl())
Merging tty/tty-next (0c57dfc tty/serial: Add kgdb_nmi driver)
Merging usb/usb-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging staging/staging-next (e187895 staging: comedi: jr3_pci: fix iomem dereference)
Merging char-misc/char-misc-next (5dc2db0 drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init)
Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next)
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 (e1b2dc7 pinctrl: add bcm2835 driver)
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 (d09f53a remoteproc: Fix use of format specifyer)
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 (901acf5 gpio: pcf857x: select IRQ_DOMAIN)
Merging arm-soc/for-next (7f1bfe5 Merge branch 'asm-generic' into for-next)
CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h
Merging ep93xx/ep93xx-for-next (70f0f7c Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging ixp4xx/next (2346020 IXP4xx: map CPU config registers within VMALLOC region.)
CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/common.c
Merging msm/for-next (a0d271c Linux 3.6)
Merging renesas/next (b681273 Merge branch 'heads/boards' into next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging samsung/for-next (59e65fd Merge branch 'next/dt-samsung-new' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/clock-exynos5.c
Merging tegra/for-next (979570e Linux 3.6-rc7)
Merging kvmtool/master (5a337ac kvm tools: don't exit on debug ioport write)
Merging dma-mapping/dma-mapping-next (461b6f0 Merge branch 'next-cleanup' into for-v3.7)
Merging pwm/for-next (72004bd pwm: Add Ingenic JZ4740 support)
Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
Merging userns/for-next (5545730 userns: Properly print bluetooth socket uids)
Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
Merging signal/for-next (12f79be alpha: don't open-code trace_report_syscall_{enter,exit})
CONFLICT (content): Merge conflict in fs/exec.c
CONFLICT (content): Merge conflict in arch/xtensa/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
CONFLICT (content): Merge conflict in arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/um/kernel/exec.c
CONFLICT (content): Merge conflict in arch/s390/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/mn10300/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/mn10300/Kconfig
CONFLICT (content): Merge conflict in arch/microblaze/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/m68k/Kconfig
CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/ia64/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/frv/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/c6x/Kconfig
CONFLICT (content): Merge conflict in arch/avr32/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/alpha/Kconfig
Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support)
Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
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: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
Applying: acpi_memhotplug.c: remove memory info from list before freeing it
Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
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: audit.h: replace defines with C stubs
Applying: audith-replace-defines-with-c-stubs-fix
Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message
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: kbuild: make: fix if_changed when command contains backslashes
Applying: compiler-gcc4.h: correct verion check for __compiletime_error
Applying: h8300: select generic atomic64_t support
Applying: unicore32: select generic atomic64_t support
Applying: rapidio/rionet: fix multicast packet transmit logic
Applying: readahead: fault retry breaks mmap file read random detection
Applying: drivers/scsi/atp870u.c: fix bad use of udelay
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: mm: remove __GFP_NO_KSWAPD
Applying: x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines
Applying: x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn
Applying: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix
Applying: mm, x86, pat: rework linear pfn-mmap tracking
Applying: mm: introduce arch-specific vma flag VM_ARCH_1
Applying: mm: kill vma flag VM_INSERTPAGE
Applying: mm: kill vma flag VM_CAN_NONLINEAR
Applying: mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
Applying: mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas
Applying: mm: prepare VM_DONTDUMP for using in drivers
Applying: mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
Applying: mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix
Applying: mm: fix nonuniform page status when writing new file with small buffer
Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix
Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix-fix
Applying: mm/mmap.c: replace find_vma_prepare() with clearer find_vma_links()
Applying: mm-mmapc-replace-find_vma_prepare-with-clearer-find_vma_links fix
Applying: mm: compaction: update comment in try_to_compact_pages
Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures
Applying: mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures-fix
Applying: mm: compaction: capture a suitable high-order page immediately when it is made available
Applying: Revert "mm: mempolicy: Let vma_merge and vma_split handle vma->vm_policy linkages"
Applying: mempolicy: remove mempolicy sharing
Applying: mempolicy: fix a race in shared_policy_replace()
Applying: mempolicy: fix refcount leak in mpol_set_shared_policy()
Applying: mempolicy: fix a memory corruption by refcount imbalance in alloc_pages_vma()
Applying: mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma-v2
Applying: mm: mmu_notifier: fix inconsistent memory between secondary MMU and host
Applying: mm-mmu_notifier-fix-inconsistent-memory-between-secondary-mmu-and-host-fix
Applying: mm: mmu_notifier: have mmu_notifiers use a global SRCU so they may safely schedule
Applying: mm/mmu_notifier: init notifier if necessary
Applying: mm/mmu_notifier: init notifier if necessary
Applying: mm/vmscan: fix error number for failed kthread
Applying: mm: hugetlb: add arch hook for clearing page flags before entering pool
Applying: mm: adjust final #endif position in mm/internal.h
Applying: thp: fix the count of THP_COLLAPSE_ALLOC
Applying: thp: remove unnecessary check in start_khugepaged
Applying: thp: move khugepaged_mutex out of khugepaged
Applying: thp: remove unnecessary khugepaged_thread check
Applying: thp: remove wake_up_interruptible in the exit path
Applying: thp: remove some code depend on CONFIG_NUMA
Applying: thp: merge page pre-alloc in khugepaged_loop into khugepaged_do_scan
Applying: thp: release page in page pre-alloc path
Applying: thp: introduce khugepaged_prealloc_page and khugepaged_alloc_page
Applying: thp: remove khugepaged_loop
Applying: thp: use khugepaged_enabled to remove duplicate code
Applying: thp: remove unnecessary set_recommended_min_free_kbytes
Applying: mm: fix potential anon_vma locking issue in mprotect()
Applying: thp, x86: introduce HAVE_ARCH_TRANSPARENT_HUGEPAGE
Applying: thp: remove assumptions on pgtable_t type
Applying: thp: introduce pmdp_invalidate()
Applying: thp: make MADV_HUGEPAGE check for mm->def_flags
Applying: thp, s390: thp splitting backend for s390
Applying: thp, s390: thp pagetable pre-allocation for s390
Applying: thp, s390: disable thp for kvm host on s390
Applying: thp, s390: architecture backend for thp on s390
Applying: thp, s390: add missing earlyclobber to inline assembly
Applying: ipc/mqueue: remove unnecessary rb_init_node() calls
Applying: rbtree: reference Documentation/rbtree.txt for usage instructions
Applying: rbtree: empty nodes have no color
Applying: rbtree-empty-nodes-have-no-color-fix
Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c
Applying: rbtree: move some implementation details from rbtree.h to rbtree.c
Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field
Applying: rbtree: performance and correctness test
Applying: rbtree-performance-and-correctness-test-fix
Applying: rbtree: break out of rb_insert_color loop after tree rotation
Applying: rbtree: adjust root color in rb_insert_color() only when necessary
Applying: rbtree: low level optimizations in rb_insert_color()
Applying: rbtree: adjust node color in __rb_erase_color() only when necessary
Applying: perf tools: fix build for another rbtree.c change
Applying: rbtree: optimize case selection logic in __rb_erase_color()
Applying: rbtree: low level optimizations in __rb_erase_color()
Applying: rbtree: coding style adjustments
Applying: rbtree: optimize fetching of sibling node
Applying: rbtree test: fix sparse warning about 64-bit constant
Applying: rbtree: add __rb_change_child() helper function
Applying: rbtree: place easiest case first in rb_erase()
Applying: rbtree: handle 1-child recoloring in rb_erase() instead of rb_erase_color()
Applying: rbtree: low level optimizations in rb_erase()
Applying: rbtree: augmented rbtree test
Applying: rbtree: faster augmented rbtree manipulation
Applying: rbtree: remove prior augmented rbtree implementation
Applying: rbtree: add RB_DECLARE_CALLBACKS() macro
Applying: rbtree: add prio tree and interval tree tests
Applying: mm: replace vma prio_tree with an interval tree
Applying: kmemleak: use rbtree instead of prio tree
Applying: prio_tree: remove
Applying: rbtree: move augmented rbtree functionality to rbtree_augmented.h
Applying: mm: interval tree updates
Applying: mm anon rmap: remove anon_vma_moveto_tail
Applying: mm anon rmap: replace same_anon_vma linked list with an interval tree.
Applying: mm rmap: remove vma_address check for address inside vma
Applying: mm: add CONFIG_DEBUG_VM_RB build option
Applying: mm anon rmap: in mremap, set the new vma's position before anon_vma_clone()
Applying: mm: avoid taking rmap locks in move_ptes()
Applying: memory-hotplug: build zonelists when offlining pages
Applying: mm: mmu_notifier: make the mmu_notifier srcu static
Applying: mm: cma: discard clean pages during contiguous allocation instead of migration
Applying: mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration-fix
Applying: mm-cma-discard-clean-pages-during-contiguous-allocation-instead-of-migration-fix-fix
Applying: mm: fix tracing in free_pcppages_bulk()
Applying: mm-fix-tracing-in-free_pcppages_bulk-fix
Applying: cma: fix counting of isolated pages
Applying: cma: count free CMA pages
Applying: cma-count-free-cma-pages-fix
Applying: cma: fix watermark checking
Applying: cma: fix watermark checking cleanup
Applying: mm: page_alloc: use get_freepage_migratetype() instead of page_private()
Applying: mm: remain migratetype in freed page
Applying: memory-hotplug: bug fix race between isolation and allocation
Applying: memory-hotplug: fix pages missed by race rather than failing
Applying: memory-hotplug-fix-pages-missed-by-race-rather-than-failng-fix
Applying: atomic: implement generic atomic_dec_if_positive()
Applying: atomic-implement-generic-atomic_dec_if_positive-fix
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: mm/memblock: use existing interface to set nid
Applying: mm/memblock: cleanup early_node_map[] related comments
Applying: mm: compaction: abort compaction loop if lock is contended or run too long
Applying: mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix
Applying: mm-compaction-abort-compaction-loop-if-lock-is-contended-or-run-too-long-fix-2
Applying: mm: compaction: move fatal signal check out of compact_checklock_irqsave
Applying: mm: compaction: Update try_to_compact_pages()kerneldoc comment
Applying: mm: compaction: acquire the zone->lru_lock as late as possible
Applying: mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible-fix
Applying: mm-compaction-acquire-the-zone-lru_lock-as-late-as-possible-fix-fix
Applying: mm: compaction: acquire the zone->lock as late as possible
Applying: mm: compaction: iron out isolate_freepages_block() and isolate_freepages_range()
Applying: Revert "mm: have order > 0 compaction start off where it left"
Applying: mm: compaction: cache if a pageblock was scanned and no pages were isolated
Applying: mm-compaction-cache-if-a-pageblock-was-scanned-and-no-pages-were-isolated-fix
Applying: mm: compaction: cache if a pageblock was scanned and no pages were isolated -fix2
Applying: mm: compaction: Restart compaction from near where it left off
Applying: mm: compaction: Restart compaction from near where it left off -fix
Applying: mm: compaction: clear PG_migrate_skip based on compaction and reclaim activity
Applying: mm/hugetlb.c: remove duplicate inclusion of header file
Applying: mm/page_alloc: refactor out __alloc_contig_migrate_alloc()
Applying: mm-page_alloc-refactor-out-__alloc_contig_migrate_alloc-checkpatch-fixes
Applying: memory-hotplug: don't replace lowmem pages with highmem
Applying: thp: khugepaged_prealloc_page() forgot to reset the page alloc indicator
Applying: mm: thp: fix the pmd_clear() arguments in pmdp_get_and_clear()
Applying: mm: thp: fix the update_mmu_cache() last argument passing in mm/huge_memory.c
Applying: mm: enable CONFIG_COMPACTION by default
Applying: mm: fix-up zone present pages
Applying: memcg: trivial fixes for Documentation/cgroups/memory.txt
Applying: memcg: cleanup kmem tcp ifdefs
Applying: memcg: move mem_cgroup_is_root upwards
Applying: mm: fix invalidate_complete_page2() lock ordering
Applying: mm: remove vma arg from page_evictable
Applying: mm: use clear_page_mlock() in page_remove_rmap()
Applying: mm: remove free_page_mlock
Applying: mm, numa: reclaim from all nodes within reclaim distance
Applying: mm-numa-reclaim-from-all-nodes-within-reclaim-distance-fix
Applying: mm, numa: reclaim from all nodes within reclaim distance fix fix
Applying: memory.txt: remove stray information
Applying: mm: thp: fix pmd_present for split_huge_page and PROT_NONE with THP
Applying: hugetlb: do not use vma_hugecache_offset() for vma_prio_tree_foreach
Applying: mm: move all mmu notifier invocations to be done outside the PT lock
Applying: mm: wrap calls to set_pte_at_notify with invalidate_range_start and invalidate_range_end
Applying: mm: call invalidate_range_end in do_wp_page even for zero pages
Applying: Revert 0def08e3 because check_range can't fail in migrate_to_node with
Applying: mm: enhance comment and bug check
Applying: memory-hotplug: fix zone stat mismatch
Applying: mm: remove unevictable_pgs_mlockfreed
Applying: KSM: numa awareness sysfs knob
Applying: mm/memory.c: fix typo in comment
Applying: fs/fs-writeback.c: remove unneccesary parameter of __writeback_single_inode()
Applying: kpageflags: fix wrong KPF_THP on non-huge compound pages
Applying: CMA: migrate mlocked pages
Applying: cma: decrease cc.nr_migratepages after reclaiming pagelist
Applying: sections: disable const sections for PA-RISC v2
Applying: sections: fix section conflicts in arch/arm/
Applying: sections: fix section conflicts in arch/frv
Applying: sections: fix section conflicts in arch/h8300
Applying: sections-fix-section-conflicts-in-arch-h8300-checkpatch-fixes
Applying: sections: fix section conflicts in arch/ia64
Applying: sections: fix section conflicts in arch/mips
Applying: sections: fix section conflicts in arch/powerpc
Applying: sections: fix section conflicts in arch/score
Applying: sections: fix section conflicts in arch/sh
Applying: sections-fix-section-conflicts-in-arch-sh-fix
Applying: sections: fix section conflicts in arch/x86
Applying: sections: fix section conflicts in drivers/atm
Applying: sections: fix section conflicts in drivers/char
Applying: sections: fix section conflicts in drivers/ide
Applying: sections: fix section conflicts in drivers/macintosh
Applying: sections-fix-section-conflicts-in-drivers-macintosh-checkpatch-fixes
Applying: sections: fix section conflicts in drivers/mfd
Applying: sections: fix section conflicts in drivers/mmc
Applying: sections: fix section conflicts in drivers/net
Applying: sections: fix section conflicts in drivers/net/hamradio
Applying: sections: fix section conflicts in drivers/net/wan
Applying: sections: fix section conflicts in drivers/platform/x86
Applying: sections: fix section conflicts in drivers/scsi
Applying: sections: fix section conflicts in drivers/video
Applying: sections: fix section conflicts in mm/percpu.c
Applying: sections: fix section conflicts in net/can
Applying: sections: fix section conflicts in net
Applying: sections: fix section conflicts in sound
Applying: sections: fix const sections for crc32 table
Applying: sectons-fix-const-sections-for-crc32-table-checkpatch-fixes
Applying: frv: kill used but uninitialized variable
Applying: score: select generic atomic64_t support
Applying: cross-arch: don't corrupt personality flags upon exec()
Applying: tile: fix personality bits handling upon exec()
Applying: kernel/sys.c: call disable_nonboot_cpus() in kernel_restart()
Applying: poweroff: fix bug in orderly_poweroff()
Applying: lib: vsprintf: optimize division by 10 for small integers
Applying: lib: vsprintf: optimize division by 10000
Applying: lib: vsprintf: optimize put_dec_trunc8()
Applying: lib-vsprintf-optimize-put_dec_trunc8-fix
Applying: lib: vsprintf: fix broken comments
Applying: lib/vsprintf: update documentation to cover all of %p[Mm][FR]
Applying: MAINTAINERS: update gpio subsystem file list
Applying: MAINTAINERS: add defconfig file to IMX section
Applying: MAINTAINERS: Update gianfar_ptp after renaming
Applying: MAINTAINERS: fix indentation for Viresh Kumar
Applying: drivers/video/backlight/da9052_bl.c: use usleep_range() instead of msleep() for small sleeps
Applying: drivers/video/backlight/ltv350qv.c: use usleep_range() instead of msleep() for small sleeps
Applying: drivers/video/backlight/kb3886_bl.c: use usleep_range() instead of msleep() for small sleeps
Applying: backlight: lp855x: add FAST bit description for LP8556
Applying: backlight: add Backlight driver for lm3630 chip
Applying: backlight-add-backlight-driver-for-lm3630-chip-fix
Applying: backlight: add new lm3639 backlight driver
Applying: backlight-add-new-lm3639-backlight-driver-fix
Applying: backlight-add-new-lm3639-backlight-driver-fix-2
Applying: backlight: remove ProGear driver
Applying: drivers/video/backlight/da9052_bl.c: drop devm_kfree of devm_kzalloc'd data
Applying: drivers/video/backlight/platform_lcd.c: add support for device tree based probe
Applying: backlight-platform-lcd-add-support-for-device-tree-based-probe-fix
Applying: pwm_backlight: add device tree support for Low Threshold Brightness
Applying: pwm_backlight-add-device-tree-support-for-low-threshold-brightness-fix
Applying: drivers/net/ethernet/sfc: use standard __{clear,set}_bit_le() functions
Applying: drivers/net/ethernet/dec/tulip: Use standard __set_bit_le() function
Applying: bitops: introduce generic {clear,set}_bit_le()
Applying: powerpc: bitops: introduce {clear,set}_bit_le()
Applying: kvm: replace test_and_set_bit_le() in mark_page_dirty_in_slot() with set_bit_le()
Applying: idr: rename MAX_LEVEL to MAX_IDR_LEVEL
Applying: idr-rename-max_level-to-max_idr_level-fix
Applying: idr-rename-max_level-to-max_idr_level-fix-fix-2
Applying: idr-rename-max_level-to-max_idr_level-fix-fix-2-fix
Applying: idr-rename-max_level-to-max_idr_level-fix-3
Applying: lib/parser.c: avoid overflow in match_number()
Applying: lib-parserc-avoid-overflow-in-match_number-fix
Applying: lib/Kconfig.debug: adjust hard-lockup related Kconfig options
Applying: lib/gcd.c: prevent possible div by 0
Applying: genalloc: make it possible to use a custom allocation algorithm
Applying: lib/spinlock_debug: avoid livelock in do_raw_spin_lock()
Applying: lib-spinlock_debug-avoid-livelock-in-do_raw_spin_lock-fix
Applying: lib/vsprintf.c: improve standard conformance of sscanf()
Applying: lib/plist.c: make plist test announcements KERN_DEBUG
Applying: scatterlist: atomic sg_mapping_iter() no longer needs disabled IRQs
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: check utf-8 content from a commit log when it's missing from charset
Applying: checkpatch: update suggested printk conversions
Applying: checkpatch: check networking specific block comment style
Applying: CodingStyle: add networking specific block comment style
Applying: epoll: support for disabling items, and a self-test app
Applying: binfmt_elf: Uninitialized variable
Applying: drivers/rtc/rtc-isl1208.c: add support for the ISL1218
Applying: rtc-proc: permit the /proc/driver/rtc device to use other devices
Applying: rtc: add Dallas DS2404 driver
Applying: rtc-add-dallas-ds2404-driver-fix
Applying: rtc: snvs: add Freescale rtc-snvs driver
Applying: rtc: snvs: change timeout to use a fixed number of loop
Applying: rtc: recycle id when unloading a rtc driver
Applying: drivers/rtc/rtc-at91sam9.c: use module_platform_driver() macro
Applying: rtc: tps65910: add RTC driver for TPS65910 PMIC RTC
Applying: rtc: tps65910: change RTC driver name as per mfd
Applying: rtc: add MAX8907 RTC driver
Applying: rtc: kconfig: remove unnecessary dependencies.
Applying: drivers/rtc/rtc-jz4740.c: fix IRQ error check
Applying: drivers/rtc/rtc-spear.c: fix several error checks
Applying: rtc: rc5t583: add ricoh rc5t583 RTC driver
Applying: drivers/rtc/rtc-coh901331.c: use clk_prepare_enable() and clk_disable_unprepare()
Applying: rtc: rtc-mxc: adapt to the new i.mx clock framework
Applying: rtc: rtc-mxc: convert to module_platform_driver
Applying: rtc_sysfs_show_hctosys(): display 0 if resume failed
Applying: rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix
Applying: rtc_sysfs_show_hctosys-return-0-if-resume-failed-fix-fix
Applying: drivers/rtc/rtc-s3c.c: fix return value in s3c_rtc_probe()
Applying: drivers/rtc/rtc-ds1672.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-x1205.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-s35390a.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-rs5c372.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-pcf8563.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-isl1208.c: convert struct i2c_msg initialization to C99 format
Applying: drivers/rtc/rtc-em3027.c: convert struct i2c_msg initialization to C99 format
Applying: rtc: kconfig: fix up dependency for ab8500
Applying: drivers/rtc/rtc-tps65910.c: use platform_get_irq() to get RTC irq details
Applying: drivers/rtc/rtc-m41t80.c: remove disabled alarm functionality
Applying: drivers/rtc/rtc-s35390a.c: add wakealarm support for rtc-s35390A rtc chip
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: use accessor function for msdos_dir_entry 'start'
Applying: fat (exportfs): move NFS support code
Applying: fat (exportfs): fix dentry reconnection
Applying: fs/fat: fix a checkpatch issue in namei_msdos.c
Applying: fs/fat: fix some checkpatch issues in fat.h
Applying: fs/fat: chang indentation of some comments in fat.h
Applying: fs/fat: fix two checkpatch issues in cache.c
Applying: fs/fat: fix some small checkpatch issues in dir.c
Applying: fs/fat: fix all other checkpatch issues in dir.c
Applying: fs-fat-fix-all-other-checkpatch-issues-in-dirc-fix
Applying: fs/fat: fix checkpatch issues in fatent.c
Applying: fat: no need to reset EOF in ent_put for FAT32
Applying: fat: simplify writeback_inode()
Applying: fat-simplify-writeback_inode-checkpatch-fixes
Applying: fat-simplify-writeback_inode-checkpatch-fixes-fix
Applying: device_cgroup: add "deny_all" in dev_cgroup structure
Applying: device_cgroup: introduce dev_whitelist_clean()
Applying: device_cgroup: convert device_cgroup internally to policy + exceptions
Applying: device_cgroup: rename whitelist to exception list
Applying: coredump: make core dump functionality optional
Applying: fs: amended coredump-related sysctl functions
Applying: coredump-make-core-dump-functionality-optional-fix-fix
Applying: coredump: update coredump-related headers
Applying: coredump: add support for %d=__get_dumpable() in core name
Applying: coredump-add-support-for-%d=__get_dumpable-in-core-name-fix
Applying: coredump: use SUID_DUMPABLE_ENABLED rather than hardcoded 1
Applying: coredump-use-suid_dumpable_enabled-rather-than-hardcoded-1-checkpatch-fixes
Applying: coredump: pass siginfo_t* to do_coredump() and below, not merely signr
Applying: compat: move compat_siginfo_t definition to asm/compat.h
Applying: coredump: add a new elf note with siginfo of the signal
Applying: coredump: extend core dump note section to contain file names of mapped files
Applying: proc: return -ENOMEM when inode allocation failed
Applying: proc: no need to initialize proc_inode->fd in proc_get_inode()
Applying: proc: use kzalloc instead of kmalloc and memset
Applying: proc-use-kzalloc-instead-of-kmalloc-and-memset-fix
Applying: proc_sysctl.c: use BUG_ON instead of BUG
Applying: fs/proc/root.c: use NULL instead of 0 for pointer
Applying: kdump: remove unneeded include
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: rapidio/tsi721: modify mport name assignment
Applying: rapidio: fix kerneldoc warnings after DMA support was added
Applying: drivers/rapidio/devices/tsi721.c: fix error return code
Applying: rapidio: add inbound memory mapping interface
Applying: rapidio/tsi721: add inbound memory mapping callbacks
Applying: rapidio: apply RX/TX enable to active switch ports only
Applying: nbd: add set flags ioctl
Applying: nbd: handle discard requests
Applying: aoe: for performance support larger packet payloads
Applying: aoe: kernel thread handles I/O completions for simple locking
Applying: aoe: cleanup an allocation a bit
Applying: aoe: become I/O request queue handler for increased user control
Applying: aoe: use a kernel thread for transmissions
Applying: aoe: use packets that work with the smallest-MTU local interface
Applying: aoe: failover remote interface based on aoe_deadsecs parameter
Applying: aoe: do revalidation steps in order
Applying: aoe: disallow unsupported AoE minor addresses
Applying: aoe: associate frames with the AoE storage target
Applying: aoe: increase net_device reference count while using it
Applying: aoe: remove unused code and add cosmetic improvements
Applying: aoe: update internal version number to 49
Applying: aoe: update copyright year in touched files
Applying: aoe: update documentation with new URL and VM settings reference
Applying: taskstats: cgroupstats_user_cmd() may leak on error
Applying: kernel/resource.c: fix stack overflow in __reserve_region_with_split()
Applying: lib/decompress.c add __init to decompress_method and data
Applying: prio_tree: fix fs/block_dev.c for removal of prio_tree
Applying: fs/block_dev.c:set_blocksize(): use mapping_mapped()
Merging akpm/master (2a89e3c fs/block_dev.c:set_blocksize(): use mapping_mapped())

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

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

* Re: linux-next: Tree for Oct 5
  2011-10-05 12:36   ` Stephen Rothwell
@ 2011-10-05 13:17     ` Valdis.Kletnieks
  0 siblings, 0 replies; 20+ messages in thread
From: Valdis.Kletnieks @ 2011-10-05 13:17 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML

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

On Wed, 05 Oct 2011 23:36:25 +1100, Stephen Rothwell said:

> Yeah, linux-next is not back on git.kernel.org yet.  See the note at the
> top of the email you quoted above:
> 
> "The linux-next tree is now available from
> git://github.com/sfrothwell/linux-next.git as a temporary measure while
> the kernel.org servers are unavailable."

-ENOCAFFEINE - I saw the git://git.kernel.org and thought "Oh good, Stephen is
back up and running on kernel.org again".

The spectacularly unhelpful behavior of git didn't help matters any.
If it had printed out "no such tree here" or similar rather than just
hanging up, I'd probably have gone back and re-read the mail...


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

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

* Re: linux-next: Tree for Oct 5
  2011-10-05 12:09 ` Valdis.Kletnieks
@ 2011-10-05 12:36   ` Stephen Rothwell
  2011-10-05 13:17     ` Valdis.Kletnieks
  0 siblings, 1 reply; 20+ messages in thread
From: Stephen Rothwell @ 2011-10-05 12:36 UTC (permalink / raw)
  To: Valdis.Kletnieks; +Cc: linux-next, LKML

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

Hi,

On Wed, 05 Oct 2011 08:09:19 -0400 Valdis.Kletnieks@vt.edu wrote:
>
> On Wed, 05 Oct 2011 19:37:50 +1100, Stephen Rothwell said:
> 
> > 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/v2.6/next/ ). 
> 
> So I managed to bodger up my local linux-next tree, decided to start from
> scratch. Had a good 'git pull' of Linus's tree from yesterday, so I did a 'git
> clone -l' of that. Then:
> 
> [/usr/src/linux-next] git remote add linux-next git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> [/usr/src/linux-next] git fetch linux-next
> fatal: The remote end hung up unexpectedly
> 
> Am I pointing something in the wrong place, or does git need to be kicked at
> the kernel.org end? It's apparently tree-specific - pulling Linus's tree from
> git.kernel.org works just fine.

Yeah, linux-next is not back on git.kernel.org yet.  See the note at the
top of the email you quoted above:

"The linux-next tree is now available from
git://github.com/sfrothwell/linux-next.git as a temporary measure while
the kernel.org servers are unavailable."

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

* Re: linux-next: Tree for Oct 5
  2011-10-05  8:37 Stephen Rothwell
@ 2011-10-05 12:09 ` Valdis.Kletnieks
  2011-10-05 12:36   ` Stephen Rothwell
  0 siblings, 1 reply; 20+ messages in thread
From: Valdis.Kletnieks @ 2011-10-05 12:09 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML

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

On Wed, 05 Oct 2011 19:37:50 +1100, Stephen Rothwell said:

> 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/v2.6/next/ ). 

So I managed to bodger up my local linux-next tree, decided to start from
scratch. Had a good 'git pull' of Linus's tree from yesterday, so I did a 'git
clone -l' of that. Then:

[/usr/src/linux-next] git remote add linux-next git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
[/usr/src/linux-next] git fetch linux-next
fatal: The remote end hung up unexpectedly

Am I pointing something in the wrong place, or does git need to be kicked at
the kernel.org end? It's apparently tree-specific - pulling Linus's tree from
git.kernel.org works just fine.


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

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

* linux-next: Tree for Oct 5
@ 2011-10-05  8:37 Stephen Rothwell
  2011-10-05 12:09 ` Valdis.Kletnieks
  0 siblings, 1 reply; 20+ messages in thread
From: Stephen Rothwell @ 2011-10-05  8:37 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

The linux-next tree is now available from
git://github.com/sfrothwell/linux-next.git as a temporary measure while
the kernel.org servers are unavailable.

Changes since 20111004:

The arm-soc tree still has its build failure so I used the version from
next-20110930.

The devicetree tree gained a build failure so I used the version from
next-20111004.

The tip tree gained a build failure (interaction with the net tree) for
which I applied a patch.

The staging tree lost its build failure.

The moduleh tree lost its build failures and gained a conflict against
the mfd tree.

The akpm tree gained 2 build failures for which I apllied patches.  I
also dropped several patches from the akpm tree that turned up elsewhere.

I applied a supplied patch to fix up a build failure in the net 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/v2.6/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
and sparc64 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 200 trees (counting Linus' and 27 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.

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
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/fixes
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
Merging arm-soc/for-next
CONFLICT (rename/delete): Rename arch/arm/include/asm/sizes.h->arch/arm/mach-picoxcell/include/mach/uncompress.h in arm-soc/for-next and deleted in HEAD
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.h
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-seaboard.h
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
CONFLICTResolved 'Documentation/devicetree/bindings/arm/l2cc.txt' using previous resolution.
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/gpio.h
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
$ git reset --hard HEAD^
Merging refs/next/20110930/arm-soc
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/arm/l2cc.txt
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in refs/next/20110930/arm-soc and modified in HEAD. Version HEAD of arch/arm/mach-at91/board-usb-a9260.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm8x60.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/gpio.h
CONFLICT (delete/modify): arch/arm/mach-nuc93x/Makefile.boot deleted in refs/next/20110930/arm-soc and modified in HEAD. Version HEAD of arch/arm/mach-nuc93x/Makefile.boot left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.h
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-seaboard.h
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Makefile.boot
CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
CONFLICT (content): Merge cResolved 'Documentation/devicetree/bindings/arm/l2cc.txt' using previous resolution.
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c arch/arm/mach-nuc93x/Makefile.boot
[master f509a10] Merge commit 'refs/next/20110930/arm-soc'
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
[master 6272ae0] Merge commit 'refs/next/20110930/arm-soc'
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-imx/Makefile
Merging linux-spec/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
Merging tegra/for-next
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging quilt/hexagon
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
CONFLICT (content): Merge conflict in fs/xfs/xfs_aops.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/acpi
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
Merging async_tx/next
Merging net/master
CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
CONFLICT (content): Merge conflict in drivers/s390/cio/qdio_main.c
CONFLICT (content): Merge conflict in net/batman-adv/soft-interface.c
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging wireless/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
CONFLICT (content): Merge conflict in net/bluetooth/smp.c
Merging mtd/master
Merging l2-mtd/master
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
CONFLICT (delete/modify): arch/arm/mach-at91/board-usb-a9260.c deleted in HEAD and modified in l2-mtd/master. Version l2-mtd/master of arch/arm/mach-at91/board-usb-a9260.c left in tree.
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Merging crypto/master
Merging sound/for-next
CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
CONFLICT (content): Merge conflict in sound/mips/Kconfig
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
CONFLICT (content): Merge conflict in drivers/mmc/core/sd.c
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/irqs.h
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/fbdev-next
CONFLICT (content): Merge conflict in drivers/video/Kconfig
Merging viafb/viafb-next
Merging omap_dss2/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-2430sdp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-apollon.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-h4.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ldp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51.c
CONFLICT (delete/modify): drivers/video/omap/lcd_apollon.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_apollon.c left in tree.
CONFLICT (delete/modify): drivers/video/omap/lcd_ldp.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_ldp.c left in tree.
CONFLICT (delete/modify): drivers/video/omap/lcd_overo.c deleted in omap_dss2/for-next and modified in HEAD. Version HEAD of drivers/video/omap/lcd_overo.c left in tree.
$ git rm -f drivers/video/omap/lcd_apollon.c drivers/video/omap/lcd_ldp.c drivers/video/omap/lcd_overo.c
Merging voltage/for-next
Merging security/next
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging iommu/next
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
CONFLICT (delete/modify): arch/arm/mach-nuc93x/time.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/arm/mach-nuc93x/time.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/Kconfig
$ git rm -f arch/arm/mach-nuc93x/time.c
Merging audit/for-next
Merging pm/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging edac-amd/for-next
Merging devicetree/devicetree/next
$ git reset --hard HEAD^
Merging refs/next/20111004/devicetree
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/iommu/Makefile
Applying: llist: add back llist_add_batch and llist_del_first
Merging rcu/rcu/next
Merging kvm/kvm-updates/3.2
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-pvhvm/linux-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
CONFLICT (content): Merge conflict in drivers/mfd/wm831x-spi.c
Merging driver-core/driver-core-next
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/devices.c
Merging tty/tty-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/mac80211_if.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c
CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_maiRecorded preimage for 'drivers/staging/brcm80211/brcmsmac/mac80211_if.c'
CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
$ git rm -f drivers/staging/rtl8192e/r8192E_core.c
Merging bkl-config/config
Merging tmem/tmem
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging hwspinlock/linux-next
Merging pinctrl/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-u300/core.c
Merging moduleh/for-sfr
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
CONFLICT (content): Merge conflict in drivers/mfd/twl6030-irq.c
CONFLICT (content): Merge conflict in drivers/misc/altera-stapl/altera.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
CONFLICT (content): Merge conflict in drivers/scsi/libfc/fc_lport.c
CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad7152.c
CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad7291.c
CONFLICT (delete/modify): drivers/staging/iio/adc/ad7745.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/iio/adc/ad7745.c left in tree.
CONFLICT (delete/modify): drivers/staging/iio/industrialio-ring.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/staging/iio/industrialio-ring.c left in tree.
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
CONFLICT (content): Merge conflict in sound/soc/soc-io.c
$ git rm -f drivers/staging/iio/adc/ad7745.c drivers/staging/iio/industrialio-ring.c
Applying: drivers/md: change module.h -> export.h in persistent-data/dm-*
Applying: block/bsg-lib.c: change module.h -> export.h in power/common.c
Applying: drivers/base: change module.h -> export.h in power/common.c
Applying: rtlwifi: use of module_param requires the inclusion of moduleparam.h
Applying: mmc: using module_param requires the inclusion of moduleparam.h
Applying: NFC: use of module facilities requires the inclusion of module.h
Applying: block/mtip32xx: include module.h for its utilities
Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
Applying: PM QoS: include export.h in qos.c for EXPORT_SYMBOL
Applying: net: Add export.h to nfc/nci/core.c
Applying: scsi: Add export.h to drivers/scsi/libsas/sas_host_smp.c
Applying: drivers/net: Add module.h to wireless/ath/ath6kl/sdio.c
Applying: drivers/net: wireless/ath/ath5k/debug.c does not need module.h
Applying: drivers/bcma: driver_chipcommon_pmu.c needs export.h for EXPORT_SYMBOL
Applying: drivers/base: Add export.h to regmap/regcache.c
Applying: staging: Add export.h to rts5139/rts51x_scsi.c
Applying: pinctrl: EXPORT_SYMBOL needs export.h
Applying: staging: Add export.h for EXPORT_SYMBOL to drivers/staging/iio/industrialio-buffer.c
Applying: ath6kl: THIS_MODULES needs export.h
Applying: ath6kl: module_param needs the inclusion of moduleparam.h
Merging kvmtool/master
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master
$ git checkout akpm
Applying: include/linux/dmar.h: forward-declare struct acpi_dmar_header
Applying: drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debug
Applying: drm: fix kconfig unmet dependency warning
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
Applying: x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: hp_accel: Add a new PNP id
Applying: hp_accel: Add axis-mapping for HP ProBook / EliteBook
Applying: x86: fix mmap random address range
Applying: arch/x86/kernel/e820.c: eliminate bubble sort from sanitize_e820_map
Applying: vrtc: change its year offset from 1960 to 1972
Applying: x86: rtc: don't register a platform RTC device for Intel MID platforms
Applying: mrst: battery fixes
Applying: drivers/power/intel_mid_battery.c: fix build
Applying: x86,mrst: add mapping for bma023
Applying: arch/x86/kernel/e820.c: quiet sparse noise about plain integer as NULL pointer
Applying: arch/x86/kernel/ptrace.c: quiet sparse noise
Applying: arch/x86/mm/pageattr.c: quiet sparse noise; local functions should be static
Applying: x86: tlb flush avoid superflous leave_mm()
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: audit: always follow va_copy() with va_end()
Applying: btrfs: don't dereference extent_mapping if NULL
Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: brlocks/lglocks: clean up code
Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
Applying: ipc/mqueue: cleanup definition names and locations
Applying: ipc/mqueue: switch back to using non-max values on create
Applying: ipc/mqueue: enforce hard limits
Applying: ipc/mqueue: update maximums for the mqueue subsystem
Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
Applying: unicore32, exec: remove redundant set_fs(USER_DS)
Applying: drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h: remove unused macro pr_fmt()
Applying: debugobjects: extend debugobjects to assert that an object is initialized
Applying: kernel/timer.c: use debugobjects to catch deletion of uninitialized timers
Applying: ext4: use proper little-endian bitops
Applying: ocfs2: avoid unaligned access to dqc_bitmap
Applying: parisc, exec: remove redundant set_fs(USER_DS)
Applying: drivers/firmware/dmi_scan.c: make dmi_name_in_vendors more focused
Applying: scsi: fix a header to include linux/types.h
Applying: drivers/scsi/megaraid.c: fix sparse warnings
Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
Applying: drivers/scsi/sd.c: use ida_simple_get() and ida_simple_remove() in place of boilerplate code
Applying: drivers/scsi/osd/osd_uld.c: use ida_simple_get() to handle id
Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
Applying: drivers/message/fusion/mptbase.c: ensure NUL-termination of MptCallbacksName elements
Applying: loop: prevent information leak after failed read
Applying: loop: cleanup set_status interface
Applying: loop-cleanup-set_status-interface-checkpatch-fixes
Applying: cciss: add half second delay to PCI PM reset code
Applying: cciss: auto engage SCSI mid layer at driver load time
Applying: kmod: prevent kmod_loop_msg overflow in __request_module()
Applying: slab: add taint flag outputting to debug paths.
Applying: slub: add taint flag outputting to debug paths
Applying: drivers/tty/serial/pch_uart.c: add console support
Applying: Cross Memory Attach
Applying: cross-memory-attach-update
Applying: cross-memory-attach-v4
Applying: mm: compaction: trivial clean up in acct_isolated()
Applying: mm: change isolate mode from #define to bitwise type
Applying: mm-change-isolate-mode-from-define-to-bitwise-type-fix
Applying: mm: compaction: make isolate_lru_page() filter-aware
Applying: mm-compaction-make-isolate_lru_page-filter-aware-fix
Applying: mm: zone_reclaim: make isolate_lru_page() filter-aware
Applying: mm-zone_reclaim-make-isolate_lru_page-filter-aware-fix
Applying: mm: migration: clean up unmap_and_move()
Applying: radix_tree: clean away saw_unset_tag leftovers
Applying: vmscan: add block plug for page reclaim
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
Applying: mm/page-writeback.c: document bdi_min_ratio
Applying: oom: avoid killing kthreads if they assume the oom killed thread's mm
Applying: oom: remove oom_disable_count
Applying: oom: fix race while temporarily setting current's oom_score_adj
Applying: tmpfs: add "tmpfs" to the Kconfig prompt to make it obvious.
Applying: mm: output a list of loaded modules when we hit bad_page()
Applying: mm: vmscan: drop nr_force_scan[] from get_scan_count
Applying: mm: distinguish between mlocked and pinned pages
Applying: mm: add comments to explain mm_struct fields
Applying: mm-add-comments-to-explain-mm_struct-fields-fix
Applying: mm: vmscan: do not writeback filesystem pages in direct reclaim
Applying: mm: vmscan: remove dead code related to lumpy reclaim waiting on pages under writeback
Applying: xfs: warn if direct reclaim tries to writeback pages
Applying: ext4: warn if direct reclaim tries to writeback pages
Applying: mm: vmscan: do not writeback filesystem pages in kswapd except in high priority
Applying: mm: vmscan: throttle reclaim if encountering too many dirty pages under writeback
Applying: mm-vmscan-throttle-reclaim-if-encountering-too-many-dirty-pages-under-writeback-update
Applying: mm: vmscan: immediately reclaim end-of-LRU dirty pages when writeback completes
Applying: vmscan: count pages into balanced for zone with good watermark
Applying: mm/debug-pagealloc.c: use plain __ratelimit() instead of printk_ratelimit()
Applying: lib/string.c: introduce memchr_inv()
Applying: lib-stringc-introduce-memchr_inv-fix-kernel-doc-for-memchr_inv
Applying: mm/debug-pagealloc.c: use memchr_inv
Applying: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: vmscan-use-atomic-long-for-shrinker-batching-fix
Applying: mm: avoid null pointer access in vm_struct via /proc/vmallocinfo
Applying: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: memblock: add memblock_start_of_DRAM()
Applying: memblock: add NO_BOOTMEM config symbol
Applying: mremap: check for overflow using deltas
Applying: mremap: avoid sending one IPI per page
Applying: thp: mremap support and TLB optimization
Applying: thp-mremap-support-and-tlb-optimization-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix
Applying: thp-mremap-support-and-tlb-optimization-fix-fix-fix
Applying: include/asm-generic/page.h: calculate virt_to_page and page_to_virt via predefined macro
Applying: mm: iov_iter: have iov_iter_advance() decrement nr_segs appropriately
Applying: mm: neaten warn_alloc_failed
Applying: mm-neaten-warn_alloc_failed-fix
Applying: debug-pagealloc: add support for highmem pages
Applying: debug-pagealloc-add-support-for-highmem-pages-fix
Applying: kswapd: avoid unnecessary rebalance after an unsuccessful balancing
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm/memblock.c: small function definition fixes
Applying: mm: compaction: compact unevictable pages
Applying: mm-compaction-compact-unevictable-pages-checkpatch-fixes
Applying: mm: compaction: accounting fix
Applying: kswapd: assign new_order and new_classzone_idx after wakeup in sleeping
Applying: mm: fix page-faults detection in swap-token logic
Applying: mm/vmalloc.c: report more vmalloc failures
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: mm: thp: tail page refcounting fix
Applying: thp-tail-page-refcounting-fix-6
Applying: ksm: fix the comment of try_to_unmap_one()
Applying: mm-add-comment-explaining-task-state-setting-in-bdi_forker_thread-fix
Applying: vmscan: fix shrinker callback bug in fs/super.c
Applying: mm/mmap.c: eliminate the ret variable from mm_take_all_locks()
Applying: mm-mmapc-eliminate-the-ret-variable-from-mm_take_all_locks-fix
Applying: fs/buffer.c: add device information for error output in __find_get_block_slow()
Applying: HWPOISON: convert pr_debug()s to pr_info()s
Applying: mm: compaction: make compact_zone_order() static
Applying: mm: fix kunmap_high() comment
Applying: vmscan.c: fix invalid strict_strtoul() check in write_scan_unevictable_node()
Applying: mm: disable user interface to manually rescue unevictable pages
Applying: mm/memblock.c: quiet sparse noise
Applying: mm/thrash.c: quiet sparse noise
Applying: mm/mempolicy.c: quiet sparse noise
Applying: mm/huge_memory.c: quiet sparse noise
Applying: vmscan: add barrier to prevent evictable page in unevictable list
Applying: selinuxfs: remove custom hex_to_bin()
Applying: include/linux/security.h: fix security_inode_init_security() arg
Applying: hpet: factor timer allocate from open
Applying: alpha: wire up accept4 syscall
Applying: alpha: wire up sendmmsg syscall
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: fs/pipe.c: add ->statfs callback for pipefs
Applying: lib/Kconfig.debug: fix help message for DEFAULT_HUNG_TASK_TIMEOUT
Applying: hwmon: convert idr to ida and use ida_simple interface
Applying: drivers/hwmon/hwmon.c: convert idr to ida and use ida_simple_get()
Applying: lis3lv02d: avoid divide by zero due to unchecked
Applying: lis3: update maintainer information
Applying: lis3: add support for HP EliteBook 2730p
Applying: lis3: add support for HP EliteBook 8540w
Applying: hp_accel: add HP ProBook 655x
Applying: lis3: free regulators if probe() fails
Applying: lis3: use consistent naming of variables
Applying: lis3: change exported function to use passed parameter
Applying: lis3: remove the references to the global variable in core driver
Applying: lis3-remove-the-references-to-the-global-variable-in-core-driver-fix
Applying: lis3lv02d: make regulator API usage unconditional
Applying: driver/misc/fsa9480.c fix potential null-pointer dereference
Applying: stop_machine: make stop_machine safe and efficient to call early
Applying: stop_machine-make-stop_machine-safe-and-efficient-to-call-early-v3.
Applying: watchdog: move watchdog_*_all_cpus under CONFIG_SYSCTL
Applying: dynamic_debug: consolidate repetitive struct _ddebug descriptor definitions
Applying: dynamic_debug: remove num_enabled accounting
Applying: dynamic_debug: use a single printk() to emit messages
Applying: dynamic_debug: fix undefined reference to `__netdev_printk'
Applying: printk: add module parameter ignore_loglevel to control ignore_loglevel
Applying: printk: add ignore_loglevel as module parameter
Applying: printk: add console_suspend module parameter
Applying: printk: fix bounds checking for log_prefix
Applying: printk: remove bounds checking for log_prefix
Applying: treewide: use __printf not __attribute__((format(printf,...)))
Applying: treewide-use-__printf-not-__attribute__formatprintf-fix
Applying: treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes
Applying: fs/namei.c: remove unused getname_flags()
Applying: poll: add poll_requested_events() function
Applying: MAINTAINERS: add new entry for ideapad-laptop
Applying: video/backlight: remove obsolete cleanup for clientdata
Applying: backlight: fix broken regulator API usage in l4f00242t03
Applying: drivers/video/backlight/l4f00242t03.c: use gpio_request_one() to simplify error handling
Applying: backlight: rename corgibl_limit_intensity() to genericbl_limit_intensity()
Applying: leds: Renesas TPU LED driver
Applying: leds-renesas-tpu-led-driver-v2-fix
Applying: drivers/leds/led-triggers.c: fix memory leak
Applying: drivers/leds/leds-lm3530.c: remove obsolete cleanup for clientdata
Applying: drivers/leds/leds-renesas-tpu.c: update driver to use workqueue
Applying: drivers/leds/leds-renesas-tpu.c: move Renesas TPU LED driver platform data
Applying: drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
Applying: lib/kstrtox: common code between kstrto*() and simple_strto*() functions
Applying: lib/spinlock_debug.c: print owner on spinlock lockup
Applying: lib/bitmap.c: quiet sparse noise about address space
Applying: lib-bitmapc-quiet-sparse-noise-about-address-space-fix
Applying: lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
Applying: lib/idr.c: fix comment for ida_get_new_above()
Applying: llist: using in_nmi requires including hardirq.h
Applying: llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
Applying: kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
Applying: lib/crc: add slice by 8 algorithm to crc32.c
Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
Applying: epoll: fix spurious lockdep warnings
Applying: epoll: limit paths
Applying: binfmt_elf: fix PIE execution with randomization disabled
Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
Applying: oprofilefs: handle zero-length writes
Applying: drivers/rtc/class.c: convert idr to ida and use ida_simple_get()
Applying: rtc: add initial support for mcp7941x parts
Applying: drivers/rtc/rtc-mc13xxx.c: move probe and remove callbacks to .init.text and .exit.text
Applying: minix: describe usage of different magic numbers
Applying: cgroups: more safe tasklist locking in cgroup_attach_proc
Applying: cgroups: don't attach task to subsystem if migration failed
Applying: cgroup/kmemleak: Annotate alloc_page() for cgroup allocations
Applying: cgroups: add res_counter_write_u64() API
Applying: cgroups: new resource counter inheritance API
Applying: cgroups: add previous cgroup in can_attach_task/attach_task callbacks
Applying: cgroups: new cancel_attach_task() subsystem callback
Applying: cgroups: ability to stop res charge propagation on bounded ancestor
Applying: cgroups: add res counter common ancestor searching
Applying: res_counter: allow charge failure pointer to be null
Applying: cgroups: pull up res counter charge failure interpretation to caller
Applying: cgroups: allow subsystems to cancel a fork
Applying: cgroups: add a task counter subsystem
Applying: memcg: rename mem variable to memcg
Applying: memcg: fix oom schedule_timeout()
Applying: memcg: replace ss->id_lock with a rwlock
Applying: memcg: do not expose uninitialized mem_cgroup_per_node to world
Applying: memcg: skip scanning active lists based on individual size
Applying: memcg-skip-scanning-active-lists-based-on-individual-size-fix
Applying: memcg: close race between charge and putback
Applying: memcg: Fix race condition in memcg_check_events() with this_cpu usage
Applying: cpusets: avoid looping when storing to mems_allowed if one node remains set
Applying: procfs: report EISDIR when reading sysctl dirs in proc
Applying: proc: fix races against execve() of /proc/PID/fd**
Applying: proc-fix-races-against-execve-of-proc-pid-fd-fix
Applying: proc: force dcache drop on unauthorized access
Applying: ipc-introduce-shm_rmid_forced-sysctl-testing
Applying: init: add root=PARTUUID=UUID/PARTNROFF=%d support
Applying: init-add-root=partuuid=uuid-partnroff=%d-support-fix
Applying: drivers/rapidio/rio-scan.c: use discovered bit to test if enumeration is complete
Applying: arch/powerpc/sysdev/fsl_rio.c: release rapidio port I/O region resource if port failed to initialize
Applying: RapidIO: add mport driver for Tsi721 bridge
Applying: RapidIO: Tsi721 driver - fixes for the initial release
Applying: RapidIO: fix potential null deref in rio_setup_device()
Applying: drivers/net/rionet.c: fix ethernet address macros for LE platforms
Applying: sysctl: add support for poll()
Applying: sysctl-add-support-for-poll-fix
Applying: sysctl: make CONFIG_SYSCTL_SYSCALL default to n
Applying: pps: default echo function
Applying: pps: new client driver using GPIO
Applying: pps-new-client-driver-using-gpio-fix
Applying: pps gpio client: add missing dependency
Applying: w1: ds2760 and ds2780, use ida for id and ida_simple_get() to get it
Applying: drivers/power/ds2780_battery.c: create central point for calling w1 interface
Applying: drivers/power/ds2780_battery.c: add a nolock function to w1 interface
Applying: drivers/power/ds2780_battery.c: fix deadlock upon insertion and removal
Applying: drivers/w1/w1_int.c: multiple masters used same init_name
Applying: aio: allocate kiocbs in batches
Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
Applying: dio: separate fields only used in the submission path from struct dio
Applying: dio-separate-fields-only-used-in-the-submission-path-from-struct-dio-checkpatch-fixes
Applying: dio: fix a wrong comment
Applying: dio: rearrange fields in dio/dio_submit to avoid holes
Applying: dio: use a slab cache for struct dio
Applying: dio: separate map_bh from dio
Applying: dio: inline the complete submission path
Applying: dio-inline-the-complete-submission-path-v2-checkpatch-fixes
Applying: dio: merge direct_io_walker() into __blockdev_direct_IO()
Applying: dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes
Applying: dio: remove unnecessary dio argument from dio_pages_present()
Applying: dio: remove unused dio parameter from dio_bio_add_page()
Applying: vfs: cache request_queue in struct block_device
Applying: dio: optimize cache misses in the submission path
Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
Applying: dio: using prefetch requires including prefetch.h
Merging akpm
Applying: ipc/mqueue: vlammoc requires vmalloc.h
Applying: cgroups: ERR_PTR needs err.h
Applying: bna: Multiple Definition and Interface Setup Fix

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

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

end of thread, other threads:[~2021-10-07  3:13 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-05  8:06 linux-next: Tree for Oct 5 Stephen Rothwell
2021-10-05 20:46 ` linux-next: Tree for Oct 5 (warnings: a. trace; b. mm/migrate) Randy Dunlap
2021-10-06 14:52   ` Dave Hansen
2021-10-06 14:56     ` Steven Rostedt
2021-10-06 16:39       ` Randy Dunlap
2021-10-06 18:16         ` Dave Hansen
2021-10-06 16:33     ` Randy Dunlap
2021-10-06 21:22   ` Steven Rostedt
2021-10-06 21:32     ` Randy Dunlap
2021-10-06 22:06       ` Steven Rostedt
2021-10-07  1:10       ` Steven Rostedt
2021-10-07  3:13         ` Randy Dunlap
  -- strict thread matches above, loose matches on Subject: below --
2018-10-05  6:39 linux-next: Tree for Oct 5 Stephen Rothwell
2018-10-05 13:48 ` Guenter Roeck
2016-10-05  5:14 Stephen Rothwell
2012-10-05  4:54 Stephen Rothwell
2011-10-05  8:37 Stephen Rothwell
2011-10-05 12:09 ` Valdis.Kletnieks
2011-10-05 12:36   ` Stephen Rothwell
2011-10-05 13:17     ` Valdis.Kletnieks

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).