linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for Nov 4
@ 2021-11-04  4:02 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2021-11-04  4:02 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20211103:

The arm64 tree gained a conflict against Linus' tree.

The drm-misc tree has reacquired a build failure so I applied te same patch.

The input tree gained a conflict against Linus' tree.

I have disabled the ntfs file system write capabaility for now as it
fails for builds with 64k pages.

Non-merge commits (relative to Linus' tree): 5095
 4870 files changed, 231022 insertions(+), 110253 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 343 trees (counting Linus' and 92 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 (d4ec3d5535c7 Merge tag 'vfio-v5.16-rc1' of git://github.com/awilliam/linux-vfio)
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 (b9cac915c541 ARC: thread_info.h: correct two typos in a comment)
Merging arm-current/fixes (00568b8a6364 ARM: 9148/1: handle CONFIG_CPU_ENDIAN_BE32 in arch/arm/kernel/head.S)
Merging arm64-fixes/for-next/fixes (596143e3aec3 acpi/arm64: fix next_platform_timer() section mismatch error)
Merging arm-soc-fixes/arm/fixes (76f79231666a Merge tag 'soc-fsl-fix-v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/fixes)
Merging drivers-memory-fixes/fixes (6880fa6c5660 Linux 5.15-rc1)
Merging m68k-current/for-linus (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1)
Merging powerpc-fixes/fixes (d853adc7adf6 powerpc/pseries/iommu: Create huge DMA window if no MMIO32 is present)
Merging s390-fixes/fixes (8b7216439e2e s390: add Alexander Gordeev as reviewer)
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 (92f62485b371 net: dsa: felix: fix broken VLAN-tagged PTP under VLAN-aware bridge)
Merging bpf/master (c08455dec5ac selftests/bpf: Verifier test on refill from a smaller spill)
Merging ipsec/master (93ec1320b017 xfrm: fix rcu lock in xfrm_notify_userpolicy())
Merging netfilter/master (2199f562730d ipvs: autoload ipvs on genl access)
Merging ipvs/master (2199f562730d ipvs: autoload ipvs on genl access)
Merging wireless-drivers/master (603a1621caa0 mwifiex: avoid null-pointer-subtraction warning)
Merging mac80211/master (689a0a9f505f cfg80211: correct bridge/4addr mode check)
Merging rdma-fixes/for-rc (4f960393a0ee RDMA/qedr: Fix NULL deref for query_qp on the GSI QP)
Merging sound-current/for-linus (1278cc5ac2f9 ALSA: hda/realtek: Headset fixup for Clevo NH77HJQ)
Merging sound-asoc-fixes/for-linus (b017008c44f6 Merge remote-tracking branch 'asoc/for-5.16' into asoc-linus)
Merging regmap-fixes/for-linus (38a4b4fb7c73 Merge remote-tracking branch 'regmap/for-5.15' into regmap-linus)
Merging regulator-fixes/for-linus (519d81956ee2 Linux 5.15-rc6)
Merging spi-fixes/for-linus (d81d0e41ed5f spi: spl022: fix Microwire full duplex mode)
Merging pci-current/for-linus (e4e737bb5c17 Linux 5.15-rc2)
Merging driver-core.current/driver-core-linus (519d81956ee2 Linux 5.15-rc6)
Merging tty.current/tty-linus (519d81956ee2 Linux 5.15-rc6)
Merging usb.current/usb-linus (519d81956ee2 Linux 5.15-rc6)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (519d81956ee2 Linux 5.15-rc6)
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 (519d81956ee2 Linux 5.15-rc6)
Merging iio-fixes/fixes-togreg (b762f932ef0e iio: dln2: Check return value of devm_iio_trigger_register())
Merging char-misc.current/char-misc-linus (519d81956ee2 Linux 5.15-rc6)
Merging soundwire-fixes/fixes (6880fa6c5660 Linux 5.15-rc1)
Merging thunderbolt-fixes/fixes (8bb7eca972ad Linux 5.15)
Merging input-current/for-linus (a02dcde595f7 Input: touchscreen - avoid bitwise vs logical OR warning)
Merging crypto-current/master (39ef08517082 crypto: testmgr - fix wrong key length for pkcs1pad)
Merging vfio-fixes/for-linus (42de956ca7e5 vfio/ap_ops: Add missed vfio_uninit_group_dev())
Merging kselftest-fixes/fixes (519d81956ee2 Linux 5.15-rc6)
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 (3ad60b4b3570 reset: socfpga: add empty driver allowing consumers to probe)
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 (80d680fdccba ARM: dts: omap3430-sdp: Fix NAND device node)
Merging kvm-fixes/master (ca5e83eddc8b Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu)
Merging hwmon-fixes/hwmon (ada61aa0b118 hwmon: Fix possible memleak in __hwmon_device_register())
Merging nvdimm-fixes/libnvdimm-fixes (3dd60fb9d95d nvdimm/pmem: stop using q_usage_count as external pgmap refcount)
Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
Merging btrfs-fixes/next-fixes (ba9bc05f3655 Merge tag 'v5.15' into next-fixes)
Merging vfs-fixes/fixes (25f54d08f12f autofs: fix wait name hash calculation in autofs_wait())
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 (7df227847ab5 platform/x86: int1092: Fix non sequential device mode handling)
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 (09d9e4d04187 scsi: ufs: ufshpb: Remove HPB2.0 flows)
Merging drm-fixes/drm-fixes (8bb7eca972ad Linux 5.15)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (8bb7eca972ad Linux 5.15)
Merging mmc-fixes/fixes (90935eb303e0 mmc: tmio: reenable card irqs after the reset callback)
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 (8017c99680fa hyperv/vmbus: include linux/bitops.h)
Merging soc-fsl-fixes/fix (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context)
Merging risc-v-fixes/fixes (54c5639d8f50 riscv: Fix asan-stack clang build)
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 (519d81956ee2 Linux 5.15-rc6)
Merging gpio-brgl-fixes/gpio/for-current (c0eee6fbfa2b gpio: mlxbf2.c: Add check for bgpio_init failure)
Merging gpio-intel-fixes/fixes (8bb7eca972ad Linux 5.15)
Merging pinctrl-intel-fixes/fixes (8bb7eca972ad Linux 5.15)
Merging erofs-fixes/fixes (1eceffaec88b erofs: fix unsafe pagevec reuse of hooked pclusters)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (519d81956ee2 Linux 5.15-rc6)
Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
Merging memblock-fixes/fixes (87066fdd2e30 Revert "mm/secretmem: use refcount_t instead of atomic_t")
Merging cel-fixes/for-rc (8bb7eca972ad Linux 5.15)
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 (8bb7eca972ad Linux 5.15)
Merging efi-fixes/urgent (38fa3206bf44 efi: Change down_interruptible() in virt_efi_reset_system() to down_trylock())
Merging drm-misc-fixes/for-linux-next-fixes (8244a3bc27b3 drm/prime: Fix use after free in mmap with drm_gem_ttm_mmap)
Merging kbuild/for-next (7c5c49dc2b80 [for -next only] kconfig: generate include/generated/rustc_cfg)
Merging perf/perf/core (ba4026b09d83 Revert "perf bench futex: Add support for 32-bit systems with 64-bit time_t")
Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn)
Merging dma-mapping/for-next (9fbd8dc19aa5 dma-mapping: use 'bitmap_zalloc()' when applicable)
Merging asm-generic/master (7efbbe6e1414 qcom_scm: hide Kconfig symbol)
CONFLICT (content): Merge conflict in arch/riscv/Kconfig
Merging arc/for-next (6880fa6c5660 Linux 5.15-rc1)
Merging arm/for-next (2aa8f79c7509 Merge branch 'devel-stable' into for-next)
Merging arm64/for-next/core (b0f364414a23 arm64: arm64_ftr_reg->name may not be a human-readable string)
CONFLICT (content): Merge conflict in arch/arm64/kernel/stacktrace.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/stacktrace.h
Merging arm-perf/for-next/perf (e656972b6986 drivers/perf: Improve build test coverage)
Merging arm-soc/for-next (fdf79096aec7 Merge branch 'arm/drivers' into for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
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 (9d4a146c082c Merge branches 'dt-for-v5.16' and 'defconfig-for-v5.16' into for-next)
Merging at91/at91-next (f3c0366411d6 ARM: dts: at91: sama7g5-ek: use blocks 0 and 1 of TCB0 as cs and ce)
Merging drivers-memory/for-next (0fcbc3b7bcea Merge branch 'mem-ctrl-next' into for-next)
Merging imx-mxs/for-next (8bd7cd1cc7f0 Merge branch 'imx/maintainers' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (0efac36e9559 Merge branch 'v5.16-tmp/dts64' into for-next)
Merging mvebu/for-next (04e78a787b74 arm/arm64: dts: Enable 2.5G Ethernet port on CN9130-CRB)
Merging omap/for-next (92d190433bd8 Merge branch 'omap-for-v5.16/gpmc' into for-next)
Merging qcom/for-next (bbe9515ab088 Merge branches 'arm64-defconfig-for-5.16', 'arm64-for-5.16', 'drivers-for-5.16' and 'dts-for-5.16' into for-next)
Merging raspberrypi/for-next (a036b0a5d7d6 ARM: dts: bcm2711-rpi-4-b: Fix usb's unit address)
Merging renesas/next (525a6b4bd53f Merge branch 'renesas-arm-dt-for-v5.16' into renesas-next)
Merging reset/reset/next (8c81620ac1ac reset: mchp: sparx5: Extend support for lan966x)
Merging rockchip/for-next (cc3bcb015bb1 Merge branch 'v5.16-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (0d5808cf190b Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (9c8df6432a73 Merge branch 'for-next/ffa' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (d4b3aaf0f90b ARM: dts: stm32: use usbphyc ck_usbo_48m as USBH OHCI clock on stm32mp151)
Merging sunxi/sunxi/for-next (7fb77af71236 Merge branch 'sunxi/dt-for-5.16' into sunxi/for-next)
Merging tegra/for-next (bbd827b4de7e Merge branch for-5.16/arm64/defconfig into for-next)
Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next)
Merging ti-k3-new/ti-k3-next (f46d16cf5b43 arm64: dts: ti: k3-j721e-sk: Add DDR carveout memory nodes)
Merging xilinx/for-next (326b5e9db528 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (e2ceaa867d26 Merge branches 'clk-composite-determine-fix', 'clk-allwinner', 'clk-amlogic' and 'clk-samsung' into clk-next)
Merging clk-imx/for-next (e8271eff5d8c clk: imx: Make CLK_IMX8ULP select MXC_CLK)
Merging clk-renesas/renesas-clk (2bd9feed2316 clk: renesas: r8a779[56]x: Add MLP clocks)
Merging clk-samsung/for-next (651521d396a8 clk: samsung: remove __clk_lookup() usage)
Merging csky/linux-next (e21e52ad1e01 csky: Make HAVE_TCM depend on !COMPILE_TEST)
Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs)
Merging m68k/for-next (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1)
Merging m68knommu/for-next (6dbe88e93c35 m68knommu: Remove MCPU32 config symbol)
Merging microblaze/next (43bdcbd50043 microblaze: timer: Remove unused properties)
Merging mips/mips-next (36de23a4c5f0 MIPS: Cobalt: Explain GT64111 early PCI fixup)
Merging nds32/next (07cd7745c6f2 nds32/setup: remove unused memblock_region variable in setup_memory())
CONFLICT (content): Merge conflict in arch/nds32/Kconfig
CONFLICT (content): Merge conflict in arch/nds32/Kbuild
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
Merging openrisc/for-next (27dff9a9c247 openrisc: fix SMP tlb flush NULL pointer dereference)
Merging parisc-hd/for-next (a1bd0b2ed2b7 parisc: Fix code/instruction patching on PA1.x machines)
Merging powerpc/next (81291383ffde powerpc/32e: Ignore ESR in instruction storage interrupt handler)
Merging soc-fsl/next (54c8b5b6f8a8 soc: fsl: dpio: rename the enqueue descriptor variable)
Merging risc-v/for-next (ffa7a9141bb7 riscv: defconfig: enable DRM_NOUVEAU)
CONFLICT (content): Merge conflict in arch/riscv/Makefile
CONFLICT (content): Merge conflict in arch/riscv/Kconfig
Merging s390/for-next (4ab5b2549146 Merge branch 'features' into for-next)
Applying: Upcoming merge conflict between ftrace and s390 trees
Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size)
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 (ab6ff1fda1e8 uml: x86: add FORCE to user_constants.h)
Merging xtensa/xtensa-for-next (bd47cdb78997 xtensa: move section symbols to asm/sections.h)
Merging pidfd/for-next (61bc346ce64a uapi/linux/prctl: provide macro definitions for the PR_SCHED_CORE type argument)
Merging fscrypt/master (b7e072f9b77f fscrypt: improve a few comments)
Merging fscache/fscache-next (8bb7eca972ad Linux 5.15)
Merging afs/afs-next (52af7105eceb afs: Set mtime from the client for yfs create operations)
Merging btrfs/for-next (ec522ac87632 Merge branch 'for-next-resolved' into for-next-20211102)
Merging ceph/master (324bfaa1a6cc libceph: drop ->monmap and err initialization)
Merging cifs/for-next (d8849ebcfd1c cifs: for compound requests, use open handle if possible)
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 (a0961f351d82 erofs: don't trigger WARN() when decompression fails)
Merging exfat/dev (0df2d764b979 exfat: reuse exfat_inode_info variable instead of calling EXFAT_I())
Merging ext3/for_next (697a6e3118ed Pull a few fixups for filesystem error reporting series.)
Merging ext4/dev (916ff8d5ea0e ext4: prevent partial update of the extent blocks)
Merging f2fs/dev (261f6940554a F2FS: invalidate META_MAPPING before IPU/DIO write)
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
Merging fuse/for-next (712a951025c0 fuse: fix page stealing)
Merging gfs2/for-next (a5a8ea8f94e8 gfs2: Fix atomic_t bug in gfs2_instantiate)
Merging jfs/jfs-next (c48a14dca2cb JFS: fix memleak in jfs_mount)
Merging ksmbd/ksmbd-for-next (647bc03ba456 ksmbd: don't need 8byte alignment for request length in ksmbd_check_message)
Merging nfs/linux-next (576acc259146 nfs4: take a reference on the nfs_client when running FREE_STATEID)
Merging nfs-anna/linux-next (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers)
Merging nfsd/nfsd-next (6d91929a6fa6 nfsd: document server-to-server-copy parameters)
CONFLICT (content): Merge conflict in include/trace/events/sunrpc.h
Merging cel/for-next (c20106944eb6 NFSD: Keep existing listeners on portlist error)
Merging ntfs3/master (8607954cf255 fs/ntfs3: Check for NULL pointers in ni_try_remove_attr_list)
Merging orangefs/for-next (ac2c63757f4f orangefs: Fix sb refcount leak when allocate sb info failed.)
Merging overlayfs/overlayfs-next (9a2544037600 ovl: fix use after free in struct ovl_aio_req)
Merging ubifs/next (9aaa6cc099f6 ubifs: Document sysfs nodes)
Merging v9fs/9p-next (82f854eeef37 9p: fix a bunch of checkpatch warnings)
Merging xfs/for-next (2a09b575074f xfs: use swap() to make code cleaner)
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 (482e00075d66 fs: remove leftover comments from mandatory locking removal)
Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next)
Merging printk/for-next (eafd42c87753 Merge branch 'for-5.16-vsprintf-pgp' into for-next)
Merging pci/next (2f167b8a48d3 Merge branch 'remotes/lorenzo/pci/xgene')
Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long)
Merging hid/for-next (bbbd1fb77db5 Merge branch 'for-5.16/nintendo' into for-next)
Merging i2c/i2c/for-next (6bf9e6543811 Merge branch 'i2c/for-mergewindow' 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 (10f0d2ab9aa6 hwmon: (nct7802) Add of_node_put() before return)
Merging jc_docs/docs-next (603bdf5d6c09 kernel-doc: support DECLARE_PHY_INTERFACE_MASK())
Merging v4l-dvb/master (57c3b9f55ba8 media: venus: core: Add sdm660 DT compatible and resource struct)
Merging v4l-dvb-next/master (320510b91925 media: atomisp: get rid of two unused functions)
Merging pm/linux-next (464fddbba1df Merge tag 'pnp-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging cpufreq-arm/cpufreq/arm/linux-next (4a08e3271c55 cpufreq: Fix parameter in parse_perf_domain())
Merging cpupower/cpupower (79a0dc5530a9 tools: cpupower: fix typo in cpupower-idle-set(1) manpage)
Merging devfreq/devfreq-next (5cf79c293821 PM / devfreq: Strengthen check for freq_table)
Merging opp/opp/linux-next (7ca81b690e59 dt-bindings: opp: Allow multi-worded OPP entry name)
Merging thermal/thermal/linux-next (a67a46af4ad6 thermal/core: Deprecate changing cooling device state from userspace)
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (b87b1883efe3 fs: dlm: remove double list_first_entry call)
Merging rdma/for-next (f1a090f09f42 RDMA/core: Require the driver to set the IOVA correctly during rereg_mr)
Merging net-next/master (cc0356d6a02e Merge tag 'x86_core_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging bpf-next/for-next (cc0356d6a02e Merge tag 'x86_core_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging ipsec-next/master (ad57dae8a64d xfrm: Remove redundant fields and related parentheses)
Merging mlx5-next/mlx5-next (60dd57c74794 Merge brank 'mlx5_mkey' into rdma.git for-next)
Merging netfilter-next/master (d4a07dc5ac34 Merge branch 'SMC-tracepoints')
Merging ipvs-next/master (241eb3f3ee42 netfilter: ebtables: use array_size() helper in copy_{from,to}_user())
Merging wireless-drivers-next/master (2619f904b25c Merge tag 'iwlwifi-next-for-kalle-2021-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
Merging bluetooth/master (258f56d11bbb Bluetooth: aosp: Support AOSP Bluetooth Quality Report)
Merging mac80211-next/master (62bf703f4423 cfg80211: move offchan_cac_event to a dedicated work)
Merging mtd/mtd/next (c13de2386c78 mtd: core: don't remove debugfs directory if device is in use)
Merging nand/nand/next (fc9e18f9e987 mtd: rawnand: arasan: Prevent an unsupported configuration)
Merging spi-nor/spi-nor/next (df872ab1ffe4 mtd: spi-nor: nxp-spifi: Make use of the helper function devm_platform_ioremap_resource_byname())
Merging crypto/master (39ef08517082 crypto: testmgr - fix wrong key length for pkcs1pad)
Merging drm/drm-next (d9bd054177fb Merge tag 'amd-drm-next-5.16-2021-10-29' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
Merging drm-misc/for-linux-next (b3ec8cdf457e fbdev: Garbage collect fbdev scrolling acceleration, part 1 (from TODO list))
Merging amdgpu/drm-next (555fa6653eba drm/amdgpu: bump driver version for INFO SENSOR profile mode subquery)
Merging drm-intel/for-linux-next (1977e8eb40ed drm/i915: Fix type1 DVI DP dual mode adapter heuristic for modern platforms)
Merging drm-intel-gt/for-linux-next-gt (1977e8eb40ed drm/i915: Fix type1 DVI DP dual mode adapter heuristic for modern platforms)
Merging drm-tegra/drm/tegra/for-next (5dccbc9de8f0 drm/tegra: dc: rgb: Allow changing PLLD rate on Tegra30+)
Merging drm-msm/msm-next (02d44fde976a drm/msm/dp: fix missing #include)
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 (a8d880671c13 Merge remote-tracking branch 'regmap/for-5.16' into regmap-next)
Merging sound/for-next (1278cc5ac2f9 ALSA: hda/realtek: Headset fixup for Clevo NH77HJQ)
Merging sound-asoc/for-next (b017008c44f6 Merge remote-tracking branch 'asoc/for-5.16' into asoc-linus)
Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer)
Merging input/next (322a552e1955 Input: cap11xx - add support for cap1206)
CONFLICT (modify/delete): Documentation/devicetree/bindings/input/cap11xx.txt deleted in HEAD and modified in input/next. Version input/next of Documentation/devicetree/bindings/input/cap11xx.txt left in tree.
$ git rm -f Documentation/devicetree/bindings/input/cap11xx.txt
Applying: Input: cap11xx: fix for "dt-bindings: input: microchip,cap11xx: Convert txt bindings to yaml"
Merging block/for-next (48dd8b1e4917 Merge branch 'for-5.16/drivers' into for-next)
Merging device-mapper/for-next (7552750d0494 dm table: log table creation error code)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging libata/for-next (1af5f7af2484 pata_radisys: fix checking of DMA state)
Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug)
Merging mmc/next (348ecd61770f Merge branch 'fixes' into next)
Merging mfd/for-mfd-next (818ed35d6425 mfd: tps80031: Remove driver)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/brcm,cru.yaml
Merging backlight/for-backlight-next (3976e974df1f video: backlight: ili9320: Make ili9320_remove() return void)
Merging battery/for-next (22ad4f99f63f power: supply: bq25890: Fix initial setting of the F_CONV_RATE field)
Merging regulator/for-next (7492b724df4d Merge series "Remove TPS80031 driver" from Dmitry Osipenko <digetx@gmail.com>:)
Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
Merging apparmor/apparmor-next (4d47fbbe54bf apparmor: fix zero-length compiler warning in AA_BUG())
Merging integrity/next-integrity (32ba540f3c2a evm: mark evm_fixmode as __ro_after_init)
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 (15bf32398ad4 security: Return xattr name from security_dentry_init_security())
Merging smack/next (0934ad42bb2c smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi)
Merging tomoyo/master (7d2a07b76933 Linux 5.14)
Merging tpmdd/next (7eba41fe8c7b tpm_tis_spi: Add missing SPI ID)
Merging watchdog/master (c738888032ff watchdog: db8500_wdt: Rename symbols)
Merging iommu/next (52d96919d6a8 Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/smmu', 'arm/tegra', 'iommu/fixes', 'x86/amd', 'x86/vt-d' and 'core' into next)
CONFLICT (content): Merge conflict in arch/x86/include/asm/fpu/api.h
Applying: fix for "iommu/dart: Exclude MSI doorbell from PCIe device IOVA range"
Merging audit/next (d9516f346e8b audit: return early if the filter rule has a lower priority)
Merging devicetree/for-next (4c7a7d5086cd dt-bindings: net: ti,bluetooth: Document default max-speed)
Merging mailbox/mailbox-for-next (97961f78e8bc mailbox: imx: support i.MX8ULP S4 MU)
Merging spi/for-next (e6f98315aba2 Merge remote-tracking branch 'spi/for-5.16' into spi-next)
Merging tip/auto-latest (ea79c24a30aa Merge branch 'timers/urgent')
Merging clockevents/timers/drivers/next (eda9a4f7af6e clocksource/drivers/timer-ti-dm: Select TIMER_OF)
Merging edac/edac-for-next (f889e52436d6 Merge branch 'edac-urgent' into edac-for-next)
Merging irqchip/irq/irqchip-next (11e45471abea Merge branch irq/misc-5.16 into irq/irqchip-next)
Merging ftrace/for-next (67d4f6e3bf5d ftrace/samples: Add missing prototype for my_direct_func)
Merging rcu/rcu/next (587a7d1703f3 Merge branch 'kcsan.2021.09.13b' into HEAD)
Merging kvm/next (9c6eb531e760 Merge tag 'kvm-s390-next-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (5a2acbbb0179 Merge branch kvm/selftests/memslot 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 (3fd8417f2c72 KVM: s390: add debug statement for diag 318 CPNC data)
Merging xen-tip/linux-next (eae446b7654f x86/xen: remove 32-bit awareness from startup_xen)
Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next)
Merging workqueues/for-next (f9eaaa82b474 workqueue: doc: Call out the non-reentrance conditions)
Merging drivers-x86/for-next (97ae45953ea9 platform/x86: system76_acpi: Fix input device error handling)
Merging chrome-platform/for-next (297d34e73d49 platform/chrome: cros_ec_proto: Use ec_command for check_features)
Merging hsi/for-next (4ef69e17eb56 HSI: cmt_speech: unmark comments as kernel-doc)
Merging leds/for-next (97b31c1f8eb8 leds: trigger: Disable CPU trigger on PREEMPT_RT)
Merging ipmi/for-next (56d33754481f Merge tag 'drm-next-2021-11-03' of git://anongit.freedesktop.org/drm/drm)
Merging driver-core/driver-core-next (27e0bcd02990 device property: Drop redundant NULL checks)
Merging usb/usb-next (a0548b26901f usb: gadget: Mark USB_FSL_QE broken on 64-bit)
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (910c996335c3 USB: serial: keyspan: fix memleak on probe errors)
Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed)
Merging tty/tty-next (cc8d7b4aea79 tty: Fix extra "not" in TTY_DRIVER_REAL_RAW description)
Merging char-misc/char-misc-next (536de747bc48 comedi: dt9812: fix DMA buffers on stack)
CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
Merging extcon/extcon-next (9e6ef3a25e5e dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string)
Merging phy-next/next (b4dc97ab0a62 phy: Sparx5 Eth SerDes: Fix return value check in sparx5_serdes_probe())
Merging soundwire/next (abd9a6049bb5 soundwire: qcom: add debugfs entry for soundwire register dump)
Merging thunderbolt/next (0a0624a26f9c thunderbolt: Fix -Wrestrict warning)
Merging vfio/next (3bf1311f351e vfio/ccw: Convert to use vfio_register_emulated_iommu_dev())
Merging staging/staging-next (10508ae08ed8 staging: r8188eu: hal: remove goto statement and local variable)
Merging iio/togreg (12b6d77431f5 iio: adc: ina2xx: Avoid double reference counting from get_task_struct/put_task_struct())
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 (e06748539432 dmaengine: fsl-edma: support edma memcpy)
Merging cgroup/for-next (588e5d876648 cgroup: bpf: Move wrapper for __cgroup_bpf_*() to kernel/bpf/cgroup.c)
Merging scsi/for-next (3c7603727c3a Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
Merging scsi-mkp/for-next (a1efc896cb8a scsi: sr: Remove duplicate assignment)
Merging vhost/linux-next (47ed04961471 virtio_gpio: drop packed attribute)
Merging rpmsg/for-next (6ee5808de074 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 (585a07079909 gpio: realtek-otto: fix GPIO line IRQ offset)
Merging gpio-intel/for-next (8bb7eca972ad Linux 5.15)
Merging gpio-sim/gpio/gpio-sim (5065e08e4ef3 gpio: sim: fix missing unlock on error in gpio_sim_config_commit_item())
Merging pinctrl/for-next (a0f160ffcb83 pinctrl: add pinctrl/GPIO driver for Apple SoCs)
Merging pinctrl-intel/for-next (176412f8674b pinctrl: intel: Kconfig: Add configuration menu to Intel pin control)
Merging pinctrl-renesas/renesas-pinctrl (f4e260bffcf3 pinctrl: renesas: checker: Prefix common checker output)
Merging pinctrl-samsung/for-next (f9d8de699ac4 pinctrl: samsung: support ExynosAutov9 SoC pinctrl)
Merging pwm/for-next (3f2b16734914 pwm: mtk-disp: Implement atomic API .get_state())
Merging userns/for-next (9461af22c4e4 Merge of per_signal_struct_coredumps-for-v5.16, ucount-fixes-for-v5.16, and exit-cleanups-for-v5.16 for testing in linux-next)
CONFLICT (modify/delete): drivers/staging/r8188eu/core/rtw_mp.c deleted in HEAD and modified in userns/for-next. Version userns/for-next of drivers/staging/r8188eu/core/rtw_mp.c left in tree.
$ git rm -f drivers/staging/r8188eu/core/rtw_mp.c
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
Merging kselftest/next (f35dcaa0a8a2 selftests/core: fix conflicting types compile error for close_range())
Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next)
Merging coresight/next (561ced0bb90a arm64: errata: Enable TRBE workaround for write to out-of-range address)
Merging rtc/rtc-next (a5feda3b361e rtc: s3c: Add time range)
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 (1e6d69c7b9cd selftests/seccomp: Report event mismatches more clearly)
Merging kspp/for-next/kspp (879f756fa9bf Merge branches 'for-next/hardening', 'for-next/overflow' and 'for-next/thread_info/cpu' into for-next/kspp)
Merging kspp-gustavo/for-next/kspp (704f6142a903 firmware/psci: fix application of sizeof to pointer)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons)
Merging fsi/next (7cc2f34e1f4d fsi: sbefifo: Use interruptible mutex locking)
Merging slimbus/for-next (6880fa6c5660 Linux 5.15-rc1)
Merging nvmem/for-next (413333fd6a88 nvmem: imx-ocotp: add support for post processing)
Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1)
Merging hyperv/hyperv-next (285f68afa8b2 x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted)
Merging auxdisplay/auxdisplay (97fbb29fc1eb MAINTAINERS: Add DT Bindings for Auxiliary Display Drivers)
Merging kgdb/kgdb/for-next (b77dbc86d604 kdb: Adopt scheduler's task classification)
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 (52a5d80a2225 kunit: tool: fix typecheck errors about loading qemu configs)
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 (8c61951b372d Merge tag 'soundwire-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire 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 (988f45dfe7ea MAINTAINERS: Rust)
CONFLICT (content): Merge conflict in scripts/kconfig/confdata.c
CONFLICT (content): Merge conflict in scripts/Makefile.modfinal
CONFLICT (content): Merge conflict in Makefile
Applying: Kbuild: fix for "kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug"
Merging cxl/next (c6d7e1341cc9 ocxl: Use pci core's DVSEC functionality)
Merging folio/for-next (121703c1c817 mm/writeback: Add folio_write_one)
Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string)
CONFLICT (content): Merge conflict in arch/parisc/include/asm/bitops.h
Merging zstd/zstd-1.4.10 (464413496acb MAINTAINERS: Add maintainer entry for zstd)
Merging efi/next (720dff78de36 efi: Allow efi=runtime)
Merging unicode/for-next (e2a58d2d3416 unicode: only export internal symbols for the selftests)
CONFLICT (content): Merge conflict in fs/f2fs/sysfs.c
Applying: Mark NTFS_RW as BROKEN
Merging akpm-current/current (42ff691f7a36 kernel.h: split out instruction pointer accessors)
CONFLICT (content): Merge conflict in mm/mempolicy.c
CONFLICT (content): Merge conflict in mm/internal.h
CONFLICT (content): Merge conflict in mm/filemap.c
CONFLICT (content): Merge conflict in lib/bootconfig.c
CONFLICT (content): Merge conflict in kernel/sched/core.c
CONFLICT (content): Merge conflict in kernel/exit.c
CONFLICT (content): Merge conflict in include/linux/sched/mm.h
CONFLICT (content): Merge conflict in include/linux/migrate.h
CONFLICT (content): Merge conflict in arch/s390/kernel/setup.c
Applying: drm/locking: fix for name conflict
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (fd5916b5bc39 kasan: add kasan mode messages when kasan init)

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

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

* linux-next: Tree for Nov 4
@ 2022-11-04  5:21 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2022-11-04  5:21 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20221103:

The drm-misc tree gained a conflict against Linus' tree.

The ipmi tree gained a build failure so I used the version from
next-20221103.

The iio tree gained a conflict against the devicetree tree.

The iommufd tree gained a conflict against the iommu tree.

The mm tree still had its build failure but I replaced the reverts with
a supplied patch.

Non-merge commits (relative to Linus' tree): 4654
 4695 files changed, 237314 insertions(+), 123747 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,
arm64, 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 368 trees (counting Linus' and 102 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 (7f7bac08d9e3 Merge tag 'fuse-fixes-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse)
Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm)
Merging mm-hotfixes/mm-hotfixes-unstable (dff8bcc35093 x86/traps: avoid KMSAN bugs originating from handle_bug())
Merging kbuild-current/fixes (7a263a040256 kconfig: fix segmentation fault in menuconfig search)
Merging arc-current/for-curr (4fd9df10cb7a ARC: mm: fix leakage of memory allocated for PTE)
Merging arm-current/fixes (14ca1a469075 ARM: 9247/1: mm: set readonly for MT_MEMORY_RO with ARM_LPAE)
Merging arm64-fixes/for-next/fixes (85f1506337f0 arm64: cpufeature: Fix the visibility of compat hwcaps)
Merging arm-soc-fixes/arm/fixes (5449cabd95bb Merge tag 'juno-fix-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes)
Merging davinci-current/davinci/for-current (9abf2313adc1 Linux 6.1-rc1)
Merging drivers-memory-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes)
Merging m68k-current/for-linus (dc63a086daee m68k: Rework BI_VIRT_RNG_SEED as BI_RNG_SEED)
Merging powerpc-fixes/fixes (02a771c9a68a powerpc/32: Select ARCH_SPLIT_ARG64)
Merging s390-fixes/fixes (bb8738876b24 s390: update defconfigs)
Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build)
Merging fscrypt-current/for-stable (ccd30a476f8e fscrypt: fix keyring memory leak on mount failure)
Merging net/master (9521c9d6a53d Merge tag 'net-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf/master (8bbabb3fddcd bpf, sock_map: Move cancel_work_sync() out of sock lock)
Merging ipsec/master (7f57f8165cb6 af_key: Fix send_acquire race with pfkey_register)
Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
Merging ipvs/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
Merging wireless/for-next (f45cb6b29cd3 wifi: ath11k: avoid deadlock during regulatory update in ath11k_regd_update())
Merging rdma-fixes/for-rc (7a47e077e503 RDMA/qedr: clean up work queue on failure in qedr_alloc_resources())
Merging sound-current/for-linus (10e794bdba27 ALSA: hda: clarify comments on SCF changes)
Merging sound-asoc-fixes/for-linus (003b786b6789 ASoC: SOF: ipc3-topology: use old pipeline teardown flow with SOF2.1 and older)
Merging regmap-fixes/for-linus (157209ecce2b Merge remote-tracking branch 'regmap/for-6.0' into regmap-linus)
Merging regulator-fixes/for-linus (6555bf0ad524 Merge remote-tracking branch 'regulator/for-6.0' into regulator-linus)
Merging spi-fixes/for-linus (e0f7e9ecc644 Merge remote-tracking branch 'spi/for-6.0' into spi-linus)
Merging pci-current/for-linus (39a654f39efb MAINTAINERS: Add Manivannan Sadhasivam as Qcom PCIe RC maintainer)
Merging driver-core.current/driver-core-linus (54de93cd8740 kernel/utsname_sysctl.c: Add missing enum uts_proc value)
Merging tty.current/tty-linus (7b7dfe4833c7 tty: n_gsm: fix sleep-in-atomic-context bug in gsm_control_send)
Merging usb.current/usb-linus (30a0b95b1335 Linux 6.1-rc3)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (df3414b0a245 USB: serial: option: add Sierra Wireless EM9191)
Merging phy/fixes (04948e757148 phy: qcom-qmp-combo: fix NULL-deref on runtime resume)
Merging staging.current/staging-linus (937ec9f7d5f2 staging: rtl8192e: remove bogus ssid character sign test)
Merging iio-fixes/fixes-togreg (7c919b619bcc tools: iio: iio_generic_buffer: Fix read size)
Merging counter-current/counter-current (30a0b95b1335 Linux 6.1-rc3)
Merging char-misc.current/char-misc-linus (30a0b95b1335 Linux 6.1-rc3)
Merging soundwire-fixes/fixes (49a467310dc4 soundwire: qcom: check for outanding writes before doing a read)
Merging thunderbolt-fixes/fixes (30a0b95b1335 Linux 6.1-rc3)
Merging input-current/for-linus (c7e37cc62407 Input: goodix - try resetting the controller when no config is set)
Merging crypto-current/master (9f6035af06b5 crypto: x86/polyval - Fix crashes when keys are not 16-byte aligned)
Merging vfio-fixes/for-linus (873aefb376bb vfio/type1: Unpin zero pages)
Merging kselftest-fixes/fixes (89c1017aac67 selftests/pidfd_test: Remove the erroneous ',')
Merging modules-fixes/modules-linus (77d6354bd422 module/decompress: generate sysfs string at compile time)
Merging dmaengine-fixes/fixes (d1ae5c45f654 dmaengine: apple-admac: Fix grabbing of channels in of_xlate)
Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
Merging mtd-fixes/mtd/fixes (05e258c6ec66 mtd: parsers: bcm47xxpart: Fix halfblock reads)
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
Merging v4l-dvb-fixes/fixes (de547896aac6 media: vivid.rst: loop_video is set on the capture devnode)
Merging reset-fixes/reset/fixes (ae358d71d462 reset: npcm: fix iprst2 and iprst4 setting)
Merging mips-fixes/mips-fixes (9abf2313adc1 Linux 6.1-rc1)
Merging at91-fixes/at91-fixes (cef8cdc0d0e7 ARM: at91: pm: avoid soft resetting AC DLL)
Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes)
Merging kvm-fixes/master (7353633814f6 KVM: x86/xen: Fix eventfd error handling in kvm_xen_eventfd_assign())
Merging kvms390-fixes/master (165dfb55facd KVM: s390: pv: don't allow userspace to set the clock under PV)
Merging hwmon-fixes/hwmon (e18a9e894913 hwmon: (scmi) Register explicitly with Thermal Framework)
Merging nvdimm-fixes/libnvdimm-fixes (b3bbcc5d1da1 Merge branch 'for-6.0/dax' into libnvdimm-fixes)
Merging cxl-fixes/fixes (df4f5aa75d87 cxl/pmem: Use size_add() against integer overflow)
Merging btrfs-fixes/next-fixes (738f7a2d84ed Merge branch 'misc-6.1' into next-fixes)
Merging vfs-fixes/fixes (7ee47dcfff18 fs: use acquire ordering in __fget_light())
Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted())
Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
Merging drivers-x86-fixes/fixes (e9cf4d9b9a6f ACPI: video: Fix missing native backlight on Chromebooks)
Merging samsung-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging pinctrl-samsung-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging devicetree-fixes/dt/linus (917c362b5f8a MAINTAINERS: of: collapse overlay entry into main device tree entry)
Merging dt-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging scsi-fixes/fixes (307539eed463 scsi: ufs: core: Fix typo in comment)
Merging drm-fixes/drm-fixes (30a0b95b1335 Linux 6.1-rc3)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (12caf46cf4fc drm/i915/sdvo: Grab mode_config.mutex during LVDS init to avoid WARNs)
Merging mmc-fixes/fixes (30a0b95b1335 Linux 6.1-rc3)
Merging rtc-fixes/rtc-fixes (db4e955ae333 rtc: cmos: fix build on non-ACPI platforms)
Merging gnss-fixes/gnss-linus (247f34f7b803 Linux 6.1-rc2)
Merging hyperv-fixes/hyperv-fixes (e70af8d040d2 PCI: hv: Fix the definition of vector in hv_compose_msi_msg())
Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18)
Merging risc-v-fixes/fixes (8bc8824d3019 riscv: dts: sifive unleashed: Add PWM controlled LEDs)
Merging risc-v-mc-fixes/dt-fixes (0dec364ffeb6 riscv: dts: microchip: use an mpfs specific l2 compatible)
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
Merging fpga-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging spdx/spdx-linus (30a0b95b1335 Linux 6.1-rc3)
Merging gpio-brgl-fixes/gpio/for-current (30a0b95b1335 Linux 6.1-rc3)
Merging gpio-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging pinctrl-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging erofs-fixes/fixes (ce4b81568657 erofs: protect s_inodes with s_inode_list_lock for fscache)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (618887768bb7 kunit: update NULL vs IS_ERR() tests)
Merging ubifs-fixes/fixes (c18a80c6861f jffs2: correct logic when creating a hole in jffs2_write_begin)
Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions)
Merging cel-fixes/for-rc (d3aefd2b29ff nfsd: fix net-namespace logic in __nfsd_file_cache_purge)
Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC)
Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number)
Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging perf-current/perf/urgent (5aaef24b5c6d Merge tag 'for-6.1-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux)
Merging efi-fixes/urgent (23715a26c8d8 arm64: efi: Recover from synchronous exceptions occurring in firmware)
Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.)
Merging battery-fixes/fixes (767e684367e4 power: supply: ab8500: Defer thermal zone probe)
Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning)
Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1)
Merging iommufd-fixes/for-rc (30a0b95b1335 Linux 6.1-rc3)
Merging drm-misc-fixes/for-linux-next-fixes (3bc6a37f59f2 drm/vc4: hdmi: Fix HSM clock too low on Pi4)
Merging kbuild/for-next (2df76606db9d Merge tag 'kbuild-fixes-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
Merging perf/perf/core (96e6d929a6c3 perf trace: Use sig_atomic_t to avoid undefined behaviour in a signal handler)
Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute)
Merging dma-mapping/for-next (8d58aa484920 swiotlb: reduce the swiotlb buffer size on allocation failure)
Merging asm-generic/master (2e21c1575208 alpha: fix marvel_ioread8 build regression)
Merging arc/for-next (f2906aa86338 Linux 5.19-rc1)
Merging arm/for-next (072132be9f91 Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (0e5d5ae837c8 arm64: Add AMPERE1 to the Spectre-BHB affected list)
Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING)
Merging arm-soc/for-next (76b4abc1ae4b Merge branch 'arm/drivers' into for-next)
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (f665c485b1d2 Merge branch 'v6.2/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (56fed763f6b2 arm64: dts: apple: Add ADMAC resets on t8103/t600x)
Merging aspeed/for-next (cb714bd0c599 ARM: dts: nuvoton: Remove bogus unit addresses from fixed-partition nodes)
Merging at91/at91-next (4fb3808be768 Merge branch 'at91-defconfig' into at91-next)
Merging broadcom/next (9abf2313adc1 Linux 6.1-rc1)
Merging davinci/davinci/for-next (53ad523ac435 ARM: davinci: fix repeated words in comments)
Merging drivers-memory/for-next (1f1e46b83b7d dt-bindings: memory-controllers: ti,gpmc: add wait-pin polarity)
Merging imx-mxs/for-next (89ca3fade6cb Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (cbb1618792e2 Merge branch 'v6.0-next/soc' into for-next)
Merging mvebu/for-next (d5c48679d56c Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (8efe5dea6753 Merge branch 'omap-for-v6.1/dt' into for-next)
Merging qcom/for-next (0df6c177c8f1 Merge branches 'arm64-defconfig-for-6.2', 'arm64-for-6.2', 'clk-for-6.2', 'defconfig-for-6.2', 'drivers-for-6.2', 'dts-for-6.2' and 'arm64-fixes-for-6.1' into for-next)
Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema)
Merging renesas/next (4bff929bc882 Merge branches 'renesas-arm-dt-for-v6.2', 'renesas-arm-soc-for-v6.2' and 'renesas-dt-bindings-for-v6.2' into renesas-next)
Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage")
Merging rockchip/for-next (7771a384229f Merge branch 'v6.1-armsoc/dtsfixes' into for-next)
Merging samsung-krzk/for-next (36fdb19fb9dd Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (e7c94176ab90 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 (7ad436adc788 ARM: multi_v7_defconfig: enable Type-C UCSI and STM32G0 as modules)
Merging sunxi/sunxi/for-next (8907a276fec2 ARM: dts: axp22x/axp809: Add GPIO controller nodes)
Merging tee/next (bd52407221b4 optee: Add __init/__exit annotations to module init/exit funcs)
Merging tegra/for-next (77bfb4481cf2 Merge branch for-6.2/arm64/defconfig into for-next)
Merging ti/ti-next (010b4ca58990 Merge branches 'ti-k3-dts-next' and 'ti-drivers-soc-next' into ti-next)
Merging xilinx/for-next (0413dd4d95da ARM: dts: zynq: add QSPI controller node)
Merging clk/clk-next (96beb9fd1d90 Merge branch 'clk-fixes' into clk-next)
Merging clk-imx/for-next (9abf2313adc1 Linux 6.1-rc1)
Merging clk-renesas/renesas-clk (02693e11611e clk: renesas: r9a06g032: Repair grave increment error)
Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
Merging csky/linux-next (ce0ba954805e csky: Kconfig: Fix spelling mistake "Meory" -> "Memory")
Merging loongarch/loongarch-next (247f34f7b803 Linux 6.1-rc2)
Merging m68k/for-next (550a998f37b4 m68k: mac: Reword comment using double "in")
Merging m68knommu/for-next (30a0b95b1335 Linux 6.1-rc3)
Merging microblaze/next (493ffd6605b2 Merge tag 'ucount-rlimits-cleanups-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace)
Merging mips/mips-next (9abf2313adc1 Linux 6.1-rc1)
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc)
Merging parisc-hd/for-next (247f34f7b803 Linux 6.1-rc2)
Merging powerpc/next (247f34f7b803 Linux 6.1-rc2)
Merging soc-fsl/next (4b0986a3613c Linux 5.18)
Merging risc-v/for-next (be79afc740b5 riscv: Enable HAVE_ARCH_HUGE_VMALLOC for 64BIT)
Merging risc-v-mc/dt-for-next (d6105a8b7c16 riscv: dts: microchip: fix memory node unit address for icicle)
Merging s390/for-next (f01567ae8be4 Merge branch 'features' into for-next)
Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size)
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/next (193cb8372424 uml: Remove the initialization of statics to 0)
Merging xtensa/xtensa-for-next (b8c4f4db2436 xtensa: update config files)
Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl' into for-next)
Merging vfs-idmapping/for-next (476e9662b34d Merge branch 'fs.acl.rework' into for-next)
Merging fscrypt/master (0e91fc1e0f5c fscrypt: work on block_devices instead of request_queues)
Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
Merging afs/afs-next (26291c54e111 Linux 5.17-rc2)
Merging btrfs/for-next (110fcc9e143b Merge branch 'for-next-next-v6.1-20221103' into for-next-20221103)
CONFLICT (content): Merge conflict in fs/btrfs/ctree.h
Applying: btrfs: fix up for "fs: pass dentry to set acl method"
Merging ceph/master (ffc4d66a34bb ceph: fix a NULL vs IS_ERR() check when calling ceph_lookup_inode())
Merging cifs/for-next (c23f841c2c1e cifs: avoid unnecessary iteration of tcp sessions)
Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem())
Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment)
Merging erofs/dev (312fe643ad11 erofs: clean up erofs_iget())
Merging exfat/dev (2e9ceb6728f1 exfat: fix overflow for large capacity partition)
Merging ext3/for_next (ab7720a2b117 maintainers: Add ISOFS entry)
Merging ext4/dev (1b45cc5c7b92 ext4: fix potential out of bound read in ext4_fc_replay_scan())
Merging f2fs/dev (35803e88eb9b f2fs: replace gc_urgent_high_remaining with gc_remaining_trials)
Merging fsverity/fsverity (8377e8a24bba fs-verity: use kmap_local_page() instead of kmap())
Merging fuse/for-next (cbed990fb813 fuse: Rearrange fuse_allow_current_process checks)
Merging gfs2/for-next (288fc8606762 Merge tag 'gfs2-nopid-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
Merging jfs/jfs-next (25e70c6162f2 fs: jfs: fix shift-out-of-bounds in dbDiscardAG)
Merging ksmbd/ksmbd-for-next (f5ba1cdaf5eb ksmbd: validate share name from share config response)
Merging nfs/linux-next (8e5423e991e8 Merge tag 'parisc-for-6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging nfs-anna/linux-next (7e8436728e22 nfs4: Fix kmemleak when allocate slot failed)
Merging nfsd/for-next (16336b7fae21 nfsd: fix up the filecache laundrette scheduling)
Merging ntfs3/master (0d6d7c61ffee fs/ntfs3: Don't use uni1 uninitialized in ntfs_d_compare())
CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c
Merging orangefs/for-next (2ad4b6f5e117 Orangefs: change iterate to iterate_shared)
Merging overlayfs/overlayfs-next (b337e5ae0e42 ovl: Kconfig: Fix spelling mistake "undelying" -> "underlying")
Merging ubifs/next (669d204469c4 ubi: fastmap: Add fastmap control support for 'UBI_IOCATT' ioctl)
Merging v9fs/9p-next (a8e633c60447 net/9p: clarify trans_fd parse_opt failure handling)
Merging xfs/for-next (4eb559dd1567 Merge tag 'refcount-cow-domain-6.1_2022-10-31' of git://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux into xfs-6.1-fixesA)
Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag)
Merging iomap/iomap-for-next (adc9c2e5a723 iomap: add a tracepoint for mappings returned by map_blocks)
Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap)
Merging file-locks/locks-next (072e51356cd5 Merge tag 'nfs-for-5.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
Merging iversion/iversion-next (2b3319b35573 nfsd: remove fetch_iversion export operation)
Merging vfs/for-next (3aca47127a64 fs: drop useless condition from inode_needs_update_time)
Merging printk/for-next (950a9751c1d1 Merge branch 'for-6.2' into for-next)
Merging pci/next (652ce11a7604 Merge branch 'remotes/lorenzo/pci/tegra')
Merging pstore/for-next/pstore (38b91847c314 pstore: Alert on backend write error)
Merging hid/for-next (27b4656fb616 Merge branch 'for-6.1/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (befeb20d3813 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i3c/i3c/next (9abf2313adc1 Linux 6.1-rc1)
Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks)
Merging hwmon-staging/hwmon-next (52a7ce84b151 docs: hwmon: (smpro-hwmon) Improve grammar and formatting)
Merging jc_docs/docs-next (07ab97fe7f8a Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (247f34f7b803 Linux 6.1-rc2)
Merging v4l-dvb-next/master (de547896aac6 media: vivid.rst: loop_video is set on the capture devnode)
Merging pm/linux-next (2796af610a6e Merge branch 'thermal-intel' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (4f7961706c63 cpufreq: qcom-hw: Move soc_data to struct qcom_cpufreq)
Merging cpupower/cpupower (9abf2313adc1 Linux 6.1-rc1)
Merging devfreq/devfreq-next (9abf2313adc1 Linux 6.1-rc1)
Merging opp/opp/linux-next (e40d2f14e125 OPP: decouple dt properties in opp_parse_supplies())
Merging thermal/thermal/linux-next (9d2bc364f677 thermal/drivers/qcom/tsens: Simplify debugfs init function)
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (3b7610302a75 fs: dlm: fix possible use after free if tracing)
Merging rdma/for-next (692373d18620 RDMA/rxe: cleanup some error handling in rxe_verbs.c)
Merging net-next/master (fbeb229a6622 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf-next/for-next (0ed041b1dd33 bpf: make sure skb->len != 0 when redirecting to a tunneling device)
Merging ipsec-next/master (cc2bbbfd9a50 xfrm: Remove not-used total variable)
Merging mlx5-next/mlx5-next (9abf2313adc1 Linux 6.1-rc1)
Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bluetooth/master (ce52c2f04177 Bluetooth: hci_bcm: Add CYW4373A0 support)
Merging wireless-next/for-next (57d545b5a3d6 wifi: wilc1000: sdio: fix module autoloading)
Merging mtd/mtd/next (aec4d5f5ffd0 mtd: parsers: add TP-Link SafeLoader partitions table parser)
CONFLICT (content): Merge conflict in drivers/mtd/mtdcore.c
Merging nand/nand/next (7c3fc99819fd mtd: rawnand: cadence: support 64-bit slave dma interface)
Merging spi-nor/spi-nor/next (bb0e9c600ce2 mtd: spi-nor: core: Add an error message when failing to exit the 4-byte address mode)
Merging crypto/master (d6e9aa6e1ea8 crypto: octeontx - fix repeated words in comments)
Merging drm/drm-next (f80c71f7a868 Merge tag 'drm-intel-next-2022-10-28' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power_well.c
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i915/display/intel_dkl_phy.c
CONFLICT (add/add): Merge conflict in drivers/gpu/drm/i915/display/intel_dkl_phy.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dpll_mgr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_lvds.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_sdvo.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h
Merging drm-misc/for-linux-next (a82f30b04c6a drm/scheduler: rename dependency callback into prepare_job)
CONFLICT (content): Merge conflict in include/drm/gpu_scheduler.h
Merging amdgpu/drm-next (67cbd03dd088 drm/amdgpu: force read discovery file if set discovery=2)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_crat.c
Applying: fixup for bad merge of "drm/amd: Add IMU fw version to fw version queries"
Merging drm-intel/for-linux-next (882ecff709b5 drm/i915: Use intel_crtc_needs_modeset() more)
Merging drm-tegra/for-next (778bed334508 gpu: host1x: Update host1x_memory_context_alloc() !IOMMU_API stub)
Merging drm-msm/msm-next (7f7a942c0a33 Merge tag 'drm-next-20221025' of git://linuxtv.org/pinchartl/media into drm-next)
Merging drm-msm-lumag/msm-next-lumag (ab121caadbdd Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi' and 'msm-next-lumag-mdp5' into msm-next-lumag)
Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation)
Merging etnaviv/etnaviv/next (4bce24427251 drm/etnaviv: disable tx clock gating for GC7000 rev6203)
Merging fbdev/for-next (a209c68a1734 fbdev: omapfb: remove redundant variable checksum)
Merging regmap/for-next (7c7aa42243cb Merge branch 'regmap-linus' into regmap-next)
Merging sound/for-next (2b4e275b92b8 ALSA: asihpi: remove variable loops)
Merging sound-asoc/for-next (54e45e9aea20 Merge remote-tracking branch 'asoc/for-6.2' into asoc-next)
Merging modules/modules-next (dd0338eef0d4 kernel/params.c: defer most of param_sysfs_init() to late_initcall time)
Merging input/next (153a197077d3 dt-bindings: input: sun4i-lradc-keys: Add F1C100s compatible)
Merging block/for-next (064fe0904a14 Merge branch 'for-6.2/block' into for-next)
Merging device-mapper/for-next (5434ee8d2857 dm clone: Fix typo in block_device format specifier)
Merging libata/for-next (de58fd3d80f8 ata: sata_dwc_460ex: remove variable num_processed)
Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver)
Merging mmc/next (eddc1b7fc901 mmc: mediatek: add support for MT7986 SoC)
Merging mfd/for-mfd-next (6804c885b67a mfd: rk808: Permit having multiple PMIC instances)
Merging backlight/for-backlight-next (e7647de058cb video: backlight: mt6370: Add MediaTek MT6370 support)
Merging battery/for-next (eae063f64714 power: supply: mt6360: Use LINEAR_RANGE_IDX())
Merging regulator/for-next (3c952a2a06a2 Merge remote-tracking branch 'regulator/for-6.2' into regulator-next)
Merging security/next (610b17b05c5c audit: Fix some kernel-doc warnings)
Merging apparmor/apparmor-next (4295c60bbe9e apparmor: Fix uninitialized symbol 'array_size' in policy_unpack_test.c)
Merging integrity/next-integrity (8c1d6a050a0f ima: Fix memory leak in __ima_inode_hash())
Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest)
Merging selinux/next (e0d8259355cb selinux: increase the deprecation sleep for checkreqprot and runtime disable)
Merging smack/next (1a3065e92046 smack_lsm: remove unnecessary type casting)
Merging tomoyo/master (9abf2313adc1 Linux 6.1-rc1)
Merging tpmdd/next (2d869f0b4585 selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle)
Merging watchdog/master (82ebbe65d781 drivers: watchdog: exar_wdt.c fix use after free)
Merging iommu/next (7e8eec906b5b Merge branches 'arm/allwinner', 'arm/rockchip', 'ppc/pamu', 's390', 'x86/amd' and 'core' into next)
Merging audit/next (50979953c0c4 audit: unify audit_filter_{uring(), inode_name(), syscall()})
Merging devicetree/for-next (c2741cbe7f8a dt-bindings: media: st,stmipid02: Convert the text bindings to YAML)
Merging dt-krzk/for-next (455087308947 Merge branch 'next/qcom-pinctrl' into for-next)
Merging mailbox/mailbox-for-next (b8ae88e1e75e mailbox: qcom-ipcc: flag IRQ NO_THREAD)
Merging spi/for-next (e1cb192192c2 Merge remote-tracking branch 'spi/for-6.2' into spi-next)
Merging tip/master (801735aabc76 Merge branch into tip/master: 'x86/microcode')
CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c
Merging clockevents/timers/drivers/next (af246cc6d0ed clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value)
Merging edac/edac-for-next (b998a2babf4e Merge edac-misc into for-next)
Merging irqchip/irq/irqchip-next (732d69c80cb0 Merge branch irq/misc-6.1 into irq/irqchip-next)
Merging ftrace/for-next (0934ae9977c2 tracing: Fix reading strings from synthetic events)
Merging rcu/rcu/next (9399f613f2fe locking/memory-barriers.txt: Improve documentation for writel() example)
Merging kvm/next (7353633814f6 KVM: x86/xen: Fix eventfd error handling in kvm_xen_eventfd_assign())
Merging kvm-arm/next (b302ca52ba82 Merge branch kvm-arm64/misc-6.1 into kvmarm-master/next)
Merging kvms390/next (c8a0273ac80d KVM: s390: Pass initialized arg even if unused)
Merging xen-tip/linux-next (a383dcb1cca8 xen/virtio: Convert PAGE_SIZE/PAGE_SHIFT/PFN_UP to Xen counterparts)
Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3)
Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync())
Merging drivers-x86/for-next (225469d4acbc platform/x86: huawei-wmi: remove unnecessary member)
Merging chrome-platform/for-next (015e4b05c377 platform/chrome: cros_ec_spi: Set PROBE_PREFER_ASYNCHRONOUS)
Merging hsi/for-next (9abf2313adc1 Linux 6.1-rc1)
Merging leds/for-next (5f52a8ba7e91 dt-bindings: leds: Add 'cpuX' to 'linux,default-trigger')
Merging ipmi/for-next (5319ef09e640 ipmi:ssif: Increase the message retry time)
$ git reset --hard HEAD^
Merging next-20221103 version of ipmi
Merging driver-core/driver-core-next (1662cea4623f kset: fix memory leak when kset_register() returns error)
Merging usb/usb-next (8527e9421690 Merge 6.1-rc3 into usb-next)
Merging thunderbolt/next (2ae18cc2269f thunderbolt: ACPI: Use the helper fwnode_find_reference())
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (247f34f7b803 Linux 6.1-rc2)
Merging tty/tty-next (72da688b457d tty: evh_bytechan: Replace NO_IRQ by 0)
Merging char-misc/char-misc-next (30a0b95b1335 Linux 6.1-rc3)
Merging coresight/next (30a0b95b1335 Linux 6.1-rc3)
Merging fpga/for-next (ee31d5038c06 dt-bindings: fpga: document Lattice sysCONFIG FPGA manager)
Merging icc/icc-next (9abf2313adc1 Linux 6.1-rc1)
Merging iio/togreg (b8bee0f98634 MAINTAINERS: Add KX022A maintainer entry)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml
Merging phy-next/next (25dcaf94448f Merge branch 'fixes' into next)
Merging soundwire/next (cf43cd33b67a soundwire: qcom: add support for v1.7 Soundwire Controller)
Merging extcon/extcon-next (9abf2313adc1 Linux 6.1-rc1)
Merging gnss/gnss-next (247f34f7b803 Linux 6.1-rc2)
Merging vfio/next (b1b8132a651c vfio: More vfio_file_is_group() use cases)
Merging staging/staging-next (a37068715956 staging: r8188eu: convert rtw_setdatarate_cmd to correct error semantics)
Merging counter-next/counter-next (30a0b95b1335 Linux 6.1-rc3)
Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4)
Merging dmaengine/next (cd0ab43ec91a dmaengine: remove iop-adma driver)
Merging cgroup/for-next (79a7f41f7f5a cgroup: cgroup refcnt functions should be exported when CONFIG_DEBUG_CGROUP_REF)
Merging scsi/for-next (c8d0d0a1110f Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (e6629dcb00ad scsi: MAINTAINERS: Make Xiang Chen HiSilicon SAS controller driver maintainer)
Merging vhost/linux-next (be8ddea9e75e vdpa/ifcvf: add reviewer)
Merging rpmsg/for-next (1b09681fdc30 Merge branches 'rproc-next' and 'hwspinlock-next' into for-next)
Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1)
Merging gpio-brgl/gpio/for-next (fbb19fe17eae gpio: pca9570: add slg7xl45106 support)
Merging gpio-intel/for-next (8d259847243d gpiolib: cdev: Fix typo in kernel doc for struct line)
Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4)
Merging pinctrl/for-next (bfe66c8bb35c Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (3886bc3523db pinctrl: merrifield: Use temporary variable for struct device)
Merging pinctrl-renesas/renesas-pinctrl (96355be8f0a2 dt-bindings: pinctrl: renesas: Document RZ/Five SoC)
Merging pinctrl-samsung/for-next (9abf2313adc1 Linux 6.1-rc1)
Merging pwm/for-next (cfcb68817fb3 pwm: tegra: Improve required rate calculation)
Merging userns/for-next (b5df013cd194 Merge of ucount-rlimits-cleanups-for-v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, retire_mq_sysctls-for-v5.19, and unpriv-ipc-sysctls-for-v6.2 for testing in linux-next)
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
Merging kselftest/next (d942f231afc0 selftests/vDSO: Add riscv getcpu & gettimeofday test)
Merging livepatching/for-next (cad81ab73997 Merge branch 'for-6.2/core' into for-next)
Merging rtc/rtc-next (9abf2313adc1 Linux 6.1-rc1)
Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next)
Merging at24/at24/for-next (9abf2313adc1 Linux 6.1-rc1)
Merging ntb/ntb-next (4fe89d07dcc2 Linux 6.0)
Merging seccomp/for-next/seccomp (4e92863862d1 Merge branch 'for-linus/seccomp' into for-next/seccomp)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get)
Merging slimbus/for-next (c3174a51dc36 slimbus: qcom-ngd-ctrl: reinit the reconf completion flag)
Merging nvmem/for-next (8425f5159761 nvmem: stm32: fix spelling typo in comment)
Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
Merging hyperv/hyperv-next (c69840106483 hv_balloon: Add support for configurable order free page reporting)
Merging auxdisplay/auxdisplay (13de23494f38 auxdisplay: lcd2s: Use array size explicitly in lcd2s_gotoxy())
Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function)
Merging hmm/hmm (9abf2313adc1 Linux 6.1-rc1)
Merging kunit/test (9abf2313adc1 Linux 6.1-rc1)
Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
Merging kunit-next/kunit (29ad37f740d3 kunit: alloc_string_stream_fragment error handling bug fix)
CONFLICT (content): Merge conflict in lib/kunit/string-stream.c
Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
Merging mhi/mhi-next (1d96c542b291 MAINTAINERS: Remove Hemant from MHI bus)
Merging memblock/for-next (3f82c9c4ac37 memblock: don't run loop in memblock_add_range() twice)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging cxl/next (9abf2313adc1 Linux 6.1-rc1)
Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller)
Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2)
Merging efi/next (1abdc82f0c77 efi: pstore: Add module parameter for setting the record size)
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/for-next (938c9dbd50d4 Merge branch 'slab/for-6.2/fit_rcu_head' into slab/for-next)
Merging random/master (8a5820b06d77 random: adjust comment to account for removed function)
Merging landlock/next (4bc90a766ea5 Merge branch 'landlock-test-build-fix' into landlock-next)
Merging rust/rust-next (fd9517a1603f init/Kconfig: Specify the interpreter for rust_is_available.sh)
Merging sysctl/sysctl-next (c06a17fe056b kernel/sysctl-test: use SYSCTL_{ZERO/ONE_HUNDRED} instead of i_{zero/one_hundred})
Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages)
CONFLICT (content): Merge conflict in include/linux/migrate.h
CONFLICT (content): Merge conflict in mm/migrate.c
CONFLICT (content): Merge conflict in mm/migrate_device.c
Merging execve/for-next/execve (ef20c5139c31 binfmt_elf: simplify error handling in load_elf_phdrs())
Merging bitmap/bitmap-for-next (27bc50fc9064 Merge tag 'mm-stable-2022-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm)
Merging hte/for-next (9abf2313adc1 Linux 6.1-rc1)
Merging kspp/for-next/kspp (4b21d25bf519 overflow: Introduce overflows_type() and castable_to_type())
Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper)
Merging unsigned-char/unsigned-char (1a78429fd3d6 kbuild: treat char as always unsigned)
Merging iommufd/for-next (89e0f4e1f9d7 iommufd: Allow iommufd to supply /dev/vfio/vfio)
CONFLICT (content): Merge conflict in drivers/iommu/iommu.c
CONFLICT (content): Merge conflict in include/linux/iommu.h
$ git merge --abort
Merging mm-stable/mm-stable (30a0b95b1335 Linux 6.1-rc3)
Merging mm-nonmm-stable/mm-nonmm-stable (30a0b95b1335 Linux 6.1-rc3)
Merging mm/mm-everything (f9aa1d31e62a Merge branch 'mm-nonmm-unstable' into mm-everything)
Applying: kprobeslib-kretprobe-scalability-improvement-fix-2

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

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

* linux-next: Tree for Nov 4
@ 2020-11-04  6:01 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2020-11-04  6:01 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20201103:

The drm-intel-fixes tree gained a build failure for which I reverted a commit.

The imx-mxs tree lost its build failure.

The f2fs tree lost its build failure.

The net-next tree gained a conflict against the net tree.

The pinctrl tree still had its build failure.

Non-merge commits (relative to Linus' tree): 2755
 3141 files changed, 353135 insertions(+), 36522 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 327 trees (counting Linus' and 85 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 (4ef8451b3326 Merge tag 'perf-tools-for-v5.10-2020-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
Merging fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging kbuild-current/fixes (d1889589a4f5 builddeb: Fix rootless build in setuid/setgid directory)
Merging arc-current/for-curr (3b57533b460c ARC: [plat-hsdk] Remap CCMs super early in asm boot trampoline)
Merging arm-current/fixes (9fa2e7af3d53 ARM: 9019/1: kprobes: Avoid fortify_panic() when copying optprobe template)
Merging arm64-fixes/for-next/fixes (7ee31a3aa8f4 arm64: kprobes: Use BRK instead of single-step when executing instructions out-of-line)
Merging arm-soc-fixes/arm/fixes (3d696f42c7f4 soc: ti: ti_sci_pm_domains: check for proper args count in xlate)
Merging drivers-memory-fixes/fixes (3650b228f83a Linux 5.10-rc1)
Merging m68k-current/for-linus (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver)
Merging powerpc-fixes/fixes (99f070b62322 powerpc/smp: Call rcu_cpu_starting() earlier)
Merging s390-fixes/fixes (0b2ca2c7d0c9 s390/pci: fix hot-plug of PCI function missing bus)
Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro)
Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key)
Merging net/master (dbfe394dad33 chelsio/chtls: fix always leaking ctrl_skb)
Merging bpf/master (7a078d2d1880 libbpf, hashmap: Fix undefined behavior in hash_bits)
Merging ipsec/master (a779d91314ca net: xfrm: fix a race condition during allocing spi)
Merging netfilter/master (859191b234f8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging ipvs/master (859191b234f8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf)
Merging wireless-drivers/master (04516706bb99 iwlwifi: pcie: limit memory read spin time)
Merging mac80211/master (c2f468145211 mac80211: don't require VHT elements for HE on 2.4 GHz)
Merging rdma-fixes/for-rc (00469c97ef64 RDMA/vmw_pvrdma: Fix the active_speed and phys_state value)
Merging sound-current/for-linus (ef9ce66fab95 ALSA: hda/realtek - Enable headphone for ASUS TM420)
Merging sound-asoc-fixes/for-linus (15961bc475e0 Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus)
Merging regmap-fixes/for-linus (780f88b04704 Merge remote-tracking branch 'regmap/for-5.10' into regmap-linus)
Merging regulator-fixes/for-linus (cf1ad559a20d regulator: defer probe when trying to get voltage from unresolved supply)
Merging spi-fixes/for-linus (21d3055d1ac7 Merge remote-tracking branch 'spi/for-5.10' into spi-linus)
Merging pci-current/for-linus (af0dd809f3d3 PCI: Add Designated Vendor-Specific Extended Capability #defines)
Merging driver-core.current/driver-core-linus (9d4fdda33446 scripts: get_api.pl: Add sub-titles to ABI output)
Merging tty.current/tty-linus (d54654790302 vt_ioctl: fix GIO_UNIMAP regression)
Merging usb.current/usb-linus (afaa2e745a24 USB: Add NO_LPM quirk for Kingston flash drive)
Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup)
Merging usb-serial-fixes/usb-linus (a46b973bced1 USB: serial: option: add Quectel EC200T module support)
Merging usb-chipidea-fixes/for-usb-fixes (e11d2bf27158 usb: cdns3: gadget: own the lock wrongly at the suspend routine)
Merging phy/fixes (25d76fed7ffe phy: cpcap-usb: Use IRQF_ONESHOT)
Merging staging.current/staging-linus (3cea11cd5e3b Linux 5.10-rc2)
Merging char-misc.current/char-misc-linus (bcbc0b2e275f mei: protect mei_cl_mtu from null dereference)
Merging soundwire-fixes/fixes (3650b228f83a Linux 5.10-rc1)
Merging thunderbolt-fixes/fixes (7342ca34d931 thunderbolt: Add the missed ida_simple_remove() in ring_request_msix())
Merging input-current/for-linus (b1884583fcd1 Input: i8042 - allow insmod to succeed on devices without an i8042 controller)
Merging crypto-current/master (c3a98c3ad5c0 crypto: x86/poly1305 - add back a needed assignment)
Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer)
Merging vfio-fixes/for-linus (e4eccb853664 vfio/pci: Bypass IGD init in case of -ENODEV)
Merging kselftest-fixes/fixes (1488472e712d selftests: binderfs: use SKIP instead of XFAIL)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
Merging dmaengine-fixes/fixes (768664114b1a dmaengine: ti: k3-udma: fix -Wenum-conversion warning)
Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4)
Merging mtd-fixes/mtd/fixes (9efac6ce7f62 mtd: rawnand: stm32_fmc2: fix broken ECC)
Merging mfd-fixes/for-mfd-fixes (22380b65dc70 mfd: mfd-core: Ensure disabled devices are ignored without error)
Merging v4l-dvb-fixes/fixes (d0254f82d702 media: dt-bindings: media: imx274: Convert to json-schema)
Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
Merging mips-fixes/mips-fixes (31b4d8e172f6 MIPS: export has_transparent_hugepage() for modules)
Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
Merging omap-fixes/fixes (8f04aea048d5 ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails)
Merging kvm-fixes/master (9478dec3b5e7 KVM: vmx: remove unused variable)
Merging kvms390-fixes/master (f20d4e924b44 docs: kvm: add documentation for KVM_CAP_S390_DIAG318)
Merging hwmon-fixes/hwmon (402dab548d0d hwmon: (pmbus/max20730) use scnprintf() instead of snprintf())
Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX)
Merging btrfs-fixes/next-fixes (45d8f990a77f Merge branch 'misc-5.10' into next-fixes)
Merging vfs-fixes/fixes (77f6ab8b7768 don't dump the threads that had been already exiting when zapped.)
Merging dma-mapping-fixes/for-linus (892fc9f6835e dma-pool: Fix an uninitialized variable bug in atomic_pool_expand())
Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
Merging drivers-x86-fixes/fixes (3650b228f83a Linux 5.10-rc1)
Merging samsung-krzk-fixes/fixes (cd12e4f14f7c CREDITS: remove trailing white spaces)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pinctrl-samsung-fixes/fixes (3650b228f83a Linux 5.10-rc1)
Merging devicetree-fixes/dt/linus (f84e2c5c528d dt-bindings: Another round of adding missing 'additionalProperties/unevalutatedProperties')
Merging scsi-fixes/fixes (5feed64f9199 scsi: mpt3sas: Fix timeouts observed while reenabling IRQ)
Merging drm-fixes/drm-fixes (3cea11cd5e3b Linux 5.10-rc2)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (45a83eaa7e6c drm/i915: Hold onto an explicit ref to i915_vma_work.pinned)
Merging mmc-fixes/fixes (011fde48394b mmc: sdhci-of-esdhc: make sure delay chain locked for HS400)
Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2)
Merging hyperv-fixes/hyperv-fixes (dbf563eee0b8 x86/hyperv: Clarify comment on x2apic mode)
Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create)
Merging risc-v-fixes/fixes (84814460eef9 riscv: Fixup bootup failure with HARDENED_USERCOPY)
Merging pidfd-fixes/fixes (bda4c60d02e9 sys: Convert to the new fallthrough notation)
Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake)
Merging spdx/spdx-linus (3cea11cd5e3b Linux 5.10-rc2)
Merging gpio-intel-fixes/fixes (3650b228f83a Linux 5.10-rc1)
Merging pinctrl-intel-fixes/fixes (3650b228f83a Linux 5.10-rc1)
Merging erofs-fixes/fixes (89210981f374 erofs: fix setting up pcluster for temporary pages)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (0d0d245104a4 kunit: tools: fix kunit_tool tests for parsing test plans)
Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
Merging memblock-fixes/fixes (5f7b81c18366 ia64: fix min_low_pfn/max_low_pfn build errors)
Merging drm-misc-fixes/for-linux-next-fixes (077aa5c8dd6e drm/vc4: drv: Remove unused variable)
Applying: Revert "drm/i915/gt: Flush xcs before tgl breadcrumbs"
Merging kspp-gustavo/for-next/kspp (3650b228f83a Linux 5.10-rc1)
Merging kbuild/for-next (729e39a558eb kconfig: qconf: convert to Qt5 new signal/slot connection syntax)
Merging compiler-attributes/compiler-attributes (bbf5c979011a Linux 5.9)
Merging dma-mapping/for-next (48ab6d5d1f09 dma-mapping: fix 32-bit overflow with CONFIG_ARM_LPAE=n)
Merging asm-generic/master (78d127fd6892 Merge branch 'asm-generic-timers' into asm-generic)
Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
Merging arm/for-next (20f96e606509 Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (66dd3474702a arm64: proton-pack: Update comment to reflect new function name)
Merging arm-perf/for-next/perf (887e2cff0f8d perf: arm-cmn: Fix conversion specifiers for node type)
Merging arm-soc/for-next (36ab3c32cafc ARM: SoC: document merges)
Merging amlogic/for-next (4393916840fc Merge branch 'v5.11/soc' into tmp/aml-rebuild)
Merging aspeed/for-next (93db293b2aba Merge branch 'soc-for-v5.11' into for-next)
Merging at91/at91-next (0698efbb33ef Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next)
Merging drivers-memory/for-next (5ddebb22417b Merge branch 'for-v5.11/tegra-mc' into for-next)
Merging imx-mxs/for-next (5f8fb90aea46 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (a5e886fb26f2 Merge branch 'for_5.11/drivers-soc' into next)
Merging mediatek/for-next (9c6658a0dd4f Merge branch 'v5.10-next/soc' into for-next)
Merging mvebu/for-next (f89c9685f6a1 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (7a159a1ad494 Merge branch 'fixes' into for-next)
Merging qcom/for-next (c732298127a9 Merge branches 'arm64-for-5.11', 'drivers-for-5.11' and 'dts-for-5.11' into for-next)
Merging raspberrypi/for-next (4564363351e2 ARM: dts: bcm2711: Enable the display pipeline)
Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next)
Merging renesas/next (b860052992d7 Merge branch 'renesas-dt-bindings-for-v5.11' into renesas-next)
Merging reset/reset/next (da8c0e4ee95a reset: meson: make it possible to build as a module)
Merging rockchip/for-next (1fdc65a3eb82 Merge branch 'v5.11-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (59f129f534ca Merge branch 'next/drivers' into for-next)
Merging scmi/for-linux-next (3cea11cd5e3b Linux 5.10-rc2)
Merging sunxi/sunxi/for-next (2f098e04ce16 Merge branch 'sunxi/fixes-for-5.10' into sunxi/for-next)
Merging tegra/for-next (9ea55312ba10 Merge branch for-5.10/arm64/defconfig into for-next)
Merging ti-k3/ti-k3-next (1e3d655fe7b4 Merge branch 'ti-k3-config-next' into ti-k3-next)
Merging ti-k3-new/ti-k3-next (9dcd17be61e4 arm64: dts: ti: k3-am65: ringacc: drop ti, dma-ring-reset-quirk)
Merging clk/clk-next (3650b228f83a Linux 5.10-rc1)
Merging clk-samsung/for-next (ff8e0ff9b996 clk: samsung: Use cached clk_hws instead of __clk_lookup() calls)
Merging csky/linux-next (7c2c8f7beeb7 csky: Fixup show_regs doesn't contain regs->usp)
Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>)
Merging ia64/next (c331649e6371 ia64: Use libata instead of the legacy ide driver in defconfigs)
Merging m68k/for-next (1fe9bacab2ac m68k: Remove unused mach_max_dma_address)
Merging m68knommu/for-next (ce93d1c29c02 m68k: m68328: remove duplicate code)
Merging microblaze/next (4a17e8513376 microblaze: fix kbuild redundant file warning)
Merging mips/mips-next (ab7cffb8d236 MIPS: ingenic: remove unused platform_data header file)
Merging nds32/next (54bde873682b nds32: Fix bogus reference to <asm/procinfo.h>)
Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through)
Merging openrisc/for-next (55b2662ec665 openrisc: uaccess: Add user address space check to access_ok)
Merging parisc-hd/for-next (3b7ab4a74a2d parisc: Switch to clockevent based timers)
CONFLICT (content): Merge conflict in arch/parisc/kernel/time.c
Applying: revert the rest of "parisc: use legacy_timer_tick"
Merging powerpc/next (3cea11cd5e3b Linux 5.10-rc2)
Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
Merging soc-fsl/next (d97b957e32b1 soc: fsl: qe: Remove unnessesary check in ucc_set_tdm_rxtx_clk)
Merging risc-v/for-next (f69e1c7418b1 RISC-V: Fix the VDSO symbol generaton for binutils-2.35+)
CONFLICT (content): Merge conflict in arch/riscv/kernel/vdso/Makefile
Merging s390/for-next (97822baa4e8b Merge branch 'fixes' into for-next)
Merging sh/for-next (b0cfc315ff38 sh: fix syscall tracing)
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 (f06885b3f3e3 um: vector: Add dynamic tap interfaces and scripting)
Merging xtensa/xtensa-for-next (4ca4c562efb6 xtensa: uaccess: Add missing __user to strncpy_from_user() prototype)
Merging fscrypt/master (5b2a828b98ec fscrypt: export fscrypt_d_revalidate())
Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly)
Merging btrfs/for-next (95949eafec5c Merge branch 'for-next-next-v5.10-20201103' into for-next-20201103)
Merging ceph/master (28e1581c3b4e libceph: clear con->out_msg on Policy::stateful_server faults)
Merging cifs/for-next (3cea11cd5e3b Linux 5.10-rc2)
Merging configfs/for-next (76ecfcb0852e samples: configfs: prefer pr_err() over bare printk(KERN_ERR)
Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
Merging erofs/dev (915f4c9358db erofs: remove unnecessary enum entries)
Merging exfat/dev (f9893351acae Merge tag 'kconfig-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging ext3/for_next (11c514a99bb9 quota: Sanity-check quota file headers on load)
Merging ext4/dev (00c69f98e83d ext4: use IS_ERR() for error checking of path)
Merging f2fs/dev (aabe197f7422 f2fs: add F2FS_IOC_SET_COMPRESS_OPTION ioctl)
Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info)
Merging fuse/for-next (42d3e2d041f0 virtiofs: calculate number of scatter-gather elements accurately)
Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member)
Merging nfs/linux-next (3cea11cd5e3b Linux 5.10-rc2)
Merging nfs-anna/linux-next (8c39076c276b NFSv4.2: support EXCHGID4_FLAG_SUPP_FENCE_OPS 4.2 EXCHANGE_ID flag)
Merging nfsd/nfsd-next (856deb866d16 Linux 5.9-rc5)
Merging cel/cel-next (a826e2b2dd61 NFSD: A semicolon is not needed after a switch statement.)
Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret)
Merging overlayfs/overlayfs-next (be4df0cea08a ovl: use generic vfs_ioc_setflags_prepare() helper)
Merging ubifs/next (e2a05cc7f822 ubifs: mount_ubifs: Release authentication resource in error handling path)
Merging v9fs/9p-next (7ca1db21ef8e net: 9p: initialize sun_server.sun_path to have addr's value only when addr is valid)
Merging xfs/for-next (2c334e12f957 xfs: set xefi_discard when creating a deferred agfl free log intent item)
Merging zonefs/for-next (48bfd5c6fac1 zonefs: document the explicit-open mount option)
Merging iomap/iomap-for-next (1a31182edd00 iomap: Call inode_dio_end() before generic_write_sync())
Merging djw-vfs/vfs-for-next (407e9c63ee57 vfs: move the generic write and copy checks out of mm)
Merging file-locks/locks-next (529adfe8f131 locks: fix a typo at a kernel-doc markup)
Merging vfs/for-next (8853bf827ca8 Merge branches 'work.sparc', 'work.epoll', 'work.sparc32' and 'regset.followup' into for-next)
Applying: fix up for merge of arch/sparc/lib/memset.S
Merging printk/for-next (de6e7a24979b Merge branch 'for-5.10-trivial' into for-next)
Merging pci/next (3650b228f83a Linux 5.10-rc1)
Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao)
CONFLICT (content): Merge conflict in .mailmap
Merging hid/for-next (d0a19d03cbb8 Merge branch 'for-5.11/amd-sfh-hid' into for-next)
Merging i2c/i2c/for-next (47480e8745ac Merge branch 'i2c/for-current' into i2c/for-next)
Merging i3c/i3c/next (abea14bfdebb i3c: master: Fix error return in cdns_i3c_master_probe())
Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved)
Merging hwmon-staging/hwmon-next (eb3f6f77d58c hwmon: (pmbus) shrink code and remove pmbus_do_remove())
Merging jc_docs/docs-next (6fee9372e0af Merge branch 'mauro-warnings' into docs-next)
Merging v4l-dvb/master (dfe3d19bd092 Merge tag 'v5.10-rc1' into patchwork)
Merging v4l-dvb-next/master (d0a9fffedca1 docs: fs: api-summary.rst: get rid of kernel-doc include)
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (bb88d1f9b431 Merge branch 'pm-opp' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (a43128837003 cpufreq: mediatek: add missing platform_driver_unregister() on error in mtk_cpufreq_driver_init)
Merging cpupower/cpupower (748f0d70087c cpupower: Provide online and offline CPU information)
Merging devfreq/devfreq-next (09d56d92ad25 PM / devfreq: tegra30: Silence deferred probe error)
Merging opp/opp/linux-next (b0756034202a opp: Don't return opp_dev from _find_opp_dev())
Merging thermal/thermal/linux-next (703456ba76e9 thermal: mtk_thermal: make device_reset optional)
Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
Merging dlm/next (4f2b30fd9b4b fs: dlm: fix race in nodeid2con)
Merging swiotlb/linux-next (fc0021aa340a swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single)
Merging rdma/for-next (32053e584e4a RDMA/hns: Add support for filling GMV table)
Merging net-next/master (626d667b1960 vxlan: Use a per-namespace nexthop listener instead of a global one)
CONFLICT (content): Merge conflict in drivers/net/ethernet/ibm/ibmvnic.c
Merging bpf-next/for-next (f4c3881edbcc Merge branch 'bpf-migrate-tcp-bpf')
Merging ipsec-next/master (68bb4665a2ce Merge branch 'l2-multicast-forwarding-for-ocelot-switch')
Merging mlx5-next/mlx5-next (3650b228f83a Linux 5.10-rc1)
Merging netfilter-next/master (35b7ee34abdb netfilter: nftables: Add __printf() attribute)
Merging ipvs-next/master (35b7ee34abdb netfilter: nftables: Add __printf() attribute)
Merging wireless-drivers-next/master (3650b228f83a Linux 5.10-rc1)
Merging bluetooth/master (44d59235ace5 Bluetooth: hci_h5: close serdev device and free hu in h5_close)
Merging mac80211-next/master (3cb12d27ff65 Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging gfs2/for-next (da7d554f7c62 gfs2: Wake up when sd_glock_disposal becomes zero)
Merging mtd/mtd/next (232b67c39942 mtd: remove unneeded break)
Merging nand/nand/next (3ebbdef13f82 mtd: rawnand: sunxi: Add MDMA support)
Merging spi-nor/spi-nor/next (3650b228f83a Linux 5.10-rc1)
Merging crypto/master (18d05ca4486f crypto: lib/sha256 - Unroll LOAD and BLEND loops)
Merging drm/drm-next (3cea11cd5e3b Linux 5.10-rc2)
Merging amdgpu/drm-next (18128bd7c292 drm/amdgpu/display: FP fixes for DCN3.x)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/nv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Merging drm-intel/for-linux-next (0e8e272f1368 drm/i915/ehl: Remove invalid PCI ID)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_ddi.c
Merging drm-tegra/drm/tegra/for-next (d9f980ebcd01 drm/tegra: output: rgb: Wrap directly-connected panel into DRM bridge)
Merging drm-misc/for-linux-next (d74252bb8f0e drm: Use the state pointer directly in atomic_check)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
Applying: merge fix up for "drm/amdgpu: Add debugfs entry for printing VM info"
Applying: swiotlb: using SIZE_MAX needs limits.h included
Merging drm-msm/msm-next (d1ea91492585 drm/msm/dp: fix incorrect function prototype of dp_debug_get())
Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500)
Merging imx-drm/imx-drm/next (36fba366cf9f drm/imx: tve remove extraneous type qualifier)
Merging etnaviv/etnaviv/next (4612bad5701e drm/etnaviv: Add lockdep annotations for context lock)
Merging regmap/for-next (f243af4d473b Merge remote-tracking branch 'regmap/for-5.11' into regmap-next)
Merging sound/for-next (ad26098970b6 ALSA: remove unneeded break)
Merging sound-asoc/for-next (f1c4a6b37cdd Merge remote-tracking branch 'asoc/for-5.11' into asoc-next)
Merging modules/modules-next (5e8ed280dab9 module: set MODULE_STATE_GOING state when a module fails to load)
Merging input/next (8a30c6eb29e0 Input: Add MAINTAINERS entry for SiS i2c touch input driver)
Merging block/for-next (a8ad22992051 Merge branch 'tif-task_work.arch' into for-next)
Merging device-mapper/for-next (681cc5e8667e dm: fix request-based DM to not bounce through indirect dm_submit_bio)
Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static)
Merging mmc/next (cc85a5ef3c83 mmc: rtsx_pci: Add SD Express mode support for RTS5261)
Merging mfd/for-mfd-next (6d81dc3c79d4 mfd: kempld-core: Fix unused variable 'kempld_acpi_table' when !ACPI)
Merging backlight/for-backlight-next (97ecfda1a8ff backlight: tosa_bl: Include the right header)
Merging battery/for-next (7007fab4ae82 power: reset: POWER_RESET_OCELOT_RESET should depend on Ocelot or Sparx5)
Merging regulator/for-next (2eb816d54b88 Merge remote-tracking branch 'regulator/for-5.11' into regulator-next)
Merging security/next-testing (bc62d68e2a0a device_cgroup: Fix RCU list debugging warning)
Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable)
Merging integrity/next-integrity (aa662fc04f5b ima: Fix NULL pointer dereference in ima_file_hash)
Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type)
Merging safesetid/safesetid-next (03ca0ec13892 LSM: SafeSetID: Fix warnings reported by test bot)
Merging selinux/next (44141f58e143 selinux: allow dontauditx and auditallowx rules to take effect without allowx)
Merging smack/next (edd615371b66 Smack: Remove unnecessary variable initialization)
Merging tomoyo/master (e991a40b3d00 tomoyo: Limit wildcard recursion depth.)
Merging tpmdd/next (bbd521ce63ab tpm: efi: Don't create binary_bios_measurements file for an empty log)
Merging watchdog/master (3650b228f83a Linux 5.10-rc1)
Merging iommu/next (4dd6ce478003 iommu: Fix a check in iommu_check_bind_data())
Merging audit/next (6d915476e67d audit: trigger accompanying records when no rules present)
Merging devicetree/for-next (3cea11cd5e3b Linux 5.10-rc2)
Merging mailbox/mailbox-for-next (c7dacf5b0f32 mailbox: avoid timer start from callback)
Merging spi/for-next (d51bba5fb892 Merge remote-tracking branch 'spi/for-5.11' into spi-next)
Merging tip/auto-latest (6f72faf4a323 Merge branch 'locking/urgent')
Merging clockevents/timers/drivers/next (f087e452f27e clocksource: sp804: enable Hisilicon sp804 timer 64bit mode)
Merging edac/edac-for-next (24269999027e EDAC: Fix some kernel-doc markups)
Merging irqchip/irq/irqchip-next (d95bdca75b3f irqchip/ti-sci-inta: Add support for unmapped event handling)
Merging ftrace/for-next (e1981f75d398 ring-buffer: Update the description for ring_buffer_wait)
Merging rcu/rcu/next (76b43ef30dc3 kcsan: Fix encoding masks and regain address bit)
Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup)
Merging kvm-arm/next (22f553842b14 KVM: arm64: Handle Asymmetric AArch32 systems)
Merging kvm-ppc/kvm-ppc-next (cf59eb13e151 KVM: PPC: Book3S: Fix symbol undeclared warnings)
Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset)
Merging xen-tip/linux-next (1a89c1dc9520 Documentation: add xen.fifo_events kernel parameter description)
Merging percpu/for-next (eb4c8d15efda Merge branch 'for-5.11' into for-next)
Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON())
Merging drivers-x86/for-next (5c54cb6c627e platform/x86: acer-wmi: Add support for SW_TABLET_MODE on Switch devices)
Merging chrome-platform/for-next (3650b228f83a Linux 5.10-rc1)
Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging leds/for-next (6c3e42616bf2 leds: various: add missing put_device() call in netxbig_leds_get_of_pdata())
Merging ipmi/for-next (0df7b988d9df char: ipmi: remove unneeded break)
Merging driver-core/driver-core-next (3cea11cd5e3b Linux 5.10-rc2)
Merging usb/usb-next (8fba56b4cd53 Merge 5.10-rc2 into usb-next)
Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.)
Merging usb-serial/usb-next (d1849b9ff9f4 USB: serial: iuu_phoenix: remove unneeded break)
Merging usb-chipidea-next/for-usb-next (eba158772841 usb: cdns3: Rids of duplicate error message)
Merging phy-next/next (c36f74566cef MAINTAINERS: Add entry for Qualcomm IPQ4019 USB PHY)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging tty/tty-next (da31de35cd2f tty: goldfish: use __raw_writel()/__raw_readl())
Merging char-misc/char-misc-next (48a3d90adafc Merge 5.10-rc2 into char-misc-next)
Merging extcon/extcon-next (ca26071da1bb dt-bindings: extcon: add binding for TUSB320)
Merging soundwire/next (3650b228f83a Linux 5.10-rc1)
Merging thunderbolt/next (3cea11cd5e3b Linux 5.10-rc2)
Merging vfio/next (2e6cfd496f5b vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages)
Merging staging/staging-next (83e63b2cc416 Merge 5.10-rc2 into staging-next)
CONFLICT (modify/delete): tools/testing/selftests/android/ion/ipcsocket.h deleted in staging/staging-next and modified in HEAD. Version HEAD of tools/testing/selftests/android/ion/ipcsocket.h left in tree.
CONFLICT (modify/delete): tools/testing/selftests/android/ion/ipcsocket.c deleted in staging/staging-next and modified in HEAD. Version HEAD of tools/testing/selftests/android/ion/ipcsocket.c left in tree.
$ git rm -f tools/testing/selftests/android/ion/ipcsocket.c tools/testing/selftests/android/ion/ipcsocket.h
Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr)
Merging icc/icc-next (fce52ad34832 interconnect: qcom: use icc_sync state for sm8[12]50)
Merging dmaengine/next (4749f51ddd8a dmaengine: idxd: Add ABI documentation for shared wq)
CONFLICT (content): Merge conflict in drivers/dma/idxd/registers.h
CONFLICT (content): Merge conflict in drivers/dma/idxd/device.c
Merging cgroup/for-next (65026da59cda cgroup: Zero sized write should be no-op)
Merging scsi/for-next (af61bc1e33d2 scsi: hpsa: Fix memory leak in hpsa_init_one())
Merging scsi-mkp/for-next (d90196317484 scsi: zfcp: Handle event-lost notification for Version Change events)
Merging vhost/linux-next (29ea7644edd2 swiotlb: using SIZE_MAX needs limits.h included)
Merging rpmsg/for-next (3e53119a2521 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (50afb29ae413 Merge branch 'devel' into for-next)
Merging gpio-brgl/gpio/for-next (183245c4f204 gpio: rcar: Implement gpio_chip.get_multiple())
Merging gpio-intel/for-next (3650b228f83a Linux 5.10-rc1)
Merging pinctrl/for-next (03dec17c36a7 Merge branch 'devel' into for-next)
Applying: Revert "pinctrl: rockchip: make driver be tristate module"
Merging pinctrl-intel/for-next (4670abbb298e pinctrl: intel: Add blank line before endif in Kconfig)
Merging pinctrl-samsung/for-next (c5564a50d990 pinctrl: samsung: s3c24xx: remove unneeded break)
Merging pwm/for-next (3b1954cd57bf dt-bindings: pwm: renesas,pwm-rcar: Add r8a7742 support)
Merging userns/for-next (7fce69dff8db Implement kernel_execve)
Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't")
Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds)
Merging kselftest/next (b2f1c3db2887 kselftest: Extend vdso correctness test to clock_gettime64)
Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC")
Merging livepatching/for-next (59fc1e476962 Merge branch 'for-5.10/flive-patching' into for-next)
Merging coresight/next (457c731a901e coresight: Remove unnecessary THIS_MODULE of funnel and replicator driver)
Merging rtc/rtc-next (28d211919e42 rtc: sun6i: Fix memleak in sun6i_rtc_clk_init)
Merging nvdimm/libnvdimm-for-next (a1b8638ba132 Linux 5.9-rc7)
Merging at24/at24/for-next (3650b228f83a Linux 5.10-rc1)
Merging ntb/ntb-next (3650b228f83a Linux 5.10-rc1)
Merging seccomp/for-next/seccomp (38c37e8fd3d2 arm: Enable seccomp architecture tracking)
Merging kspp/for-next/kspp (9b80e4c4ddac overflow: Add __must_check attribute to check_*() helpers)
Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2)
Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO)
Merging slimbus/for-next (c3e02abdf9af slimbus: fix a kernel-doc markup)
Merging nvmem/for-next (436d15fbeaee nvmem: qfprom: Don't touch certain fuses)
Merging xarray/main (fb11305101c2 XArray: Fix split documentation)
Merging hyperv/hyperv-next (626b901f6044 Drivers: hv: vmbus: Add parsing of VMbus interrupt in ACPI DSDT)
Merging auxdisplay/auxdisplay (bbf5c979011a Linux 5.9)
Merging kgdb/kgdb/for-next (d081a6e35316 kdb: Fix pager search for multi-line strings)
Merging pidfd/for-next (e06ce5515b74 Merge branch 'pidfd_o_nonblock' into for-next)
Merging hmm/hmm (3650b228f83a Linux 5.10-rc1)
Merging fpga/for-next (cbadbf5a53b5 Merge branch 'dfl_modularization' into for-next)
Merging kunit/test (3650b228f83a Linux 5.10-rc1)
Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache)
Merging cfi/cfi/next (5de15b610f78 mtd: hyperbus: add Renesas RPC-IF driver)
Merging kunit-next/kunit (3650b228f83a Linux 5.10-rc1)
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 zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7)
Merging mhi/mhi-next (3650b228f83a Linux 5.10-rc1)
Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications)
CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h
CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl
CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl
CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl
CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl
CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/ia64/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h
CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl
CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl
Applying: rest of merge fix up for syscall conflict
Merging memblock/for-next (762d4d1a174c arch/ia64: Restore arch-specific pgd_offset_k implementation)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging counters/counters (3650b228f83a Linux 5.10-rc1)
Merging akpm-current/current (a1f9165f0d93 lib/lzo/lzo1x_compress.c: make lzogeneric1x_1_compress() static)
CONFLICT (content): Merge conflict in include/linux/sched.h
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (abbb4879a620 mm/gup: assert that the mmap lock is held in __get_user_pages())

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

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

* linux-next: Tree for Nov 4
@ 2015-11-04  6:38 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2015-11-04  6:38 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

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

Changes since 20151103:

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

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

The akpm tree gained a conflict against the drm tree and lost a patch
that turned up elsewhere.

Non-merge commits (relative to Linus' tree): 10589
 8442 files changed, 409626 insertions(+), 188833 deletions(-)

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

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

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

Below is a summary of the state of the merge.

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

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

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

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

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

$ git checkout master
$ git reset --hard stable
Merging origin/master (316dde2fe95b Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm)
Merging fixes/master (25cb62b76430 Linux 4.3-rc5)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (049e6dde7e57 Linux 4.3-rc4)
Merging arm-current/fixes (38850d786a79 ARM: 8449/1: fix bug in vdsomunge swab32 macro)
Merging m68k-current/for-linus (95bc06ef049b m68k/defconfig: Update defconfigs for v4.3-rc1)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (977bf062bba3 powerpc/dma: dma_set_coherent_mask() should not be GPL only)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave)
Merging net/master (ebac62fe3d24 ipv6: fix tunnel error handling)
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (6ece90f9a13e netfilter: fix Kconfig dependencies for nf_dup_ipv{4,6})
Merging sound-current/for-linus (de1ab6af5c3d ALSA: hda - Fix lost 4k BDL boundary workaround)
Merging pci-current/for-linus (1266963170f5 PCI: Prevent out of bounds access in numa_node override)
Merging wireless-drivers/master (de28a05ee28e Merge tag 'iwlwifi-for-kalle-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging driver-core.current/driver-core-linus (9ffecb102835 Linux 4.3-rc3)
Merging tty.current/tty-linus (f235f664a8af fbcon: initialize blink interval before calling fb_set_par)
Merging usb.current/usb-linus (32b88194f71d Linux 4.3-rc7)
Merging usb-gadget-fixes/fixes (25cb62b76430 Linux 4.3-rc5)
Merging usb-serial-fixes/usb-linus (32b88194f71d Linux 4.3-rc7)
Merging usb-chipidea-fixes/ci-for-usb-stable (f256896afdb6 usb: chipidea: otg: gadget module load and unload support)
Merging staging.current/staging-linus (32b88194f71d Linux 4.3-rc7)
Merging char-misc.current/char-misc-linus (25cb62b76430 Linux 4.3-rc5)
Merging input-current/for-linus (195562194aad Input: alps - only the Dell Latitude D420/430/620/630 have separate stick button bits)
Merging crypto-current/master (4afa5f961792 crypto: algif_hash - Only export and import on sockets with data)
Merging ide/master (353b39d1b151 ide: pdc202xx_new: Replace timeval with ktime_t)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue)
Merging kselftest-fixes/fixes (ae7858180510 selftests: exec: revert to default emit rule)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (6a13feb9c828 Linux 4.3)
Merging asm-generic/master (4008cb3ad223 asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h)
Merging arc/for-next (5a364c2a1762 ARC: mm: PAE40 support)
Merging arm/for-next (4f96dfc97367 Merge branches 'drm-dwhdmi-devel', 'drm-tda998x-devel2' and 'drm-armada-devel' into for-next)
Merging arm-perf/for-next/perf (6ff33f3902c3 Linux 4.3-rc1)
Merging arm-soc/for-next (cd676572bf18 ARM: SoC: document merges)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sama5d2.dtsi
Merging at91/at91-next (c544ee640869 Merge tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging berlin/berlin/for-next (27527ea5f2fd Merge branch 'berlin/soc' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (f843df81257a Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next)
Merging mvebu/for-next (2a9e275d2fbf Merge branch 'mvebu/config' into mvebu/for-next)
Merging omap/for-next (f2a148747f11 Merge branch 'omap-for-v4.3/fixes' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging qcom/qcom/for-next (fcbba086b456 ARM: dts: msm8974: Add SCM firmware node)
CONFLICT (content): Merge conflict in drivers/soc/qcom/smd-rpm.c
CONFLICT (content): Merge conflict in drivers/soc/qcom/Kconfig
Merging renesas/next (c7aba848d39f Merge branches 'heads/defconfig-for-v4.4' and 'heads/dt-for-v4.4' into next)
Merging rockchip/for-next (55e899c44d10 Merge branch 'v4.4-armsoc/drivers' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (4ccfae394061 Merge branch 'v4.4-samsung-defconfig' into for-next)
CONFLICT (content): Merge conflict in drivers/soc/Makefile
CONFLICT (content): Merge conflict in drivers/soc/Kconfig
Merging samsung-krzk/for-next (6ff33f3902c3 Linux 4.3-rc1)
Merging sunxi/sunxi/for-next (7022e5f74246 Merge branch 'sunxi/dt-for-4.4' into sunxi/for-next)
Merging tegra/for-next (2d37df587e3c Merge branch for-4.4/defconfig into for-next)
Merging arm64/for-next/core (f8f8bdc48851 arm64/efi: fix libstub build under CONFIG_MODVERSIONS)
CONFLICT (content): Merge conflict in arch/arm64/kernel/suspend.c
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (918fc2ee791e cris: Drop reference to get_cmos_time())
Merging h8300/h8300-next (6829bca19fa4 h8300: Don't set CROSS_COMPILE unconditionally)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address)
Merging m68knommu/for-next (4ac313111018 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU)
Merging metag/for-next (3dce23eb8878 metag: Turn irq_ctx_* macros into static inlines)
Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
Merging mips/mips-for-linux-next (4deb27263d5f Merge branch '4.3-fixes' into mips-for-linux-next)
Merging nios2/for-next (8840da98bfec nios2: Switch to generic __xchg())
Merging parisc-hd/for-next (a01fece2e418 parisc: Change L1_CACHE_BYTES to 16)
Merging powerpc/next (3b0e21ec3b22 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (e1f580e8ced5 powerpc/e6500: hw tablewalk: make sure we invalidate and write to the same tlb entry)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (b38feccd663b s390: remove runtime instrumentation interrupts)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (09745f38a74e arch/tile: turn off timer tick for oneshot_stopped state)
Merging uml/linux-next (56b88a3bf97a um: Fix kernel mode fault condition)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing)
Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled)
Merging ceph/master (8dbd263de1cb ceph: improve readahead for file holes)
Merging cifs/for-next (592fafe644bf Add resilienthandles mount parm)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (d4eb6dee4712 ext4: Update EXT4_USE_FOR_EXT2 description)
Merging ext4/dev (ff8d13457399 fs/ext4: remove unnecessary new_valid_dev check)
Merging f2fs/dev (beaa57dd986d f2fs: fix to skip shrinking extent nodes)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry)
Merging gfs2/for-next (f3dd1649122b gfs2: Remove gl_spin define)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (941c3ff3102c Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug)
Merging nfsd/nfsd-next (1bc483f959c8 SUNRPC: drop stale comment in svc_setup_socket())
Merging orangefs/for-next (548049495cb4 Orangefs: fix some checkpatch.pl complaints that had creeped in.)
Merging overlayfs/overlayfs-next (8d3095f4ad47 ovl: default permissions)
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (46cfbe8e037a 9p: trans_fd, bail out if recv fcall if missing)
Merging ubifs/linux-next (1cb8f9776c7d ubi: fastmap: Implement produce_free_peb())
Merging xfs/for-next (264e89ad3412 Merge branch 'xfs-dax-updates' into for-next)
Merging file-locks/linux-next (616fb38fa7a9 locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait)
Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root)
Merging pci/next (7225107e1582 Merge branch 'pci/host-layerscape' into next)
Merging hid/for-next (a88707048ff5 Merge branch 'for-4.4/wacom' into for-next)
Merging i2c/i2c/for-next (121c7794864c Merge branch 'i2c/for-4.4' into i2c/for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define)
Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging hwmon-staging/hwmon-next (3b5ea47dbff0 hwmon: (fam15h_power) Add max compute unit accumulated power)
Merging v4l-dvb/master (8132ccfb864a Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (674327f76bb1 Merge branch 'kbuild/kconfig' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (fca9051bec79 Merge branch 'for-4.4' into for-next)
Merging pm/linux-next (1ab68460b1d0 Merge branches 'pm-avs', 'pm-clk' and 'powercap')
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/timer.c
Applying: ARM: mediatek: fixup for clocksource_of_init API change
Merging idle/next (f05bd12f0e9c Merge branch 'cpuidle' into release)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (3ce79ae29210 Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next)
Merging thermal-soc/next (8fb2b9ac2aad thermal: underflow bug in imx_set_trip_temp())
Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE)
Merging slave-dma/next (6782af4b4071 Merge branch 'for-linus' into next)
Merging net-next/master (f32bfb9a8ca0 sh_eth: use DMA barriers)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (92240e8dc0d1 ipvs: Remove possibly unused variables from ip_vs_conn_net_{init,cleanup})
Merging wireless-drivers-next/master (8aaa878de83a Merge ath-next from ath.git)
Merging bluetooth/master (58ef0dee40a9 Bluetooth: Fix issue with HCI_QUIRK_FIXUP_INQUIRY_MODE and event mask)
Merging rdma/for-next (39bfc271bd68 IB/core: Remove old fast registration API)
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
Merging mtd/master (e5a5d92d9dc3 mxc_nand: fix copy_spare)
Merging l2-mtd/master (28ec8a864f4b mtd: nand: sunxi: avoid retrieving data before ECC pass)
Merging crypto/master (271817a3e92c crypto: asymmetric_keys - Fix unaligned access in x509_get_sig_params())
Merging drm/drm-next (1c431cb46153 Merge branch 'linux-4.4' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
Merging drm-panel/drm/panel/for-next (f1811a8a6413 drm/bridge: ptn3460: Fix coccinelle warnings)
Merging drm-intel/for-linux-next (9be64eee3a87 drm/i915: add quirk to enable backlight on Dell Chromebook 11 (2015))
Merging drm-tegra/drm/tegra/for-next (2bcdcbfae289 drm/tegra: dc: Request/free syncpoint at init/exit)
Merging drm-misc/topic/drm-misc (364b19868ecd drm/dp: add eDP DPCD backlight control bit definitions)
Merging drm-exynos/exynos-drm/for-next (7d9071a09502 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging drm-msm/msm-next (a9ee34b70e07 drm/msm: Remove local fbdev emulation Kconfig option)
Merging sound/for-next (de1ab6af5c3d ALSA: hda - Fix lost 4k BDL boundary workaround)
Merging sound-asoc/for-next (3417bda8def3 Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fsl-sai' and 'asoc/fix/wm8960' into asoc-linus)
Merging modules/modules-next (d1189c63ea5e scripts: [modpost] add new sections to white list)
CONFLICT (content): Merge conflict in scripts/Makefile.modpost
Merging input/next (a748941c95d2 Input: tsc2004 - add support for tsc2004)
Merging block/for-next (3387dbebe45f Merge branch 'for-4.4/lightnvm' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging device-mapper/for-next (aad9ae455075 dm switch: simplify conditional in alloc_region_table())
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (7cc8d580228c mmc: dw_mmc: fix the wrong setting for UHS-DDR50 mode)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (339421def582 MD: when RAID journal is missing/faulty, block RESTART_ARRAY_RW)
Merging mfd/for-mfd-next (0b8431c65b01 mfd: sec-core: Remove unused s2mpu02-rtc and s2mpu02-clk children)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/s2mps11.txt
Merging backlight/for-backlight-next (9d6c243502b7 backlight: pm8941-wled: Add default-brightness property)
Merging battery/master (6bd03ce3c12a power: bq27xxx_battery: Remove unneeded dependency in Kconfig)
$ git reset --hard HEAD^
Merging next-20150925 version of battery
Merging omap_dss2/for-next (08bfb453f045 radeonfb: Deinline large functions)
Merging regulator/for-next (6a13feb9c828 Linux 4.3)
Merging security/next (ba94c3ff20c9 Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
CONFLICT (content): Merge conflict in fs/ext4/crypto_key.c
Merging integrity/next (72e1eed8abb1 integrity: prevent loading untrusted certificates on the IMA trusted keyring)
Merging selinux/next (63205654c0e0 selinux: Use a kmem_cache for allocation struct file_security_struct)
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (760d280084f8 watchdog: include: add units for timeout values in kerneldoc)
Merging iommu/next (b67ad2f7c751 Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next)
Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback)
Merging vfio/next (f54e0bcf65bf vfio: Include No-IOMMU mode)
Merging jc_docs/docs-next (3ce96239d482 Documentation: add new description of path-name lookup.)
CONFLICT (content): Merge conflict in Documentation/Changes
Merging trivial/for-next (0c6cac7ab444 hwmon: applesmc: fix comment typos)
Merging audit/next (a4416687e957 audit: make audit_log_common_recv_msg() a void function)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (61dd90224c13 devicetree: add Sigma Designs vendor prefix)
Merging mailbox/mailbox-for-next (c3ac54a6f554 mailbox: Off by one in mbox_test_message_read())
$ git reset --hard HEAD^
Merging next-20151022 version of mailbox
Merging spi/for-next (81247d8f8cf6 Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/imx', 'spi/fix/omap2-mcspi', 'spi/fix/ti-qspi' and 'spi/fix/xilinx' into spi-linus)
Merging tip/auto-latest (90939cc5352f Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in include/linux/of_irq.h
CONFLICT (content): Merge conflict in arch/x86/Makefile
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/acpi.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/atomic.h
CONFLICT (content): Merge conflict in Documentation/arm/uefi.txt
Merging clockevents/clockevents/next (0e4baaa9a11b clocksource/drivers/exynos_mct: Use container_of() instead of this_cpu_ptr())
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (990995bad13c EDAC: Fix PAGES_TO_MiB macro misuse)
Merging irqchip/irqchip/for-next (29bade08fb07 irqchip: armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (c6650b2e5772 tracing: ftrace_event_is_function() can return boolean)
Applying: Add missing 'bool preempt' argument as required by sched_switch's trace event proto
Merging rcu/rcu/next (39cd2dd39a8b Merge branches 'doc.2015.10.06a', 'percpu-rwsem.2015.10.06a' and 'torture.2015.10.06a' into HEAD)
Merging kvm/linux-next (d6cf98e06ea4 Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD)
Merging kvm-arm/next (5fdf876d30ce KVM: arm: Do not indent the arguments of DECLARE_BITMAP)
CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_host.h
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (70aa3961a196 KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path)
Merging kvms390/next (46b708ea875f KVM: s390: use simple switch statement as multiplexer)
Merging xen-tip/linux-next (abed7d0710e8 xen: fix the check of e_pfn in xen_find_pfn_range)
Merging percpu/for-next (5a928541585b kernel: Remove unneeded return from void function)
Merging workqueues/for-next (4fcfc3013144 Merge branch 'for-4.4' into for-next)
Merging drivers-x86/for-next (9d1d459bf52b intel_scu_ipc: Protect dev member assignment on ->remove())
Merging chrome-platform/for-next (18800fc7a04e platform/chrome: Support reading/writing the vboot context)
Merging regmap/for-next (8522c96259ca Merge tag 'regmap-v4.4' into regmap-linus)
Merging hsi/for-next (16bd5865cdb3 hsi: controllers:remove redundant code)
Merging leds/for-next (ffdc307d038f leds: 88pm860x: add missing of_node_put)
Merging ipmi/for-next (d503e2fbbfea char: ipmi: ipmi_ssif: Replace timeval with timespec64)
Merging driver-core/driver-core-next (c23fe83138ed debugfs: Add debugfs_create_ulong())
Merging tty/tty-next (e052c6d15c61 tty: Use unbound workqueue for all input workers)
Merging usb/usb-next (0bbc367e21bf Merge 4.3-rc7 into usb-next)
Merging usb-gadget/next (81e9d14a53eb usb: gadget: net2280: restore ep_cfg after defect7374 workaround)
Merging usb-serial/usb-next (92944c4520ed USB: qcserial: update comment for Sierra Wireless MC7304/MC7354)
Merging usb-chipidea-next/ci-for-usb-next (2fb2884ed856 usb: chipidea: delete static debug support)
Merging staging/staging-next (e3cc3136df33 Staging: rtl8192u: ieee80211: added missing blank lines)
CONFLICT (content): Merge conflict in drivers/staging/mt29f_spinand/mt29f_spinand.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
Merging char-misc/char-misc-next (e2d8680741ed fpga: socfpga: Fix check of return value of devm_request_irq)
Merging extcon/extcon-next (11eecf910bd8 extcon: Modify the id and name of external connector)
Merging cgroup/for-next (d57456753787 cgroup: fix race condition around termination check in css_task_iter_next())
CONFLICT (content): Merge conflict in kernel/sched/core.c
CONFLICT (content): Merge conflict in kernel/events/core.c
Applying: vmscan build fix
Merging scsi/for-next (5575a6ea316b Merge branch 'fixes' into for-next)
Merging target-updates/for-next (517982229f78 configfs: remove old API)
Applying: stm class: Use per-attribute show and store methods in configfs policy
Merging target-merge/for-next-merge (8edb1554f7c2 mpt3sas: Fix unprotected list lookup in v4.3-rc0 changes)
Merging pinctrl/for-next (d99c8053fc24 pinctrl: pinconf: remove needless loop)
Merging vhost/linux-next (d629f2b585cb virtio: introduce avail cache)
Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (0963670aeaec gpio: fix up SPI submenu)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (7e3b7dc76c41 pwm: Add MediaTek display PWM driver support)
Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (e5bf1991ea62 clk: qcom: msm8960: Fix dsi1/2 halt bits)
CONFLICT (content): Merge conflict in drivers/clk/Kconfig
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (6ff33f3902c3 Linux 4.3-rc1)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (3b5bab390181 selftests: breakpoint: Actually build it)
Merging y2038/y2038 (8750343a6505 coredump: Use 64bit time for unix time of coredump)
Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic)
Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next)
Merging coresight/next (c0d90ad7604a coresight: checking for NULL string in coresight_name_match())
Merging rtc/rtc-next (2225ffdda79f rtc: Add a driver for Micro Crystal RV8803)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (538ea4aa4473 pmem, memremap: convert to numa aware allocations)
Merging akpm-current/current (f1e1fabe6b48 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/pgtable-generic.c
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in mm/huge_memory.c
CONFLICT (content): Merge conflict in mm/failslab.c
CONFLICT (content): Merge conflict in fs/proc/task_mmu.c
CONFLICT (content): Merge conflict in fs/9p/vfs_file.c
CONFLICT (content): Merge conflict in drivers/usb/host/u132-hcd.c
CONFLICT (content): Merge conflict in block/blk-mq.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arc/mm/cache.c
Applying: mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix
Applying: mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix-fix
Applying: block: fixes for __GPF_WAIT changes
Applying: ndb: fix up for dequeue_signal_lock API change
$ git checkout -b akpm remotes/origin/akpm/master
Applying: net/ipv4/route.c: prevent oops
Applying: mips: add entry for new mlock2 syscall
Applying: sparc/sparc64: allocate sys_membarrier system call number
Applying: kernel.h: make abs() work with 64-bit types
Applying: Remove abs64()
Applying: remove-abs64-fix
Applying: remove-abs64-fix-fix
Applying: remove-abs64-fix-fix-fix
Applying: Documentation/sysctl/vm.txt: fix misleading code reference of overcommit_memory
Applying: pcnet32: use pci_set_dma_mask insted of pci_dma_supported
Applying: tw68-core: use pci_set_dma_mask insted of pci_dma_supported
Applying: saa7164: use pci_set_dma_mask insted of pci_dma_supported
Applying: saa7134: use pci_set_dma_mask insted of pci_dma_supported
Applying: cx88: use pci_set_dma_mask insted of pci_dma_supported
Applying: cx25821: use pci_set_dma_mask insted of pci_dma_supported
Applying: cx23885: use pci_set_dma_mask insted of pci_dma_supported
Applying: netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported
Applying: nouveau: don't call pci_dma_supported
CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_ttm.c
Applying: sfc: don't call dma_supported
Applying: kaweth: remove ifdefed out call to dma_supported
Applying: usbnet: remove ifdefed out call to dma_supported
Applying: pci: remove pci_dma_supported
Applying: dma: remove external references to dma_supported
Applying: drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS
Applying: kmap_atomic_to_page() has no users, remove it
Applying: include/linux/kdev_t.h: remove unused huge_valid_dev()
Applying: include/linux/kdev_t.h: old/new_valid_dev() can return bool
Applying: fs/9p: remove unnecessary new_valid_dev() checks
Applying: fs/btrfs/inode.c: remove unnecessary new_valid_dev() check
Applying: fs/exofs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/ext2/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/f2fs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/hpfs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/jfs: remove unnecessary new_valid_dev() checks
Applying: fs/ncpfs/dir.c: remove unnecessary new_valid_dev() check
Applying: fs/nilfs2/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/reiserfs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/stat.c: remove unnecessary new_valid_dev() check
Applying: fs/ubifs/: remove unnecessary new_valid_dev() checks
Applying: fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries
Merging akpm/master (054a5ab32fed fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries)

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

* Re: linux-next: Tree for Nov 4
  2014-11-04 21:56 ` Geert Uytterhoeven
@ 2014-11-05  2:07   ` Michael Ellerman
  0 siblings, 0 replies; 10+ messages in thread
From: Michael Ellerman @ 2014-11-05  2:07 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: Stephen Rothwell, Linux-Next, linux-kernel

On Tue, 2014-11-04 at 22:56 +0100, Geert Uytterhoeven wrote:
> Hi Stephen, Michael,
> 
> On Tue, Nov 4, 2014 at 7:36 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 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.
> 
> Looks like the build results got stuck on Nov 3? There are also no
> results for v3.18-rc3 yet.

I'm working on it :)

cheers



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

* Re: linux-next: Tree for Nov 4
  2014-11-04  6:36 Stephen Rothwell
  2014-11-04 20:57 ` Guenter Roeck
@ 2014-11-04 21:56 ` Geert Uytterhoeven
  2014-11-05  2:07   ` Michael Ellerman
  1 sibling, 1 reply; 10+ messages in thread
From: Geert Uytterhoeven @ 2014-11-04 21:56 UTC (permalink / raw)
  To: Stephen Rothwell, Michael Ellerman; +Cc: Linux-Next, linux-kernel

Hi Stephen, Michael,

On Tue, Nov 4, 2014 at 7:36 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.

Looks like the build results got stuck on Nov 3? There are also no
results for v3.18-rc3 yet.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

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

* Re: linux-next: Tree for Nov 4
  2014-11-04  6:36 Stephen Rothwell
@ 2014-11-04 20:57 ` Guenter Roeck
  2014-11-04 21:56 ` Geert Uytterhoeven
  1 sibling, 0 replies; 10+ messages in thread
From: Guenter Roeck @ 2014-11-04 20:57 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel

On Tue, Nov 04, 2014 at 05:36:24PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20141103:
> 
> The mfd tree gained a build failure for which I reverted a commit.
> 
> The scsi tree lost its build failure, but gained another so I used the
> version from next-20141031.
> 
> Non-merge commits (relative to Linus' tree): 3170
>  2579 files changed, 83652 insertions(+), 106096 deletions(-)
> 

Build results:
	total: 133 pass: 113 fail: 20
Failed builds:
	arm:omap2plus_defconfig
	arm:axm55xx_defconfig
	arm64:defconfig
	avr32:defconfig
	i386:allmodconfig
	m68k:allmodconfig
	microblaze:mmu_defconfig
	microblaze:nommu_defconfig
	mips:allmodconfig
	mips:nlm_xlp_defconfig
	powerpc:allmodconfig (binutils 2.23)
	powerpc:mpc85xx_defconfig
	powerpc:mpc85xx_smp_defconfig
	powerpc:allmodconfig (binutils 2.24)
	powerpc:mpc85xx_defconfig
	powerpc:mpc85xx_smp_defconfig
	s390:defconfig
	sparc64:allmodconfig
	tile:tilegx_defconfig
	xtensa:allmodconfig

Qemu test results:
	total: 30 pass: 28 fail: 2
Failed tests:
	arm64:arm64_smp_defconfig
	arm64:arm64_nosmp_defconfig

Most of the failures are due to missing declarations of 'audit_file'.

Also:

drivers/video/backlight/backlight.c:556:26: error: redefinition of
'of_find_backlight_by_node'
include/linux/backlight.h:164:1: note: previous definition of
'of_find_backlight_by_node' was here

There are also several tracebacks in the powerpc test.

WARNING: at kernel/workqueue.c:1360
Modules linked in:
CPU: 0 PID: 32 Comm: kadbprobe Not tainted
3.18.0-rc3-next-20141104-yocto-standard #1
task: c7a0a9a0 ti: c7ade000 task.ti: c7ade000
NIP: c0044e38 LR: c0044f00 CTR: c04ad3ac
REGS: c7adfae0 TRAP: 0700   Not tainted
(3.18.0-rc3-next-20141104-yocto-standard)
MSR: 00021032 <ME,IR,DR,RI>  CR: 82008082  XER: 00000000

GPR00: c0044f00 c7adfb90 c7a0a9a0 00000001 00000000 c0999940 00000000 c0900000 
GPR08: 00000000 00000001 00000002 00000000 82008082 00000000 c004b99c c7ab66c0 
GPR16: 00000000 00000000 00000000 00000003 00000000 c7ad035c 00000001 c08e7984 
GPR24: c08e6f44 00000000 c08f68ac c7ade000 c0999944 c781cc00 c0aa9500 c0999940 
NIP [c0044e38] __queue_work+0xf8/0x3e8
LR [c0044f00] __queue_work+0x1c0/0x3e8
Call Trace:
[c7adfb90] [c0044f00] __queue_work+0x1c0/0x3e8 (unreliable)
[c7adfbc0] [c0045190] queue_work_on+0x68/0x88
[c7adfbd0] [c050ed90] led_trigger_event+0x4c/0xa8
[c7adfbf0] [c0431c38] kbd_ledstate_trigger_activate+0x7c/0xa4
[c7adfc00] [c050ef48] led_trigger_set+0x15c/0x1dc
[c7adfc30] [c050f1f4] led_trigger_set_default+0x90/0xd4
[c7adfc50] [c050e9b8] led_classdev_register+0x108/0x12c
[c7adfc60] [c04ad650] input_led_connect+0xd4/0x250
[c7adfca0] [c04aa08c] input_register_device+0x42c/0x4b4
[c7adfcc0] [c045c9dc] adbhid_input_register+0x4e0/0x62c
[c7adfd00] [c045cbd0] adbhid_input_reregister+0xa8/0xac
[c7adfd20] [c045cd0c] adbhid_probe+0x138/0x4fc
[c7adfde0] [c045d590] adb_message_handler+0x30/0xec
[c7adfe00] [c004ca7c] notifier_call_chain+0x78/0xc0
[c7adfe20] [c004cfe8] __blocking_notifier_call_chain+0x5c/0x80
[c7adfe40] [c045ebe0] do_adb_reset_bus+0x11c/0x3c4
[c7adfee0] [c045eeb0] adb_probe_task+0x28/0x58
[c7adfef0] [c004ba64] kthread+0xc8/0xdc
[c7adff40] [c001065c] ret_from_kernel_thread+0x5c/0x64

Details at http://server.roeck-us.net:8010/builders.

Guenter

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

* linux-next: Tree for Nov 4
@ 2014-11-04  6:36 Stephen Rothwell
  2014-11-04 20:57 ` Guenter Roeck
  2014-11-04 21:56 ` Geert Uytterhoeven
  0 siblings, 2 replies; 10+ messages in thread
From: Stephen Rothwell @ 2014-11-04  6:36 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

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

Hi all,

Changes since 20141103:

The mfd tree gained a build failure for which I reverted a commit.

The scsi tree lost its build failure, but gained another so I used the
version from next-20141031.

Non-merge commits (relative to Linus' tree): 3170
 2579 files changed, 83652 insertions(+), 106096 deletions(-)

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

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

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

Below is a summary of the state of the merge.

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

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

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

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

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

$ git checkout master
$ git reset --hard stable
Merging origin/master (f4ca536f71ad Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k)
Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1)
Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4)
Merging arm-current/fixes (9ff0bb5ba606 ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn())
Merging m68k-current/for-linus (f7bbd12a4b7e m68k: Wire up bpf)
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash)
Merging powerpc-merge-mpe/fixes (10ccaf178b2b powerpc: use device_online/offline() instead of cpu_up/down())
Merging sparc/master (7da89a2a3776 sparc64: Fix crashes in schizo_pcierr_intr_other().)
Merging net/master (9fd3d3a43072 sfc: don't BUG_ON efx->max_channels == 0 in probe)
Merging ipsec/master (d10845fc85b2 Merge branch 'gso_encap_fixes')
Merging sound-current/for-linus (1df8874bfab1 ALSA: hda/realtek - Update Initial AMP for EAPD control)
Merging pci-current/for-linus (d8e7d53a2fc1 PCI: Rename sysfs 'enabled' file back to 'enable')
Merging wireless/master (75a916e1944f rtlwifi: rtl8192se: Fix firmware loading)
Merging driver-core.current/driver-core-linus (0df1f2487d2f Linux 3.18-rc3)
Merging tty.current/tty-linus (0df1f2487d2f Linux 3.18-rc3)
Merging usb.current/usb-linus (0df1f2487d2f Linux 3.18-rc3)
Merging usb-gadget-fixes/fixes (9599815de61d usb: dwc2: gadget: fix enumeration issues)
Merging usb-serial-fixes/usb-linus (e681286de221 USB: opticon: fix non-atomic allocation in write path)
Merging staging.current/staging-linus (0df1f2487d2f Linux 3.18-rc3)
Merging char-misc.current/char-misc-linus (0df1f2487d2f Linux 3.18-rc3)
Merging input-current/for-linus (e55a3366984c Revert "Input: i8042 - disable active multiplexing by default")
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (09adc8789c4e crypto: qat - Enforce valid numa configuration)
Merging ide/master (7546e52b5e3d Drivers: ide: Remove typedef atiixp_ide_timing)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (e66c98c7a0ea of: Fix NULL dereference in selftest removal code)
Merging rr-fixes/fixes (f49819560f53 virtio-rng: skip reading when we start to remove the device)
Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
Merging kselftest-fixes/fixes (0df1f2487d2f Linux 3.18-rc3)
Merging drm-intel-fixes/for-linux-next-fixes (0df1f2487d2f Linux 3.18-rc3)
Merging asm-generic/master (f3670394c29f Revert "x86/efi: Fixup GOT in all boot code paths")
Merging arc/for-next (996bad6cb351 ARC: add power management options)
Merging arm/for-next (9ff0bb5ba606 ARM: 8180/1: mm: implement no-highmem fast path in kmap_atomic_pfn())
Merging arm-perf/for-next/perf (af66abfe2ec8 arm: perf: fold hotplug notifier into arm_pmu)
Merging arm-soc/for-next (3d97171519b2 Merge branch 'fixes' into for-next)
Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
Merging berlin/berlin/for-next (bb3adf0f4627 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (809d4af84856 Merge branch 'imx/dt' into for-next)
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging keystone/next (39179cb5b789 soc: ti: knav_qmss_queue: Return proper error if devm_kzalloc fails)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (0626430385b7 Merge branch 'mvebu/dt' into mvebu/for-next)
Merging renesas/next (1c43133a8125 Merge branches 'heads/dt-cleanups-for-v3.19', 'heads/dt-clocksource-for-v3.19', 'heads/kconfig-cleanups-for-v3.19', 'heads/clocks-for-v3.19' and 'heads/runtime-pm-for-v3.19' into next)
Merging samsung/for-next (5d184e4fb69a Merge branch 'v3.19-next/pm-samsung-2' into for-next)
Merging sunxi/sunxi/for-next (2f38ad8b07ac Merge branch 'sunxi/dt-for-3.19' into sunxi/for-next)
Merging tegra/for-next (5599b9197647 Merge branch for-3.18/defconfig into for-next)
Merging arm64/for-next/core (0a6479b0ffad arm64: Remove unneeded extern keyword)
Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
Merging cris/for-next (21bd887cd7c4 CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD)
Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
Merging ia64/next (0f33be009b89 Linux 3.17-rc6)
Merging m68k/for-next (bcf8eb09b564 nubus: Remove superfluous interrupt disable/restore)
Merging m68knommu/for-next (cac7f2429872 Linux 3.18-rc2)
Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check)
Merging microblaze/next (a4f174dee4ae microblaze: Wire up bpf syscall)
Merging mips/mips-for-linux-next (2f2a6e421b36 Merge branch '3.18-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (5e40d331bd72 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging powerpc-mpe/next (c3351dfabf5c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending)
Merging fsl/next (cb0446c1b625 Revert "powerpc/fsl_msi: spread msi ints across different MSIRs")
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging s390/features (eaf785d51dc6 s390/cpum_sf: Remove initialization of PMU event index)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (78410af51146 tile: add clock_gettime support to vDSO)
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (66acb0216d5a Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
Merging btrfs/next (a43bb39b5c71 btrfs: Fix compile error when CONFIG_SECURITY is not set.)
Merging ceph/master (c27a3e4d667f libceph: do not hard code max auth ticket len)
Merging cifs/for-next (6212096bb0a1 [CIFS] Update modinfo cifs version for cifs.ko)
Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (831115af5ca3 eCryptfs: Remove unnecessary casts when parsing packet lengths)
Merging ext3/for_next (3c9cafe05ff0 fs, jbd: use a more generic hash function)
Merging ext4/dev (ae9e9c6aeea6 ext4: make ext4_ext_convert_to_initialized() return proper number of blocks)
Merging f2fs/dev (1c000698c138 f2fs: introduce -o fastboot for reducing booting time only)
Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.)
CONFLICT (content): Merge conflict in fs/fscache/object.c
Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT)
Merging gfs2/master (1a8550332a7f GFS2: If we use up our block reservation, request more next time)
Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr)
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (cac7f2429872 Linux 3.18-rc2)
Merging nfsd/nfsd-next (ccc6398ea5d5 nfsd: clean up comments over nfs4_file definition)
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
Merging ubifs/linux-next (91401a34038e UBI: Fastmap: Calc fastmap size correctly)
Merging xfs/for-next (5d11fb4b9a1d xfs: rework zero range to prevent invalid i_size updates)
Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING)
Merging vfs/for-next (9c883c360fd0 Merge branch 'for-lustre' into for-next)
Merging pci/next (f114040e3ea6 Linux 3.18-rc1)
Merging hid/for-next (35c6022b8a7c Merge branch 'for-3.19/logitech' into for-next)
Merging i2c/i2c/for-next (f114040e3ea6 Linux 3.18-rc1)
Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro)
Merging hwmon-staging/hwmon-next (efe8271c1e1b hwmon: (iio_hwmon) Add support for humidity sensors)
Merging v4l-dvb/master (7a7f1ab37dc8 [media] v4l2-ctrls: fix sparse warning)
Merging kbuild/for-next (e9f717fb534c Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
Merging libata/for-next (e35b98849f25 ata: sata_rcar: Add r8a7793 device support)
Merging pm/linux-next (e4e1a5936e36 Merge branch 'device-properties' into linux-next)
Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (6ceaf58abe25 Merge branch 'int340x-thermal' of .git into next)
Merging thermal-soc/next (9d020cd1d314 Thermal:Remove usless if(!result) before return tz)
Merging ieee1394/for-next (19583ca584d6 Linux 3.16)
Merging dlm/next (c07127b48c63 dlm: fix missing endian conversion of rcom_status flags)
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
Merging slave-dma/next (f114040e3ea6 Linux 3.18-rc1)
Merging net-next/master (56b174256b69 net: add rbnode to struct sk_buff)
Merging ipsec-next/master (5c1e9f2c1ff7 xfrm: fix set but not used warning in xfrm_policy_queue_process())
Merging wireless-next/master (6bc6c49f1e2f mwifiex: add cfg80211 dump_survey handler)
Merging bluetooth/master (98a18b6ffc79 netdevice: add ieee802154_ptr to net_device)
Merging infiniband/for-next (7b909bb49ac2 Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next)
Merging mtd/master (89cf38dd536a mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF chips)
Merging l2-mtd/master (1f04a73e2c63 MTD: merge 3.18 development into -next development)
Merging crypto/master (bac68f2c9a43 crypto: caam - add support for rfc4106(gcm(aes)))
Merging drm/drm-next (041df3573d0c Merge tag 'drm-intel-next-2014-10-24' of git://anongit.freedesktop.org/drm-intel into drm-next)
Merging drm-panel/drm/panel/for-next (7d1311b93e58 Linux 3.17-rc1)
Merging drm-intel/for-linux-next (9550d321dd2a drm/i915: Add kerneldoc for intel_pipe_update_{start, end})
Merging drm-tegra/drm/tegra/for-next (8ed05f485498 drm/tegra: Depend on COMMON_CLK)
Merging drm-misc/topic/core-stuff (ba8ce31f438c drm/gma500: Don't destroy DRM properties in the driver)
Merging sound/for-next (31604d35db18 ALSA: emu10k1: Deletion of unnecessary checks before three function calls)
Merging sound-asoc/for-next (aef9453b8e7d Merge remote-tracking branch 'asoc/topic/wm9713' into asoc-next)
Merging modules/modules-next (d3051b489aa8 modules, lock around setting of MODULE_STATE_UNFORMED)
Merging virtio/virtio-next (1bbc26062754 virtio-rng: refactor probe error handling)
Merging input/next (02b6a58b83b2 Input: touchscreen - use __maybe_unused instead of ifdef around suspend/resume)
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
Merging block/for-next (3ec07b7fd5a4 Merge branch 'for-3.19/core' into for-next)
Merging device-mapper/for-next (937aa00b00a6 Merge branch 'dm-for-3.19' into for-next)
Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (c22a35ea3e12 mmc: mmc_test: Extend "Badly aligned" tests for 8-byte alignment)
Merging kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging clean-up)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (b395f75eabb3 lib/raid6: Add log level to printks)
Merging mfd/for-mfd-next (dcd3435038b7 mfd: wm8350-core: Fix probable mask then right shift defect)
Merging backlight/for-backlight-next (de3d75dc2311 backlight: Use of_find_backlight_by_node stub when backlight class disabled)
Merging battery/master (cdaf3e15385d power: charger-manager: Fix accessing invalidated power supply after charger unbind)
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (f114040e3ea6 Linux 3.18-rc1)
Merging regulator/for-next (5b39e1a4efb5 Merge remote-tracking branches 'regulator/topic/s2mpa01', 'regulator/topic/s2mps11', 'regulator/topic/sky81452', 'regulator/topic/stub' and 'regulator/topic/suspend' into regulator-next)
Merging security/next (594081ee7145 integrity: do zero padding of the key id)
Merging integrity/next (1b68bdf9cded ima: detect violations for mmaped files)
Merging selinux/next (4093a8443941 selinux: normalize audit log formatting)
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
Merging watchdog/master (8ae1a57f54af watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7)
CONFLICT (content): Merge conflict in drivers/watchdog/s3c2410_wdt.c
Merging iommu/next (f34b4fa45e28 Merge branches 'arm/omap' and 'arm/msm' into next)
Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
Merging vfio/next (93899a679fd6 vfio-pci: Fix remove path locking)
Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation)
Merging jc_docs/docs-next (4041f42fa17b Merge branch 'docs-3.19' into docs-next)
Merging trivial/for-next (be278e980d95 clocksource: Fix 'clcoksource' typo in comment)
Merging audit/next (915f389d9c52 audit: add Paul Moore to the MAINTAINERS entry)
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (2118f4b8dfc6 of/selftest: Move hash table off stack to fix large frame size)
Merging dt-rh/for-next (d22e9131187d of: add vendor prefix for Chipidea)
Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings)
Merging spi/for-next (de0f1a323318 Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/dw' and 'spi/topic/fsl-dspi' into spi-next)
Merging tip/auto-latest (ebb9f164eeea Merge branch 'x86/vdso')
Merging clockevents/clockevents/next (b0ad5917960c ARM/ARM64: arch-timer: fix arch_timer_probed logic)
Merging edac/linux_next (d0585cd815fa sb_edac: Claim a different PCI device)
Merging edac-amd/for-next (a597d2a5d982 amd64_edac: Add F15h M60h support)
Merging irqchip/irqchip/for-next (8fbe8bc2d89b Merge branch 'irqchip/core' into irqchip/for-next)
Merging tiny/tiny/next (d45461ff03ad Merge branches 'tiny/bloat-o-meter-no-SyS', 'tiny/more-procless', 'tiny/no-advice', 'tiny/tinyconfig' and 'tiny/x86-boot-compressed-use-yn' into tiny/next)
Merging ftrace/for-next (70c738a64478 Merge branch 'trace/ftrace/testing' into trace/for-next)
Merging rcu/rcu/next (f120000b06ab Merge branch 'torture.2014.10.28d' into HEAD)
CONFLICT (content): Merge conflict in drivers/md/dm.c
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (123b2dd10b46 Merge remote-tracking branch 'origin/master' into HEAD)
Merging kvm-arm/next (f62c95fd4041 Merge tag 'kvm-s390-next-20141028' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_get_last_inst)
Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
Merging xen-tip/linux-next (63401a5dca18 Merge branch 'hypercall_cache_flush_v5' into xentip-linux-next-7)
Merging percpu/for-next (56e4dea81a55 percpu: Convert remaining __get_cpu_var uses in 3.18-rcX)
Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue())
Merging drivers-x86/for-next (725c7f619e20 quirk for Lenovo Yoga 3: no rfkill switch)
Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries)
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (46f6c620e8a1 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/headers' into regmap-next)
Merging hsi/for-next (a26a42508157 HSI: remove deprecated IRQF_DISABLED)
Merging leds/for-next (a4c84e6aafda leds: gpio: cleanup the leds-gpio driver)
Merging ipmi/for-next (ef4a48c51321 Merge tag 'locks-v3.18-1' of git://git.samba.org/jlayton/linux)
Merging driver-core/driver-core-next (0df1f2487d2f Linux 3.18-rc3)
Merging tty/tty-next (0df1f2487d2f Linux 3.18-rc3)
Merging usb/usb-next (0df1f2487d2f Linux 3.18-rc3)
Merging usb-gadget/next (72a65a0d19c1 Revert "usb: gadget: composite: dequeue cdev->req before free its buffer")
Merging usb-serial/usb-next (9d3801903851 USB: mos7840: replace unnecessary atomic allocations)
Merging staging/staging-next (7cbe010a5ea7 Merge 3.18-rc3 into staging-next)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/namei.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_lib.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/file.c
Merging char-misc/char-misc-next (0df1f2487d2f Linux 3.18-rc3)
Merging cgroup/for-next (cea74465e27b cpuset: lock vs unlock typo)
Merging scsi/for-next (ab013160e38b drivers: scsi: qla2xxx: Remove redundant declaration in 'qla_gbl.h')
$ git reset --hard HEAD^
Merging next-20141031 version of scsi
Merging target-updates/for-next (cac7f2429872 Linux 3.18-rc2)
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (abb2ed922eeb Merge branch 'devel' into for-next)
Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs)
CONFLICT (content): Merge conflict in drivers/vhost/net.c
Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6)
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (2071d0968e56 Documentation: gpio: guidelines for bindings)
Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition)
Merging pwm/for-next (e2e08970100d pwm: atmel: Fix calculation of prescale value)
Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning)
Merging userns/for-next (a1998908ba46 nfs: fix kernel warning when removing proc entry)
CONFLICT (content): Merge conflict in fs/nfs/client.c
Merging ktest/for-next (d832d743385d ktest: Don't bother with bisect good or bad on replay)
Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (98d147f50eb0 clk: pxa clocks build system fix)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging aio/master (668044a5d632 aio: Make it possible to remap aio ring)
Merging llvmlinux/for-next (ec25a590c29c arm: LLVMLinux: Use global stack register variable for percpu)
Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL)
Merging kselftest/next (49296470830a selftests/timers: change test to use ksft framework)
Merging y2038/y2038 (3b34d3a706f5 PM / Hibernate: Migrate to ktime_t)
$ git am -3 ../patches/0001-Revert-mfd-max77686-802-Remove-support-for-board-fil.patch
Applying: Revert "mfd: max77686/802: Remove support for board files"
Merging akpm-current/current (0919fa6ba555 ipc-msg-increase-msgmni-remove-scaling-checkpatch-fixes)
CONFLICT (content): Merge conflict in mm/memcontrol.c
CONFLICT (content): Merge conflict in kernel/kmod.c
CONFLICT (content): Merge conflict in kernel/gcov/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/gpio/gpio-zevio.c: fix build
Applying: arch/x86/vdso/vma.c: fix build with older gcc
Applying: slab: fix cpuset check in fallback_alloc
Applying: slub: fix cpuset check in get_any_partial
Applying: mm/cma: make kmemleak ignore CMA regions
Applying: mm: cma: split cma-reserved in dmesg log
Applying: fs: proc: include cma info in proc/meminfo
Applying: mm: replace remap_file_pages() syscall with emulation
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
Applying: lib/show_mem.c: adds cma reserved information
Applying: lib-show_mem-this-patch-adds-cma-reserved-infromation-fix
Merging akpm/master (ecf0dfea1ec2 lib-show_mem-this-patch-adds-cma-reserved-infromation-fix)

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

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

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

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

Hi all,

Changes since 20131101:

The squashfs tree lost its build failure.

The sound-asoc tree gained a build failure for which I reverted a commit.

The modules tree introduced a very large number of warnings so I used
the version from next-20131101.

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

The dt-rh tree gained a conflict against the imx-mxs tree.

The random tree gained a conflict against Linus' tree.

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

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

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

Below is a summary of the state of the merge.

We are up to 212 trees (counting Linus' and 30 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 (17f6ee43c336 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging fixes/master (fa8218def1b1 Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap)
Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux)
Merging arc-current/for-curr (18e8a7387340 ARC: [plat-arcfpga] defconfig update)
Merging arm-current/fixes (384b38b66947 ARM: 7873/1: vfp: clear vfp_current_hw_state for dying cpu)
Merging m68k-current/for-linus (55490050df0f m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls)
Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
Merging powerpc-merge/merge (8b5ede69d24d powerpc/irq: Don't switch to irq stack from softirq stack)
Merging sparc/master (6d15ee492809 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging net/master (6f092343855a net: flow_dissector: fail on evil iph->ihl)
Merging ipsec/master (84502b5ef984 xfrm: Fix null pointer dereference when decoding sessions)
Merging sound-current/for-linus (a4461f41b94c ALSA: fix oops in snd_pcm_info() caused by ASoC DPCM)
Merging pci-current/for-linus (67d470e0e171 Revert "x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero")
Merging wireless/master (8ce9beac4661 drivers: net: wireless: b43: Fix possible NULL ptr dereference)
Merging driver-core.current/driver-core-linus (31d141e3a666 Linux 3.12-rc6)
Merging tty.current/tty-linus (6e757ad2c92c tty/serial: at91: fix uart/usart selection for older products)
Merging usb.current/usb-linus (e1466ad5b1ae USB: serial: ftdi_sio: add id for Z3X Box device)
Merging staging.current/staging-linus (31d141e3a666 Linux 3.12-rc6)
Merging char-misc.current/char-misc-linus (31d141e3a666 Linux 3.12-rc6)
Merging input-current/for-linus (5beea882e641 Input: ALPS - add support for model found on Dell XT2)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging audit-current/for-linus (c158a35c8a68 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (26052f9b9bb8 crypto: crct10dif - Add fallback for broken initrds)
Merging ide/master (64110c16e012 ide: sgiioc4: Staticize ioc4_ide_attach_one())
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions)
Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory")
Merging rr-fixes/fixes (f6537f2f0eba scripts/kallsyms: filter symbols not in kernel address space)
Merging mfd-fixes/master (d0e639c9e06d Linux 3.12-rc4)
Merging vfio-fixes/for-linus (d93b3ac0edb8 VFIO: vfio_iommu_type1: fix bug caused by break in nested loop)
Merging drm-intel-fixes/for-linux-next-fixes (1fbc0d789d12 drm/i915: Fix the PPT fdi lane bifurcate state handling on ivb)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (72decceef59d ARC: [TB10x] Updates for GPIO and pinctrl)
Merging arm/for-next (17e09ac56465 Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next)
Merging arm-perf/for-next/perf (15c03dd4859a Linux 3.12-rc3)
Merging arm-soc/for-next (c1b35c610b89 Merge branch 'next/dt' into for-next)
CONFLICT (content): Merge conflict in drivers/clk/clk-nomadik.c
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig
Merging bcm2835/for-next (7d132055814e Linux 3.10-rc6)
Merging cortex/for-next (0df651a0740c Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (bce60c9ff4b5 Merge branches 'imx/fixes-3.13', 'imx/soc-3.14' and 'imx/dt-3.14' into for-next)
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (b91cf40516e0 Merge branch 'mvebu/dt' into for-next)
Merging renesas/next (597472bb771b Merge branch 'heads/clock' into next)
Merging samsung/for-next (d2287944920d Merge branch 'v3.13-next/samsung' into for-next)
Merging tegra/for-next (1ebd0d6a0589 Merge branch for-3.13/maintainers into for-next)
Merging arm64/upstream (264666e62848 arm64: Slightly improve the warning on CPU0 enable-method)
Merging blackfin/for-linus (08b67faa23fd blackfin: Ignore generated uImages)
Merging c6x/for-linux-next (b2c32b32a212 c6x: remove unused COMMON_CLKDEV Kconfig parameter)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols)
Merging h8300-remove/h8300-remove (ca40e295018f fs/minix: Drop dependency on H8300)
Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
Merging ia64/next (959f58544b7f Linux 3.12-rc7)
Merging m68k/for-next (77a42796786c m68k: Remove deprecated IRQF_DISABLED)
Merging m68knommu/for-next (959f58544b7f Linux 3.12-rc7)
Merging metag/for-next (b6ef9161e43a irq-imgpdc: add ImgTec PDC irqchip driver)
Merging microblaze/next (d5d04bb48f0e Bye, bye, WfW flag)
Merging mips/mips-for-linux-next (522649837f97 Merge branch '3.12-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (6af609515d78 openrisc: remove HAVE_VIRT_TO_BUS)
Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (89bcde9f4c7f parisc: make "make install" not depend on vmlinux)
Merging powerpc/next (b0c06d333505 powerpc/bpf: Support MOD operation)
Merging mpc5xxx/next (7e198197ec87 powerpc/mpc512x: remove unnecessary #if)
Merging galak/next (9e2ecdbba3b0 powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4)
Merging s390/features (eeff9275c20b s390/mm,tlb: correct tlb flush on page table upgrade)
Merging sh/sh-latest (37284bd93103 Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest)
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c
CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile
Merging sparc-next/master (f8ce1faf5595 Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux)
Merging tile/master (e823acc0a9e3 tile: remove stray blank space)
Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
Merging xtensa/for_next (8872366df396 xtensa: Fix broken allmodconfig build)
Merging btrfs/next (d7396f07358a Btrfs: optimize key searches in btrfs_search_slot)
Merging ceph/master (53d028160f1a ceph: implement readv/preadv for sync operation)
Merging cifs/for-next (81f4821f0bec SMB2/SMB3 Copy offload support (refcopy) phase 1)
Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (959f58544b7f Linux 3.12-rc7)
Merging ext3/for_next (721a769c0342 reiserfs: fix race with flush_used_journal_lists and flush_journal_list)
Merging ext4/dev (efbed4dc5857 ext4: add ratelimiting to ext4 messages)
Merging f2fs/dev (66e960c692e9 f2fs: update f2fs document)
Merging fscache/fscache (f1fe29b4a02d NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open())
Merging fuse/for-next (16f60ab14ce2 fuse: writepages: protect secondary requests from fuse file release)
Merging gfs2/master (e66cf161098a GFS2: Use lockref for glocks)
Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc)
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (fcb63a9bd842 NFS: Fix a missing initialisation when reading the SELinux label)
Merging nfsd/nfsd-next (3378b7f40d79 nfsd4: fix discarded security labels on setattr)
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
Merging squashfs/master (8ae6a7f5a3a8 squashfs: enhance parallel I/O)
Merging v9fs/for-next (94876b5bb6a8 9P: introduction of a new cache=mmap model.)
Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range)
Merging xfs/for-next (10e6e65dfced xfs: be more forgiving of a v4 secondary sb w/ junk in v5 fields)
CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_sf.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_readdir.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_block.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_da_format.h
Merging vfs/for-next (dc03a60dfcff do_remount(): pull touch_mnt_namespace() up)
CONFLICT (content): Merge conflict in fs/nfsd/nfsfh.c
CONFLICT (content): Merge conflict in fs/9p/vfs_inode_dotl.c
CONFLICT (content): Merge conflict in fs/9p/vfs_inode.c
CONFLICT (content): Merge conflict in fs/9p/vfs_file.c
Merging pci/next (33de1b8bf6e1 Merge branch 'pci/misc' into next)
Merging hid/for-next (59dd2c40518d Merge branch 'for-3.13/multitouch' into for-next)
Merging i2c/i2c/for-next (8a73cd4cfa15 i2c: exynos5: add High Speed I2C controller driver)
Merging jdelvare-hwmon/master (0e7a3ed04f0c Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging hwmon-staging/hwmon-next (26336c8a36c0 hwmon: (w83793) Clean up a signedness issue)
Merging v4l-dvb/master (5c52a0f259af Merge branch 'build_fixes' into to_next)
Merging kbuild/for-next (9fbe8e5b9724 Merge branch 'kbuild/kconfig' into kbuild/for-next)
Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
Merging libata/for-next (e358127fdd22 ata: libata-eh: Remove unnecessary snprintf arithmetic)
Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block)
Merging pm/linux-next (e56b4d2bbe43 Merge branch 'pm-cpufreq-next' into linux-next)
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/opp.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c
Merging idle/next (d7b0a1b0b9b1 intel_idle: Support Intel Atom Processor C2000 Product Family)
Merging apm/for-next (fb9d78aca709 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (79122105c394 Merge branches 'intel_powerclamp', 'misc' and 'x86_pkg_temp' of .git into next)
Merging ieee1394/for-next (db9ae8fec7b1 firewire: ohci: Fix deadlock at bus reset)
Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fastmap())
Merging dlm/next (a97f4a66d8ee dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY)
Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
Merging slave-dma/next (6b327a028f09 Merge branch 'for-linus' into next)
Merging dmaengine/next (4a43f394a082 dmaengine: dma_sync_wait and dma_find_channel undefined)
Merging net-next/master (296c10639a33 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next)
CONFLICT (content): Merge conflict in net/bridge/br_private.h
CONFLICT (content): Merge conflict in drivers/net/netconsole.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be.h
CONFLICT (content): Merge conflict in arch/parisc/include/uapi/asm/socket.h
CONFLICT (modify/delete): arch/h8300/include/uapi/asm/socket.h deleted in HEAD and modified in net-next/master. Version net-next/master of arch/h8300/include/uapi/asm/socket.h left in tree.
$ git rm -f arch/h8300/include/uapi/asm/socket.h
Merging ipsec-next/master (1c5ad13f7c2b net: esp{4,6}: get rid of struct esp_data)
Merging wireless-next/master (a1b13b9ad375 rt2x00: rt2800pci: use module_pci_driver macro)
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/pcie/drv.c
CONFLICT (content): Merge conflict in drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
Merging bluetooth/master (cca34b785a21 Bluetooth: Remove link type check in hci_disconn_complete_evt())
Merging infiniband/for-next (a78fc816b361 Merge branches 'cma', 'ipoib', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next)
Merging mtd/master (d255c59aab2a Merge tag 'for-linus-20131025' of git://git.infradead.org/linux-mtd)
Merging l2-mtd/master (5da88a315175 mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES)
Merging crypto/master (8ed49c7675e1 crypto: omap-aes - Fix CTR mode counter length)
Merging drm/drm-next (9d6104e0174b drm/sysfs: Do not drop device reference twice)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_crt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c
Applying: drm/i915: Resolve interaction with drm-fixes tree
Merging drm-intel/for-linux-next (9d1cb9147dbe drm/i915: avoid unclaimed registers when capturing the error state)
Merging drm-tegra/drm/for-next (977386a04bae drm/tegra: Reserve syncpoint base for gr3d)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging sound/for-next (023838542dc8 ALSA: hda - not choose assigned converters for unused pins of Valleyview)
Merging sound-asoc/for-next (d1a6fc46d30e Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next)
Merging modules/modules-next (08746a65c296 init: fix in-place parameter modification regression)
$ git reset --hard HEAD^
Merging next-20131101 version of modules
Merging virtio/virtio-next (047b9b94951d virtio_net: verify if queue is broken after virtqueue_get_buf())
Merging input/next (c6d81bd7237b Input: add driver for Neonode zForce based touchscreens)
Merging input-mt/for-next (ad81f0545ef0 Linux 3.11-rc1)
Merging cgroup/for-next (0d60e6cd793e Merge branch 'for-3.13' into for-next)
CONFLICT (content): Merge conflict in mm/memcontrol.c
Merging block/for-next (088ceabdb5f1 Merge branch 'for-3.13/core' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
CONFLICT (content): Merge conflict in drivers/md/raid5.c
$ git reset --hard HEAD^
Merging next-20131031 version of block
Merging aio-direct/for-next (bb6f7be48318 tmpfs: add support for read_iter and write_iter)
CONFLICT (content): Merge conflict in include/linux/blk_types.h
CONFLICT (content): Merge conflict in fs/nfs/file.c
CONFLICT (content): Merge conflict in fs/nfs/direct.c
Applying: ceph: Fix up for iov_iter changes
Merging device-mapper/for-next (f2cfeb5c33ef dm: allow remove to be deferred)
Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (4d22378221bd mmc: core: Add MMC_CAP_RUNTIME_RESUME to resume at runtime_resume)
Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
Merging slab/for-next (139f3f1863de Merge branch 'slab/struct-page' into for-next)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (555c28a5b0c1 raid1: Add some macros to make code clearly.)
Merging mfd/master (4c78b520ee8f mfd: as3722: Don't export the regmap config)
CONFLICT (content): Merge conflict in sound/soc/codecs/mc13783.c
Merging mfd-lj/for-mfd-next (6bfd1e63de34 mfd: lpc_sch: Ignore resource conflicts when adding mfd cells)
Merging battery/master (588bd5918bac power_supply: Fix documentation for TEMP_*ALERT* properties)
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
Applying: video: xilinxfb: Fix for "Use standard variable name convention"
Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (8623ec220b9c omapdss: Add new panel driver for Topolly td028ttec1 LCD.)
Merging regulator/for-next (4445d0094e75 Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next)
Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'trusted' keyring)
CONFLICT (content): Merge conflict in crypto/Makefile
Merging selinux/master (42d64e1add3a selinux: correct locking in selinux_netlbl_socket_connect))
Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
Merging watchdog/master (ec1a1a17a211 watchdog: rt2880_wdt: fix return value check in rt288x_wdt_probe())
Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' into next)
Merging vfio/next (15c03dd4859a Linux 3.12-rc3)
Merging osd/linux-next (861d66601acd exofs: don't leak io_state and pages on read error)
Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
Merging trivial/for-next (2bb9936beac2 doc: usb: Fix typo in Documentation/usb/gadget_configs.txt)
CONFLICT (content): Merge conflict in net/netfilter/xt_set.c
Merging audit/for-next (dcd6c9226715 Linux 3.3-rc1)
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (0976c946a610 arm/versatile: Fix versatile irq specifications.)
CONFLICT (content): Merge conflict in drivers/pci/host/pci-mvebu.c
CONFLICT (content): Merge conflict in drivers/crypto/caam/jr.c
CONFLICT (content): Merge conflict in arch/arm/mach-integrator/pci_v3.c
Merging dt-rh/for-next (7f60466de9a4 mips: re-order DT init scan)
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/prom.h
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging spi/for-next (f8ce25620cdc Merge remote-tracking branch 'spi/topic/wr' into spi-next)
CONFLICT (content): Merge conflict in drivers/spi/spi.c
Merging tip/auto-latest (f497c33a9489 Merge branch 'x86/uaccess')
CONFLICT (modify/delete): tools/perf/config/feature-tests.mak deleted in tip/auto-latest and modified in HEAD. Version HEAD of tools/perf/config/feature-tests.mak left in tree.
CONFLICT (content): Merge conflict in tools/perf/config/Makefile
CONFLICT (content): Merge conflict in include/linux/wait.h
CONFLICT (content): Merge conflict in include/linux/acpi.h
CONFLICT (modify/delete): arch/h8300/include/asm/Kbuild deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/h8300/include/asm/Kbuild left in tree.
$ git rm -f arch/h8300/include/asm/Kbuild
$ git rm -f tools/perf/config/feature-tests.mak
Applying: tip: extra fixes for perf changes
Merging edac/linux_next (de4772c62148 edac: sb_edac.c should not require prescence of IMC_DDRIO device)
Merging edac-amd/for-next (c3e511e4c4d9 amd64_edac: Remove superfluous condition check.)
Merging ftrace/for-next (29ad23b00474 ftrace: Add set_graph_notrace filter)
Merging rcu/rcu/next (4102adab9189 rcu: Move RCU-related source code to kernel/rcu directory)
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (81e87e267967 kvm_host: typo fix)
Merging kvm-arm/kvm-arm-next (79c648806f90 arm/arm64: KVM: PSCI: use MPIDR to identify a target CPU)
CONFLICT (content): Merge conflict in arch/arm/kvm/reset.c
Merging kvm-ppc/kvm-ppc-next (a78b55d1c021 kvm: powerpc: book3s: drop is_hv_enabled)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/ptrace.c
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/processor.h
Merging oprofile/for-next (9b415b3a3c4e edac, highbank: Moving error injection to sysfs for edac)
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
Merging xen-tip/linux-next (af8bdd968a7e Merge branch 'swiotlb-xen' into xentip/linux-next)
CONFLICT (content): Merge conflict in arch/arm/include/asm/dma-mapping.h
Merging percpu/for-next (90f2492cf9c8 x86: remove this_cpu_xor() implementation)
Merging workqueues/for-next (016564d41b35 workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues)
Merging drivers-x86/linux-next (5c07eae979df platform/x86: panasonic-laptop: reuse module_acpi_driver)
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (04bc9ac163a2 Merge remote-tracking branch 'regmap/topic/spmi' into regmap-next)
Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
Merging leds/for-next (30dae2f98612 leds: lp55xx: handle enable pin in driver)
CONFLICT (content): Merge conflict in include/linux/of.h
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c
Merging driver-core/driver-core-next (0cae60f91494 sysfs: rename sysfs_assoc_lock and explain what it's about)
CONFLICT (content): Merge conflict in include/linux/netdevice.h
CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c
CONFLICT (content): Merge conflict in drivers/pci/pci-driver.c
CONFLICT (content): Merge conflict in drivers/mmc/host/mvsdio.c
Merging tty/tty-next (80d8611dd076 serial: omap: fix missing comma)
CONFLICT (content): Merge conflict in drivers/tty/serial/imx.c
CONFLICT (content): Merge conflict in drivers/tty/serial/atmel_serial.c
Merging usb/usb-next (7d49f0bac41e USB: Maintainers change for usb serial drivers)
CONFLICT (content): Merge conflict in drivers/usb/musb/davinci.c
CONFLICT (content): Merge conflict in drivers/Kconfig
CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap3-evm.dts
Merging usb-gadget/next (80d7d8a768cd usb: phy: twl6030-usb: Include linux/of.h header)
Merging staging/staging-next (ed5d6ca0038f staging: drm/imx: fix return value check in ipu_add_subdevice_pdata())
Merging char-misc/char-misc-next (425792266a40 misc: mic: Fixes for randconfig build errors and warnings.)
Applying: Intel MIC Host Driver: fix for sysfs_get_dirent API change
Merging scsi/for-next (2aee240c68ed Merge branch 'misc' into for-next)
Merging target-updates/for-next (2dd1d53fe004 iscsi-target: Implement demo_mode_discovery logic)
Merging target-merge/for-next-merge (15c03dd4859a Linux 3.12-rc3)
Merging bcon/master (e284f3493206 netconsole: s/syslogd/cancd/ in documentation)
CONFLICT (content): Merge conflict in drivers/block/Kconfig
Merging writeback/writeback-for-next (a8855990e382 writeback: Do not sort b_io list only because of block device inode)
Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (9a4864c89754 gpio: tb10x: fix return value check in tb10x_gpio_probe())
Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO)
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (afb3690c3cbd gpio: bcm-kona: add missing .owner to struct gpio_chip)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging dma-mapping/dma-mapping-next (0df651a0740c Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging pwm/for-next (702e304f198f Documentation/pwm: Fix trivial typos)
CONFLICT (modify/delete): arch/arm/mach-omap2/board-zoom-peripherals.c deleted in HEAD and modified in pwm/for-next. Version pwm/for-next of arch/arm/mach-omap2/board-zoom-peripherals.c left in tree.
$ git rm -f arch/arm/mach-omap2/board-zoom-peripherals.c
Merging dma-buf/for-next (19e8697ba45e dma-buf: Expose buffer size to userspace (v2))
Merging userns/for-next (40216baa0101 vfs: Lazily remove mounts on unlinked files and directories. v2)
CONFLICT (content): Merge conflict in fs/fuse/dir.c
Merging ktest/for-next (df5f7c66013c ktest: Reset grub menu cache with different machines)
Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (f61027426a5b clk: of: helper for determining number of parent clocks)
CONFLICT (content): Merge conflict in drivers/clk/Makefile
Merging random/dev (8aaa43c6f8dc random: don't zap entropy count in rand_initialize())
CONFLICT (content): Merge conflict in drivers/char/random.c
CONFLICT (content): Merge conflict in drivers/base/core.c
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
Merging aio/master (5e9ae2e5da0b aio: fix use-after-free in aio_migratepage)
Merging akpm-current/current (d899b09841bd ipc/util.c: remove unnecessary work pending test)
CONFLICT (content): Merge conflict in mm/memcontrol.c
CONFLICT (content): Merge conflict in arch/x86/mm/init.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: net/netfilter/ipset/ip_set_hash_netnet.c: fix build with older gcc
Applying: net/netfilter/ipset/ip_set_hash_netportnet.c: fix build with older gccs
Applying: mm: drop actor argument of do_generic_file_read()
Applying: mm-drop-actor-argument-of-do_generic_file_read-fix
Applying: mm: avoid increase sizeof(struct page) due to split page table lock
Applying: mm: rename USE_SPLIT_PTLOCKS to USE_SPLIT_PTE_PTLOCKS
Applying: mm: convert mm->nr_ptes to atomic_long_t
Applying: mm: introduce api for split page table lock for PMD level
Applying: mm, thp: change pmd_trans_huge_lock() to return taken lock
Applying: mm, thp: move ptl taking inside page_check_address_pmd()
Applying: mm, thp: do not access mm->pmd_huge_pte directly
Applying: mm, hugetlb: convert hugetlbfs to use split pmd lock
Applying: mm-hugetlb-convert-hugetlbfs-to-use-split-pmd-lock-checkpatch-fixes
Applying: mm: convert the rest to new page table lock api
Applying: mm: implement split page table lock for PMD level
Applying: x86, mm: enable split page table lock for PMD level
Applying: x86-mm-enable-split-page-table-lock-for-pmd-level-checkpatch-fixes
Applying: x86: add missed pgtable_pmd_page_ctor/dtor calls for preallocated pmds
Applying: cris: fix potential NULL-pointer dereference
Applying: m32r: fix potential NULL-pointer dereference
Applying: xtensa: fix potential NULL-pointer dereference
Applying: mm: allow pgtable_page_ctor() to fail
Applying: microblaze: add missing pgtable_page_ctor/dtor calls
Applying: mn10300: add missing pgtable_page_ctor/dtor calls
Applying: openrisc: add missing pgtable_page_ctor/dtor calls
Applying: alpha: handle pgtable_page_ctor() fail
Applying: arc: handle pgtable_page_ctor() fail
Applying: arm: handle pgtable_page_ctor() fail
Applying: arm64: handle pgtable_page_ctor() fail
Applying: avr32: handle pgtable_page_ctor() fail
Applying: cris: handle pgtable_page_ctor() fail
Applying: frv: handle pgtable_page_ctor() fail
Applying: hexagon: handle pgtable_page_ctor() fail
Applying: ia64: handle pgtable_page_ctor() fail
Applying: m32r: handle pgtable_page_ctor() fail
Applying: m68k: handle pgtable_page_ctor() fail
Applying: m68k-handle-pgtable_page_ctor-fail-fix
Applying: m68k-handle-pgtable_page_ctor-fail-fix-fix
Applying: metag: handle pgtable_page_ctor() fail
Applying: mips: handle pgtable_page_ctor() fail
Applying: parisc: handle pgtable_page_ctor() fail
Applying: powerpc: handle pgtable_page_ctor() fail
Applying: s390: handle pgtable_page_ctor() fail
Applying: score: handle pgtable_page_ctor() fail
Applying: sh: handle pgtable_page_ctor() fail
Applying: sparc: handle pgtable_page_ctor() fail
Applying: tile: handle pgtable_page_ctor() fail
Applying: um: handle pgtable_page_ctor() fail
Applying: unicore32: handle pgtable_page_ctor() fail
Applying: x86: handle pgtable_page_ctor() fail
Applying: xtensa: handle pgtable_page_ctor() fail
Applying: iommu/arm-smmu: handle pgtable_page_ctor() fail
Applying: xtensa: use buddy allocator for PTE table
Applying: mm: dynamically allocate page->ptl if it cannot be embedded to struct page
Applying: mm: try to detect that page->ptl is in use
Applying: mm-dynamically-allocate-page-ptl-if-it-cannot-be-embedded-to-struct-page-fix-fix
Applying: seq_file: introduce seq_setwidth() and seq_pad()
Applying: seq_file: remove "%n" usage from seq_file users
Applying: vsprintf: ignore %n again
Applying: drivers/rtc/rtc-hid-sensor-time.c: use dev_get_platdata()
Applying: drivers/rtc/rtc-hid-sensor-time.c: enable HID input processing early
Applying: sched: replace INIT_COMPLETION with reinit_completion
Applying: tree-wide: use reinit_completion instead of INIT_COMPLETION
Applying: tree-wide-use-reinit_completion-instead-of-init_completion-fix
Applying: sched: remove INIT_COMPLETION
Merging akpm/master (c04edd16aa4c sched: remove INIT_COMPLETION)
[master 0c27d04e8f1c] Revert "ASoC: Add pinctrl PM to components of active DAIs"

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

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

* linux-next: Tree for Nov 4
@ 2011-11-04  5:25 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2011-11-04  5:25 UTC (permalink / raw)
  To: linux-next; +Cc: LKML, Linus

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

Hi all,

The linux-next tree on github is no longer being updated and will be
removed soon.

The patch is still absent from kernel.org.

The summary at the end now has a "git -1 --oneline" appended to the lines
indicating which tree is being merged.   This was suggested by Mauro
Chehab as an aid to maintainers so that they can easily tell which version
of their tree was merged.  Comments welcome.

Changes since 20111103:

My fixes tree contains:
	Revert "hvc_console: display printk messages on console."

The pci-current and pci trees lost their build failure.

The mips tree lost its conflicts.

The v4l-dvb tree lost its conflict.

The bluetooth tree gained a conflict against Linus' tree.

The device-mapper tree lost its conflicts.

The mfd tree lost its conflicts.

The hwspinlock lost its conflict.

The moduleh tree gained a conflict against the v4l-dvb 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 197 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 (d674806 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging fixes/master (956e850 Revert "hvc_console: display printk messages on console.")
Merging kbuild-current/rc-fixes (322a8b0 Linux 3.1-rc1)
Merging arm-current/fixes (1bf1aac Merge branch 'samsung-fixes-4' of git://github.com/kgene/linux-samsung)
Merging m68k-current/for-linus (4b7cecc m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging powerpc-merge/merge (0c81e4b powerpc/p1023rds: Fix the error of bank-width of nor flash)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (51ce185 sparc: Hook up process_vm_{readv,writev} syscalls.)
Merging scsi-rc-fixes/master (3ee72ca Merge git://github.com/davem330/net)
Merging net/master (eea49cc9 af_packet: de-inline some helper functions)
Merging sound-current/for-linus (6bcbf64 Merge branch 'fix/asoc' into for-linus)
Merging pci-current/for-linus (c54420d PCI: Let PCI_PRI depend on PCI)
Merging wireless/master (f956c34 iwlwifi: don't perform "echo test" when cmd queue stuck)
Merging driver-core.current/driver-core-linus (094803e Merge branch 'akpm' (Andrew's incoming))
Merging tty.current/tty-linus (094803e Merge branch 'akpm' (Andrew's incoming))
Merging usb.current/usb-linus (094803e Merge branch 'akpm' (Andrew's incoming))
Merging staging.current/staging-linus (094803e Merge branch 'akpm' (Andrew's incoming))
Merging cpufreq-current/fixes (2f84dd7 autofs4: fix debug printk warning uncovered by cleanup)
Merging input-current/for-linus (6ad390a Merge branch 'next' into for-linus)
Merging md-current/for-linus (7fcc7c8 md/raid10:  Fix bug when activating a hot-spare.)
Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
Merging crypto-current/master (0559dcf crypto: algapi - Fix build problem with NET disabled)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c)
Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
Merging devicetree-current/devicetree/merge (ed5f886 dt: add empty of_alias_get_id() for non-dt builds)
Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging arm/for-next (49eaa32 Merge branch 'devel-stable' into for-linus)
Merging arm-lpae/for-next (cea5cd6 fixup! ARM: LPAE: Add identity mapping support for the 3-level page table format)
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/kernel/sleep.S
CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable-hwdef.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
Merging arm-soc/for-next (a238f82 Merge branch 'next/devel2' into for-next)
CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
Applying: arm-soc: merge fixup for fixup/reserve being added to MACHINE descriptions
Merging at91/at91-next (bcdbf16 hw_random: add driver for atmel true hardware random number generator)
CONFLICT (content): Merge conflict in drivers/ata/pata_at91.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master)
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/mm.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/devices-imx53.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx5/clock-mx51-mx53.c
Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
Merging omap/for-next (322a8b0 Linux 3.1-rc1)
Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (495d818 ARM: SAMSUNG: Remove SPI bus clocks from platform data)
CONFLICT (content): Merge conflict in drivers/gpio/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/Kconfig
Merging tegra/for-next (80d0a76 Merge branches 'for-3.2/cleanup' and 'for-3.2/features' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (e114599 Blackfin: add serial TX IRQ in individual platform resource)
Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (8e116d1 Add extra arch overrides to asm-generic/checksum.h)
CONFLICT (add/add): Merge conflict in arch/hexagon/mm/strnlen_user.S
CONFLICT (add/add): Merge conflict in arch/hexagon/mm/pgalloc.c
CONFLICT (add/add): Merge conflict in arch/hexagon/mm/Makefile
CONFLICT (add/add): Merge conflict in arch/hexagon/lib/memset.S
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vmlinux.lds.S
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vm_vectors.S
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/vdso.c
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/kgdb.c
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/hexagon_ksyms.c
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/head.S
CONFLICT (add/add): Merge conflict in arch/hexagon/kernel/Makefile
CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/vdso.h
CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/timex.h
CONFLICT (add/add): Merge conflict in arch/hexagon/include/asm/Kbuild
CONFLICT (add/add): Merge conflict in arch/hexagon/Makefile
Merging ia64/next (0f6a1c0 Pull misc-3.2 into next branch)
Merging m68k/for-next (4b7cecc m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging m68knommu/for-next (0ada06b m68k: drop unused Kconfig symbols)
CONFLICT (content): Merge conflict in arch/m68k/kernel/Makefile
CONFLICT (add/add): Merge conflict in arch/m68k/Kconfig.devices
CONFLICT (add/add): Merge conflict in arch/m68k/Kconfig.bus
Merging microblaze/next (094803e Merge branch 'akpm' (Andrew's incoming))
Merging mips/mips-for-linux-next (a1e1771 MIPS: NXP: Remove unused source files.)
Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
Merging powerpc/next (7680057 powerpc: Don't try OPAL takeover on old 970 blades)
CONFLICT (content): Merge conflict in drivers/tty/serial/8250.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/udbg.c
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/udbg.h
CONFLICT (modify/delete): arch/powerpc/configs/40x/hcu4_defconfig deleted in powerpc/next and modified in HEAD. Version HEAD of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Merging 4xx/next (9fcd768 powerpc/40x: Remove obsolete HCU4 board)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (96cc017 powerpc/p3060qds: Add support for P3060QDS board)
Merging s390/features (74ea17f [S390] add support for physical memory > 4TB)
Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net)
Merging tile/master (0124538 nfs: fix a couple of minor portability issues)
CONFLICT (content): Merge conflict in arch/tile/lib/atomic_asm_32.S
CONFLICT (content): Merge conflict in arch/tile/kernel/intvec_32.S
Merging unicore32/unicore32 (10967fd arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS)
Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
Merging cifs/master (9ef5992 cifs: Assume passwords are encoded according to iocharset (try #2))
Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy)
Merging ecryptfs/next (985ca0e ecryptfs: Make inode bdi consistent with superblock bdi)
Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
Merging ext4/dev (f2a4452 jbd2: Unify log messages in jbd2 code)
Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
Merging fuse/for-next (c2183d1 fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message)
Merging gfs2/master (809a4fa GFS2: Move readahead of metadata during deallocation into its own function)
CONFLICT (content): Merge conflict in fs/gfs2/file.c
Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
Merging logfs/master (51b3089 Merge branch 'master' of github.com:prasad-joshi/logfs)
CONFLICT (content): Merge conflict in fs/logfs/file.c
Merging nfs/linux-next (31cbecb Merge branch 'osd-devel' into nfs-for-next)
Merging nfsd/nfsd-next (fc0d14f nfsd4: typo logical vs bitwise negate in nfsd4_decode_share_access)
Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
Merging ocfs2/linux-next (c849cc2 ocfs2: make direntry invalid when deleting it)
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K)
Merging v9fs/for-next (14211d0 9p: fix 9p.txt to advertise msize instead of maxdata)
Merging ubifs/linux-next (7606f85 UBIFS: fix the dark space calculation)
Merging xfs/master (9e4c109 xfs: add AIL pushing tracepoints)
Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check)
Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
Merging pci/linux-next (44258a5 PCI: Fix PRI and PASID consistency)
Merging hid/for-next (30307c6 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging quilt/i2c (839d881 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging)
Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge)
CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging quilt/jdelvare-hwmon (a1933c5 hwmon: Use i2c_smbus_{read,write}_word_swapped)
Merging hwmon-staging/hwmon-next (c5794cf hwmon: (w83627ehf) Better fix for negative temperature values)
Merging quilt/kernel-doc (b814f03 Documentation/PCI/pci.txt: fix a reference doc name)
CONFLICT (content): Merge conflict in Documentation/PCI/pci.txt
Merging docs/docs-move (c6f211c Merge ra.kernel.org:/pub/scm/linux/kernel/git/rdunlap/linux-docs into docs-move)
Merging v4l-dvb/master (b3f4e1e [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set)
Merging kbuild/for-next (57b742f Merge branch 'kbuild/kbuild' into kbuild/for-next)
CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (a0da191 pata_efar: fix register naming used in efar_set_piomode())
Merging infiniband/for-next (504255f Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next)
Merging acpi/acpi (38c0a0c Merge branches 'apei', 'bz-13195' and 'doc' into acpi)
Merging idle-test/idle-test (a0bfa13 cpuidle: stop depending on pm_idle)
Merging powertools/tools-test (d30c4b7 tools/power turbostat: fit output into 80 columns on snb-ep)
Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization)
Merging ubi/linux-next (93ee7a9 Linux 3.1-rc2)
Merging dlm/next (c3b92c8 Linux 3.1)
Merging swiotlb/master (25b84fa swiotlb: Export io_tlb_nslabs as swiotlb_nslabs and use it.)
CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c
Merging ibft/master (f1b1e06 iscsi-ibft: Fix compile warning introduced by 'iscsi_ibft: iscsi_ibft_find unused variable i')
Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev)
Merging target-updates/for-next (2235007 target: add back error handling in transport_complete_task)
Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
Merging slave-dma/next (4598fc2 dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle)
Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
Merging net-next/master (8b3408f dp83640: free packet queues on remove)
Merging wireless-next/master (8b3408f dp83640: free packet queues on remove)
Merging bluetooth/master (e14f47b Bluetooth: Fix mgmt response when adapter goes down or is removed)
CONFLICT (content): Merge conflict in net/bluetooth/l2cap_sock.c
CONFLICT (content): Merge conflict in include/net/bluetooth/bluetooth.h
Merging mtd/master (3f30310 Merge git://git.infradead.org/mtd-2.6)
Merging l2-mtd/master (48e546b mtd: tests: annotate as DANGEROUS in Kconfig)
CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
CONFLICT (modify/delete): 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.
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9m10g45ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-sam9g20ek.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-rm9200dk.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-neocore926.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-afeb-9260v1.c
$ git rm -f arch/arm/mach-at91/board-usb-a9260.c
Merging crypto/master (ea8bdfc crypto: user - Add dependency on NET)
Merging sound/for-next (39c848e Merge branch 'fix/hda' into for-next)
Merging sound-asoc/for-next (86f14df ASoC: Update git repository URL)
Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
Merging quilt/rr (05478c6 module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree)
Merging input/next (fb6c721 Input: tca8418_keypad - initial driver release)
Merging input-mt/next (02f8c6a Linux 3.0)
Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
Merging block/for-next (30a4b71 Merge branch 'for-3.2/core' into for-next)
CONFLICT (content): Merge conflict in drivers/staging/zram/zram_drv.c
CONFLICT (content): Merge conflict in drivers/md/raid5.c
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid1.c
CONFLICT (content): Merge conflict in drivers/md/raid0.c
CONFLICT (content): Merge conflict in drivers/md/multipath.c
CONFLICT (content): Merge conflict in drivers/md/md.h
CONFLICT (content): Merge conflict in drivers/md/md.c
CONFLICT (content): Merge conflict in drivers/md/linear.c
CONFLICT (content): Merge conflict in drivers/md/faulty.c
Merging quilt/device-mapper (43672a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/linux-dm)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
Merging battery/master (85b5fbf power_supply: Fix sysfs format warning)
Merging mmc/mmc-next (d517455 mmc: omap_hsmmc: fix missing parenthesis in pr_info)
CONFLICT (content): Merge conflict in drivers/mmc/host/omap_hsmmc.c
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
Merging slab/for-next (e24daf8 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (6e86841 Linux 2.6.27-rc1)
Merging md/for-next (e0b361a Merge branch 'block-3.1' into for-next)
Merging mfd/for-next (b958f7a mfd: Fix missing abx500 header file updates)
Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
Merging drm/drm-next (1717c0e Revert "drm/ttm: add a way to bo_wait for either the last read or last write")
Merging fbdev/fbdev-next (b57287b video: platinumfb: Add __devexit_p at necessary place)
Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include <linux/module.h>)
Merging regulator/for-next (89efed4 regulator: max8649 Convert max8649 to use regmap api)
Merging security/next (59df316 TOMOYO: Fix interactive judgment functionality.)
Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/linux-next (134edca Merge branch 'fixes' into linux-next)
Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (1abb4ba Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next)
Merging cputime/cputime (f611671 [S390] cputime: add sparse checking and cleanup)
CONFLICT (content): Merge conflict in kernel/sched_stats.h
CONFLICT (content): Merge conflict in include/asm-generic/cputime.h
CONFLICT (content): Merge conflict in fs/proc/stat.c
Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging nommu/master (0ce790e Linux 2.6.39-rc1)
Merging trivial/for-next (59e5253 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
Merging pm/linux-next (fb11620 PM / Freezer: Revert 27920651fe "PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too")
Merging apm/for-next (73692d9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
Merging irda/for-next (94d57c4 enic: Update MAINTAINERS)
Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
Merging edac-amd/for-next (1f6189e amd64_edac: Cleanup return type of amd64_determine_edac_cap())
Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice)
Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging gpio/gpio/next (d92ef29 h8300: Move gpio.h to gpio-internal.h)
Merging tip/auto-latest (e471db8 Merge branch 'perf/core' into auto-latest)
CONFLICT (content): Merge conflict in drivers/char/random.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/amd.c
Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp())
Merging kmemleak/kmemleak (614d29d kmemleak: Handle percpu memory allocation)
Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
Merging oprofile/for-next (4167ab9 Merge branch 'core' of git://amd64.org/linux/rric into perf/core)
Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-two/linux-next (9d5ae84 Merge branch 'stable/vmalloc-3.2' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (bc499f9 percpu: rename pcpu_mem_alloc to pcpu_mem_zalloc)
Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue())
Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
Merging regmap/for-next (a084481 regmap: Prepare LZO cache for variable block sizes)
Merging driver-core/driver-core-next (094803e Merge branch 'akpm' (Andrew's incoming))
Merging tty/tty-next (094803e Merge branch 'akpm' (Andrew's incoming))
Merging usb/usb-next (094803e Merge branch 'akpm' (Andrew's incoming))
Merging staging/staging-next (094803e Merge branch 'akpm' (Andrew's incoming))
Merging bkl-config/config (4ba8216 BKL: That's all, folks)
Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.)
CONFLICT (content): Merge conflict in mm/swapfile.c
Merging writeback/writeback-for-next (ea7bf1d Merge branch 'requeue-io-wait' into writeback-for-next)
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 (ab872c8 pinctrl/sirf: fix sirfsoc_get_group_pins prototype)
CONFLICT (content): Merge conflict in arch/arm/mach-u300/core.c
CONFLICT (content): Merge conflict in arch/arm/mach-u300/Kconfig
Merging moduleh/for-sfr (67b8499 Revert "tracing: Include module.h in define_trace.h")
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
CONFLICT (modify/delete): drivers/mfd/ab3550-core.c deleted in HEAD and modified in moduleh/for-sfr. Version moduleh/for-sfr of drivers/mfd/ab3550-core.c left in tree.
CONFLICT (content): Merge conflict in drivers/media/video/ov6650.c
CONFLICT (content): Merge conflict in drivers/media/video/mt9m111.c
CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/dibx000_common.c
$ git rm -f drivers/mfd/ab3550-core.c
Applying: arm: Add export.h to recently added files for EXPORT_SYMBOL
Applying: powerpc/powernv: include export.h in hvc_opal.h for THIS_MODULE
Applying: drivers/md: change module.h -> export.h in persistent-data/dm-*
Applying: device-mapper: dm-bufio.c needs to include module.h
Applying: device-mapper: using EXPORT_SYBOL in dm-space-map-checker.c needs export.h
Merging kvmtool/master (3b08ed0 config: Add 'make kvmconfig')
CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: drm: fix kconfig unmet dependency warning
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
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: 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: x86: reduce clock calibration time during slave cpu startup
Applying: x86-reduce-clock-calibration-time-during-slave-cpu-startup-fix
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: ceph/mds_client.c: quiet sparse noise
Applying: drivers/edac/mpc85xx_edac.c: fix memory controller compatible for edac
Applying: devtmpfsd: fix task state handling
Applying: drivers/gpu/vga/vgaarb.c: add missing kfree
Applying: drm: avoid switching to text console if there is no panic timeout
Applying: hrtimers: Special-case zero length sleeps
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-fix
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/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: auto engage SCSI mid layer at driver load time
Applying: block: avoid unnecessary plug list flush
Applying: block: add missed trace_block_plug
Applying: include/linux/bio.h: use a static inline function for bio_integrity_clone()
Applying: bio: change some signed vars to unsigned
Applying: paride: fix potential information leak in pg_read()
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: mm/page-writeback.c: make determine_dirtyable_memory static again
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: vmscan: promote shared file mapped pages
Applying: vmscan: activate executable pages after first usage
Applying: mm: add free_hot_cold_page_list() helper
Applying: mm: fix page-faults detection in swap-token logic
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: sparc: gup_pte_range() support THP based tail recounting
Applying: thp: share get_huge_page_tail()
Applying: mm: add vm_area_add_early()
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: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: poll: add poll_requested_events() function
Applying: lib/crc: add slice by 8 algorithm to crc32.c
Applying: lib-crc-add-slice-by-8-algorithm-to-crc32c-fix
Applying: epoll: limit paths
Applying: init/do_mounts_rd.c: fix ramdisk identification for padded cramfs
Applying: oprofilefs: handle zero-length writes
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: cgroups: ERR_PTR needs err.h
Applying: proc: force dcache drop on unauthorized access
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: fs/direct-io.c: salcuate fs_count correctly in get_more_blocks()
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
Applying: ramoops: update parameters only after successful init
Merging akpm (a1b5371 ramoops: update parameters only after successful init)

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

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

end of thread, other threads:[~2022-11-04  5:22 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-04  4:02 linux-next: Tree for Nov 4 Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2022-11-04  5:21 Stephen Rothwell
2020-11-04  6:01 Stephen Rothwell
2015-11-04  6:38 Stephen Rothwell
2014-11-04  6:36 Stephen Rothwell
2014-11-04 20:57 ` Guenter Roeck
2014-11-04 21:56 ` Geert Uytterhoeven
2014-11-05  2:07   ` Michael Ellerman
2013-11-04  6:59 Stephen Rothwell
2011-11-04  5:25 Stephen Rothwell

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).