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

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

Hi all,

Changes since 20221130:

The thermal tree still had complex conflicts against the pm tree so I dropped
the thermal tree for today.

The drm tree gained a conflict against Linus' tree.

The rcu tree gained a conflict against the printk tree.

The kvm tree gained conflicts against the block and tip trees.

The kvm-arm tree gained conflicts against the kvm tree.

The driver-core tree lost its build failure but gained a semantic conflict
against the drm tree.

The usb tree lost its build failure.

The kspp tree gained a build failure so I used the version from
next-20221130.

Non-merge commits (relative to Linus' tree): 11043
 10447 files changed, 473969 insertions(+), 189349 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 370 trees (counting Linus' and 103 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 (ef4d3ea40565 afs: Fix server->active leak in afs_put_server)
Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm)
Merging mm-hotfixes/mm-hotfixes-unstable (7357103e0297 revert "kbuild: fix -Wimplicit-function-declaration in license_is_gpl_compatible")
Merging kbuild-current/fixes (869e4ae4cd2a nios2: add FORCE for vmlinuz.gz)
Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3)
Merging arm-current/fixes (340a982825f7 ARM: 9266/1: mm: fix no-MMU ZERO_PAGE() implementation)
Merging arm64-fixes/for-next/fixes (5b47348fc0b1 arm64/mm: fix incorrect file_map_count for non-leaf pmd/pud)
Merging arm-soc-fixes/arm/fixes (da0cbf9307a2 Merge tag 'at91-fixes-6.1-3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/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 (2e7ec190a0e3 powerpc/64s: Add missing declaration for machine_check_early_boot())
Merging s390-fixes/fixes (adba1a9b81d5 MAINTAINERS: add S390 MM section)
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 (01f856ae6d0c Merge tag 'net-6.1-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf/master (01f856ae6d0c Merge tag 'net-6.1-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging ipsec/master (40781bfb836e xfrm: Fix ignored return value in xfrm6_init())
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 (3e8f7abcc347 wifi: mac8021: fix possible oob access in ieee80211_get_rate_duration)
Merging rdma-fixes/for-rc (094226ad94f4 Linux 6.1-rc5)
Merging sound-current/for-linus (b47068b4aa53 Merge tag 'asoc-fix-v6.1-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc-fixes/for-linus (3d1bb6cc1a65 ASoC: cs42l51: Correct PGA Volume minimum value)
Merging regmap-fixes/for-linus (84498d1fb35d regmap-irq: Use the new num_config_regs property in regmap_add_irq_chip_fwnode)
Merging regulator-fixes/for-linus (02228f6aa6a6 regulator: da9211: Use irq handler when ready)
Merging spi-fixes/for-linus (8e2bb5a41784 Merge remote-tracking branch 'spi/for-6.0' into spi-linus)
Merging pci-current/for-linus (ac9ccce8717d MAINTAINERS: Include PCI bindings in host bridge entry)
Merging driver-core.current/driver-core-linus (eb7081409f94 Linux 6.1-rc6)
Merging tty.current/tty-linus (eb7081409f94 Linux 6.1-rc6)
Merging usb.current/usb-linus (b7b275e60bcd Linux 6.1-rc7)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (188c9c2e0c7f USB: serial: f81534: fix division by zero on line-speed change)
Merging phy/fixes (819b885cd886 phy: ralink: mt7621-pci: add sentinel to quirks table)
Merging staging.current/staging-linus (eb7081409f94 Linux 6.1-rc6)
Merging iio-fixes/fixes-togreg (86fdd15e10e4 iio: fix memory leak in iio_device_register_eventset())
Merging counter-current/counter-current (fd5ac974fc25 counter: stm32-lptimer-cnt: fix the check on arr and cmp registers update)
Merging char-misc.current/char-misc-linus (b7b275e60bcd Linux 6.1-rc7)
Merging soundwire-fixes/fixes (49a467310dc4 soundwire: qcom: check for outanding writes before doing a read)
Merging thunderbolt-fixes/fixes (b7b275e60bcd Linux 6.1-rc7)
Merging input-current/for-linus (81cd7e848927 Input: i8042 - fix leaking of platform device on module removal)
Merging crypto-current/master (9f6035af06b5 crypto: x86/polyval - Fix crashes when keys are not 16-byte aligned)
Merging vfio-fixes/for-linus (e806e223621e vfio/pci: Check the device set open count on reset)
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 (c47e6403fa09 dmaengine: at_hdmac: Check return code of dma_async_device_register)
Merging backlight-fixes/for-backlight-fixes (8ab33943cde7 backlight: pwm_bl: Drop support for legacy PWM probing)
Merging mtd-fixes/mtd/fixes (c717b9b7d6de mtd: onenand: omap2: add dependency on GPMC)
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
Merging v4l-dvb-fixes/fixes (5eef2141776d media: v4l2-dv-timings.c: fix too strict blanking sanity checks)
Merging reset-fixes/reset/fixes (ae358d71d462 reset: npcm: fix iprst2 and iprst4 setting)
Merging mips-fixes/mips-fixes (094226ad94f4 Linux 6.1-rc5)
Merging at91-fixes/at91-fixes (6a3fc8c330d1 ARM: at91: fix build for SAMA5D3 w/o L2 cache)
Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes)
Merging kvm-fixes/master (7e3bba93f42e Merge tag 'kvm-s390-master-6.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvms390-fixes/master (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field)
Merging hwmon-fixes/hwmon (2745705ee6aa hwmon: (asus-ec-sensors) Add checks for devm_kcalloc)
Merging nvdimm-fixes/libnvdimm-fixes (472faf72b33d device-dax: Fix duplicate 'hmem' device registration)
Merging cxl-fixes/fixes (8f401ec1c897 cxl/region: Recycle region ids)
Merging btrfs-fixes/next-fixes (ee267181ea70 Merge branch 'misc-6.1' into next-fixes)
Merging vfs-fixes/fixes (10bc8e4af659 vfs: fix copy_file_range() averts filesystem freeze protection)
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 (b44fd994e451 platform/x86: ideapad-laptop: Add module parameters to match DMI quirk tables)
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 (60d865bd5a9b of: property: decrement node refcount in of_fwnode_get_reference_args())
Merging dt-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging scsi-fixes/fixes (f014165faa7b scsi: iscsi: Fix possible memory leak when device_register() failed)
Merging drm-fixes/drm-fixes (b7b275e60bcd Linux 6.1-rc7)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (12b8b046e4c9 drm/i915: Never return 0 if not all requests retired)
Merging mmc-fixes/fixes (c981cdfb9925 mmc: sdhci: Fix voltage switch delay)
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 (25c94b051592 Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register())
Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18)
Merging risc-v-fixes/fixes (d556a9aeb62a Merge patch series "riscv: kexec: Fxiup crash_save percpu and machine_kexec_mask_interrupts")
Merging riscv-dt-fixes/riscv-dt-fixes (9abf2313adc1 Linux 6.1-rc1)
Merging riscv-soc-fixes/riscv-soc-fixes (9abf2313adc1 Linux 6.1-rc1)
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
Merging fpga-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging spdx/spdx-linus (6cad1ecd4e32 testing: use the copyleft-next-0.3.1 SPDX tag)
Merging gpio-brgl-fixes/gpio/for-current (45fecdb9f658 gpio: amd8111: Fix PCI device reference count leak)
Merging gpio-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging pinctrl-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging erofs-fixes/fixes (37020bbb71d9 erofs: fix missing xas_retry() in fscache mode)
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 (7bdd6967fec5 ubi: ensure that VID header offset + VID header size <= alloc, size)
Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions)
Merging cel-fixes/for-rc (ac8db824ead0 NFSD: Fix reads with a non-zero offset that don't end on a page boundary)
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 (94d957ae513f perf tools: Add the include/perf/ directory to .gitignore)
Merging efi-fixes/urgent (1feda1dfb581 Merge tag 'efi-v6.1-arm64-sync-exception-recovery' into efi/urgent)
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 (8c115864501f drm/bridge: ti-sn65dsi86: Fix output polarity setting bug)
Merging kbuild/for-next (1a06f6a7c1c9 init/version.c: remove #include <generated/utsrelease.h>)
Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
Merging perf/perf/core (0c3852adae83 Merge remote-tracking branch 'torvalds/master' into perf/core)
Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute)
Merging dma-mapping/for-next (ffcb75458460 dma-mapping: reject __GFP_COMP in dma_alloc_attrs)
CONFLICT (content): Merge conflict in sound/core/memalloc.c
Merging asm-generic/master (5e5ff73c2e58 asm-generic/io: Add _RET_IP_ to MMIO trace for more accurate debug info)
Merging arc/for-next (f2906aa86338 Linux 5.19-rc1)
Merging arm/for-next (834f757d299e Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (de265289f18e Merge branches 'for-next/perf' and 'for-next/sve-state' into for-next/core)
Merging arm-perf/for-next/perf (316f862a787c perf/arm-cmn: Add shutdown routine)
Merging arm-soc/for-next (7587962a9cbe soc: doument merges)
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (e57e6bb6476d Merge branch 'v6.2/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (6924945aaa86 Merge branch 'asahi-soc/soc' into asahi-soc/for-next)
Merging aspeed/for-next (45c86167adde soc: nuvoton: Add SoC info driver for WPCM450)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts
Merging at91/at91-next (fb18447f4da5 Merge branch 'at91-defconfig' into at91-next)
Merging broadcom/next (64610429f8de Merge branch 'drivers/next' into next)
Merging davinci/davinci/for-next (53ad523ac435 ARM: davinci: fix repeated words in comments)
Merging drivers-memory/for-next (8dd7e4af5853 memory: omap-gpmc: fix coverity issue "Control flow issues")
Merging imx-mxs/for-next (e114f7b74f59 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (6b6221595e05 Merge branch 'v6.2-tmp/dts64' into for-next)
Merging mvebu/for-next (ce88856dec4f Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (6435241fd536 Merge branch 'musb-for-v6.2' into for-next)
Merging qcom/for-next (4d2b529bce12 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 (00841e945654 Merge branch 'renesas-arm-dt-for-v6.2' into renesas-next)
Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage")
Merging rockchip/for-next (db6c57f2afd5 Merge branch 'v6.2-clock/next' into for-next)
Merging samsung-krzk/for-next (4407a1eb1faf Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (907b02743965 Merge branch 'for-next/juno' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (4cca342b840e ARM: dts: stm32: Rename mdio0 to mdio on DHCOR Testbench board)
Merging sunxi/sunxi/for-next (47be7c123211 Merge branch 'sunxi/clk-for-6.2' into sunxi/for-next)
Merging tee/next (4a56b125ba20 Merge branch 'fixes' into next)
Merging tegra/for-next (d71332dded9d Merge branch for-6.2/arm64/defconfig into for-next)
Merging ti/ti-next (6a5ab20fb961 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (f922fa603ae1 Merge branch 'zynqmp/dt' into for-next)
Merging clk/clk-next (ebb6a9acf2e0 Merge branch 'clk-fixes' into clk-next)
Merging clk-imx/for-next (8178e245fa95 clk: imx: rename imx_obtain_fixed_clk_hw() to imx_get_clk_hw_by_name())
Merging clk-renesas/renesas-clk (777bcc85e1fb clk: renesas: r8a779f0: Fix Ethernet Switch clocks)
Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
Merging csky/linux-next (7e2004906fb5 Revert "csky: Add support for restartable sequence")
Merging loongarch/loongarch-next (538e11c9a923 LoongArch: Update Loongson-3 default config file)
Merging m68k/for-next (553b20b211c4 m68k: defconfig: Update defconfigs for v6.1-rc1)
Merging m68knommu/for-next (b7b275e60bcd Linux 6.1-rc7)
Merging microblaze/next (5cfe469c2654 microblaze/PCI: Moving PCI iounmap and dependent code)
Merging mips/mips-next (c5ed1fe0801f MIPS: vpe-cmp: fix possible memory leak while module exiting)
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 (a77319726641 parisc: Fix kgdb_pdc console keyboard input)
Merging powerpc/next (a9ffb8ee7b65 powerpc: Use "grep -E" instead of "egrep")
Merging powerpc-objtool/topic/objtool (a39818a3fb2b objtool/powerpc: Implement arch_pc_relative_reloc())
Merging soc-fsl/next (4b0986a3613c Linux 5.18)
Merging risc-v/for-next (41555cc9e2e9 RISC-V: enable sparsemem by default for defconfig)
Merging riscv-dt/riscv-dt-for-next (4563db4b7988 Merge branch 'riscv-thead_c9xx' into riscv-dt-for-next)
Merging riscv-soc/riscv-soc-for-next (8fbf94fea0b4 soc: sifive: ccache: fix missing of_node_put() in sifive_ccache_init())
Merging s390/for-next (e1ec975c349d 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 (e95f86d0c525 Merge branch 'fs.ovl.setgid' into for-next)
Merging fscrypt/master (aa9979900808 fscrypt: add comment for fscrypt_valid_enc_modes_v1())
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 (1dd7bb25658d afs: remove afs_cache_netfs and afs_zap_permits() declarations)
Merging btrfs/for-next (07d7d9dff0c8 Merge branch 'for-next-next-v6.1-20221123' into for-next-20221123)
CONFLICT (content): Merge conflict in fs/btrfs/ctree.h
Applying: btrfs: fix up for "fs: pass dentry to set acl method"
Merging ceph/master (5bd76b8de5b7 ceph: fix NULL pointer dereference for req->r_session)
Merging cifs/for-next (587506fda17c cifs: Parse owner/group for stat in smb311 posix extensions)
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 (aa02305d6a92 erofs: switch to prepare_ondemand_read() in fscache mode)
Merging exfat/dev (612d2ddeed4d exfat: replace magic numbers with Macros)
Merging ext3/for_next (6b46bb32a8b5 Pull ext2 fixes from Al and Rong Tao.)
Merging ext4/dev (7944b67ff7e2 ext4: remove trailing newline from ext4_msg() message)
Merging f2fs/dev (ee98bbb2147c f2fs: introduce f2fs_is_readonly() for readability)
Merging fsverity/fsverity (a4bbf53d88c7 fsverity: simplify fsverity_get_digest())
Merging fuse/for-next (1b0e94993dbe fuse: optional supplementary group in create requests)
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 (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic)
Merging ksmbd/ksmbd-for-next (5e40d197b564 ksmbd: use F_SETLK when unlocking a file)
Merging nfs/linux-next (5776a9cd2a66 NFS: Fix a race in nfs_call_unlink())
Merging nfs-anna/linux-next (7e8436728e22 nfs4: Fix kmemleak when allocate slot failed)
Merging nfsd/for-next (40f2e475046f SUNRPC: Fix crasher in unwrap_integ_data())
Merging ntfs3/master (36963cf225f8 fs/ntfs3: Make if more readable)
CONFLICT (content): Merge conflict in fs/ntfs3/bitmap.c
CONFLICT (content): Merge conflict in fs/ntfs3/inode.c
CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c
Applying: fix up for "fs: rename current get acl method"
Merging orangefs/for-next (2ad4b6f5e117 Orangefs: change iterate to iterate_shared)
Merging overlayfs/overlayfs-next (58f40d56c40a 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 (391c18cf776e 9p/xen: check logical size for buffer size)
Merging xfs/for-next (575689fc0ffa xfs: fix super block buf log item UAF during force shutdown)
Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag)
Merging iomap/iomap-for-next (f1bd37a47352 iomap: directly use logical block size)
Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request)
Merging file-locks/locks-next (f2f2494c8aa3 Add process name and pid to locks warning)
Merging iversion/iversion-next (2b3319b35573 nfsd: remove fetch_iversion export operation)
Merging vfs/for-next (7b2f9d90994c Merge branch 'work.misc' into for-next)
CONFLICT (content): Merge conflict in fs/erofs/fscache.c
Merging printk/for-next (a04b46d8846f Merge branch 'rework/console-list-lock' into for-next)
Merging pci/next (0a9dc1e9365b Merge branch 'pci/kbuild')
Merging pstore/for-next/pstore (38b91847c314 pstore: Alert on backend write error)
Merging hid/for-next (780f0d711574 Merge branch 'for-6.1/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (ee98d665b461 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 (10b7c400596e hwmon: (oxp-sensors) Fix pwm reading)
Merging jc_docs/docs-next (520076d5df31 Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (a7bab6f8b73f Merge tag 'br-v6.2e' of git://linuxtv.org/hverkuil/media_tree into media_stage)
Merging v4l-dvb-next/master (6a5a4514854a media: ipu3-cio2: make the bridge depend on i2c)
Merging pm/linux-next (dee69e7005ce Merge branches 'thermal-core' and 'thermal-intel' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (6286bbb40576 cpufreq: apple-soc: Add new driver to control Apple SoC CPU P-states)
Merging cpupower/cpupower (5975e2558e2d tools/cpupower: Choose base_cpu to display default cpupower details)
Merging devfreq/devfreq-next (5fdded844892 PM/devfreq: governor: Add a private governor_data for governor)
Merging opp/opp/linux-next (dba79b78ecc1 dt-bindings: opp-v2: Fix clock-latency-ns prop in example)
Merging thermal/thermal/linux-next (9d2bc364f677 thermal/drivers/qcom/tsens: Simplify debugfs init function)
CONFLICT (content): Merge conflict in drivers/thermal/thermal_sysfs.c
$ git merge --abort
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (7a5e9f1f83e3 fs: dlm: fix building without lockdep)
Merging rdma/for-next (ea5ef136e215 RDMA/nldev: Add checks for nla_nest_start() in fill_stat_counter_qps())
Merging net-next/master (91a7de85600d selftests/net: add csum offload test)
CONFLICT (content): Merge conflict in tools/perf/util/stat.c
Merging bpf-next/for-next (59b843691d72 selftests/bpf: Add bench test to arm64 and s390x denylist)
Merging ipsec-next/master (91a7de85600d selftests/net: add csum offload test)
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 (d2cdc5f0c9be Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x0cb8:0xc559)
Merging wireless-next/for-next (eceb024ee3ee Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging mtd/mtd/next (2399401feee2 mtd: maps: pxa2xx-flash: fix memory leak in probe)
Merging nand/nand/next (6408cc05a50a mtd: rawnand: Drop obsolete dependencies on COMPILE_TEST)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
Merging spi-nor/spi-nor/next (1799cd8540b6 mtd: spi-nor: add SFDP fixups for Quad Page Program)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mtd/jedec,spi-nor.yaml
Merging crypto/master (83478938f78f hwrng: u2fzero - account for high quality RNG)
Merging drm/drm-next (077bd80083ab Merge tag 'drm-msm-next-2022-11-28' of https://gitlab.freedesktop.org/drm/msm into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_gt.c
Merging drm-misc/for-linux-next (b02897e56b4e Revert "drm/fb-helper: Perform damage handling in deferred-I/O helper")
Merging amdgpu/drm-next (56ee51222e57 drm/amdgpu: Fix logic error)
Merging drm-intel/for-linux-next (7d579eff3e55 drm/i915/dmc: Update DG2 DMC version to v2.08)
Merging drm-tegra/for-next (08fef75f5e17 gpu: host1x: Staticize host1x_syncpt_fence_ops)
Merging drm-msm/msm-next (d73b1d02de08 drm/msm: Hangcheck progress detection)
Merging drm-msm-lumag/msm-next-lumag (8d1d17d47eae 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 (a3b4c2f9b039 drm/etnaviv: switch to PFN mappings)
Merging fbdev/for-next (652888c46397 fbdev: ep93xx-fb: Add missing clk_disable_unprepare in ep93xxfb_probe())
Merging regmap/for-next (23a441cb2cbe Merge remote-tracking branch 'regmap/for-6.2' into regmap-next)
Merging sound/for-next (2133dc91d665 ALSA: dice: add support for Focusrite Saffire Pro 40 with TCD3070 ASIC)
Merging sound-asoc/for-next (c1dd6bf61997 ASoC: amd: yc: Add Xiaomi Redmi Book Pro 14 2022 into DMI table)
Merging modules/modules-next (c86a514f5fad kallsyms: Remove unneeded semicolon)
Merging input/next (80fb249da98e Input: elants_i2c - delete some dead code)
Merging block/for-next (04598c701786 Merge branch 'for-6.2/block' into for-next)
CONFLICT (content): Merge conflict in io_uring/net.c
Merging device-mapper/for-next (984bf2cc531e dm integrity: clear the journal on suspend)
Merging libata/for-next (3d8a3ae3d966 ata: libata: fix commands incorrectly not getting retried during NCQ error)
Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver)
Merging mmc/next (18737caf5120 mmc: core: Normalize the error handling branch in sd_read_ext_regs())
Merging mfd/for-mfd-next (c70a5ec75778 mfd: palmas: Use device_get_match_data() to simplify the code)
Merging backlight/for-backlight-next (e7647de058cb video: backlight: mt6370: Add MediaTek MT6370 support)
Merging battery/for-next (571650b3a30f power: supply: bq25890: Only use pdata->regulator_init_data for vbus)
Merging regulator/for-next (086e010f611e Merge remote-tracking branch 'regulator/for-6.2' into regulator-next)
Merging security/next (572302af1258 reiserfs: Add missing calls to reiserfs_security_free())
CONFLICT (content): Merge conflict in security/commoncap.c
Merging apparmor/apparmor-next (4295c60bbe9e apparmor: Fix uninitialized symbol 'array_size' in policy_unpack_test.c)
CONFLICT (content): Merge conflict in security/apparmor/domain.c
Merging integrity/next-integrity (b6018af440a0 ima: Fix hash dependency to correct algorithm)
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 (048be156491f selinux: remove the sidtab context conversion indirect calls)
CONFLICT (content): Merge conflict in security/selinux/ss/services.c
CONFLICT (content): Merge conflict in security/selinux/ss/sidtab.c
CONFLICT (content): Merge conflict in security/selinux/ss/sidtab.h
Applying: selinux: fix up for "selinux: enable use of both GFP_KERNEL and GFP_ATOMIC in convert_context()"
Merging smack/next (1a3065e92046 smack_lsm: remove unnecessary type casting)
Merging tomoyo/master (88ba4e14d341 workqueue: Emit runtime message when flush_scheduled_work() is called)
Merging tpmdd/next (beaff73d55b3 tpm: tpm_tis: Add the missed acpi_put_table() to fix memory leak)
Merging watchdog/master (9ec0b7e06835 watchdog: aspeed: Enable pre-timeout interrupt)
Merging iommu/next (69a6c7d969f5 Merge branches 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/rockchip', 'arm/smmu', 'ppc/pamu', 's390', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging audit/next (50979953c0c4 audit: unify audit_filter_{uring(), inode_name(), syscall()})
Merging devicetree/for-next (e4aef3f65b90 of/kexec: Fix reading 32-bit "linux,initrd-{start,end}" values)
Merging dt-krzk/for-next (043d4036e8ee Merge branch 'next/dt' into for-next)
Merging mailbox/mailbox-for-next (b8ae88e1e75e mailbox: qcom-ipcc: flag IRQ NO_THREAD)
Merging spi/for-next (55b3515c3262 Merge remote-tracking branch 'spi/for-6.2' into spi-next)
Merging tip/master (8efdc946f320 Merge branch into tip/master: 'x86/tdx')
CONFLICT (content): Merge conflict in arch/x86/crypto/sha1_ni_asm.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sha256-avx-asm.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sha256-avx2-asm.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sha256-ssse3-asm.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sha256_ni_asm.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sm3-avx-asm_64.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sm4-aesni-avx-asm_64.S
CONFLICT (content): Merge conflict in arch/x86/crypto/sm4-aesni-avx2-asm_64.S
CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c
CONFLICT (modify/delete): drivers/iommu/iommu-sva-lib.c deleted in HEAD and modified in tip/master.  Version tip/master of drivers/iommu/iommu-sva-lib.c left in tree.
CONFLICT (content): Merge conflict in drivers/pci/controller/Kconfig
CONFLICT (content): Merge conflict in drivers/pci/controller/dwc/Kconfig
CONFLICT (content): Merge conflict in drivers/pci/controller/mobiveil/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
CONFLICT (content): Merge conflict in tools/objtool/check.c
$ git rm -f drivers/iommu/iommu-sva-lib.c
Applying: fix up for "iommu: Rename iommu-sva-lib.{c,h}"
Merging clockevents/timers/drivers/next (af246cc6d0ed clocksource/drivers/arm_arch_timer: Fix CNTPCT_LO and CNTVCT_LO value)
Merging edac/edac-for-next (ad5befcd0e1d Merge branch 'edac-misc' into edac-for-next)
Merging irqchip/irq/irqchip-next (73d95dbcf75e Merge branch irq/misc-6.2 into irq/irqchip-next)
Merging ftrace/for-next (bd604f3db49c ftrace: Avoid needless updates of the ftrace function call)
Merging rcu/rcu/next (5267eaa7e2e5 Merge branch 'nolibc.2022.10.28a' into HEAD)
CONFLICT (content): Merge conflict in kernel/rcu/update.c
Merging kvm/next (1e79a9e3ab96 Merge tag 'kvm-s390-next-6.2-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h
CONFLICT (content): Merge conflict in arch/x86/kvm/cpuid.c
CONFLICT (content): Merge conflict in include/linux/mm.h
Merging kvm-arm/next (456ce3545dd0 Merge branch kvm-arm64/selftest/access-tracking into kvmarm-master/next)
CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_host.h
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/access_tracking_perf_test.c
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/demand_paging_test.c
CONFLICT (modify/delete): tools/testing/selftests/kvm/include/perf_test_util.h deleted in HEAD and modified in kvm-arm/next.  Version kvm-arm/next of tools/testing/selftests/kvm/include/perf_test_util.h left in tree.
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/memslot_modification_stress_test.c
CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/memslot_perf_test.c
$ git rm -f tools/testing/selftests/kvm/include/perf_test_util.h
Applying: fix up for rename of perf_test_args to memstress_args
Merging kvms390/next (bedac519eefa s390/vfio-ap: check TAPQ response code when waiting for queue reset)
Merging xen-tip/linux-next (1e9b10076d75 x86/xen: Fix memory leak in xen_init_lock_cpu())
Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next)
Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync())
Merging drivers-x86/for-next (e32354bb8fe3 platform/x86/intel/hid: Add module-params for 5 button array + SW_TABLET_MODE reporting)
Merging chrome-platform/for-next (5a2d96623670 platform/chrome: cros_usbpd_notify: Fix error handling in cros_usbpd_notify_init())
Merging hsi/for-next (3ffa9f713c39 HSI: omap_ssi_core: Fix error handling in ssi_init())
Merging leds/for-next (5f52a8ba7e91 dt-bindings: leds: Add 'cpuX' to 'linux,default-trigger')
Merging ipmi/for-next (0eb1762f3c77 ipmi/watchdog: Include <linux/kstrtox.h> when appropriate)
Merging driver-core/driver-core-next (50dc8d18f62d driver core: fix up missed drivers/s390/char/hmcdrv_dev.c class.devnode() conversion.)
Applying: fix up for "drivers/accel: define kconfig and register a new major"
Merging usb/usb-next (51daa42d6b86 Revert "i915: Move list_count() to list.h for broader use")
Merging thunderbolt/next (a5cfc9d65879 thunderbolt: Add wake on connect/disconnect on USB4 ports)
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (63b8ed26cd09 USB: serial: xr: avoid requesting zero DTE rate)
Merging tty/tty-next (6373ab4dfee7 serial: atmel: don't stop the transmitter when doing PIO)
Merging char-misc/char-misc-next (bbb09f8353c1 Merge tag 'icc-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml
CONFLICT (content): Merge conflict in drivers/firmware/raspberrypi.c
Merging coresight/next (c767c3474013 coresight: etm4x: fix repeated words in comments)
Merging fpga/for-next (ee31d5038c06 dt-bindings: fpga: document Lattice sysCONFIG FPGA manager)
Merging icc/icc-next (26e90ec7a840 Merge branch 'icc-sc8280xp-l3' into icc-next)
Merging iio/togreg (f84eec02b724 iio: addac: ad74413r: fix blank line after declaration warning)
Merging phy-next/next (bea3ce759b46 phy: ti: phy-j721e-wiz: add j721s2-wiz-10g module support)
Merging soundwire/next (7cbf00bd4142 soundwire: intel: split auxdevice to different file)
Merging extcon/extcon-next (de05153ffce5 extcon: usbc-tusb320: Convert to i2c's .probe_new())
Merging gnss/gnss-next (247f34f7b803 Linux 6.1-rc2)
Merging vfio/next (2f5d8cef45c3 vfio/mlx5: Fix a typo in mlx5vf_cmd_load_vhca_state())
Merging staging/staging-next (9dadff066244 staging: iio: ade7854: Convert to i2c's .probe_new())
Merging counter-next/counter-next (30a0b95b1335 Linux 6.1-rc3)
Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST)
Merging dmaengine/next (3a0c95b61385 dmaengine: tegra: Add support for dma-channel-mask)
Merging cgroup/for-next (674b745e22b3 cgroup: remove rcu_read_lock()/rcu_read_unlock() in critical section of spin_lock_irq())
Merging scsi/for-next (0cfd1fc5a347 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (4e80eef45ad7 scsi: sg: Fix get_user() in call sg_scsi_ioctl())
Merging vhost/linux-next (be8ddea9e75e vdpa/ifcvf: add reviewer)
Merging rpmsg/for-next (56d906bb66a7 Merge branches 'rproc-next' and 'hwspinlock-next' into for-next)
CONFLICT (content): Merge conflict in include/linux/firmware/xlnx-zynqmp.h
Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1)
Merging gpio-brgl/gpio/for-next (3b7c7478eda0 gpiolib: Provide to_gpio_device() helper)
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
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 (c05e8b14f374 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pinctrl-intel/for-next (b14ef61314b3 pinctrl: intel: Add Intel Moorefield pin controller support)
Merging pinctrl-renesas/renesas-pinctrl (80d34260f36c pinctrl: renesas: gpio: Use dynamic GPIO base if no function GPIOs)
Merging pinctrl-samsung/for-next (9abf2313adc1 Linux 6.1-rc1)
Merging pwm/for-next (50315945d178 dt-bindings: pwm: renesas,tpu: Add r8a779g0 support)
Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-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 (8008d88e6d16 selftests/tpm2: Split async tests call to separate shell script runner)
Merging kunit/test (9abf2313adc1 Linux 6.1-rc1)
Merging kunit-next/kunit (0f08f3e2a018 kunit: tool: don't include KTAP headers and the like in the test log)
CONFLICT (content): Merge conflict in lib/kunit/string-stream.c
Merging livepatching/for-next (cad81ab73997 Merge branch 'for-6.2/core' into for-next)
Merging rtc/rtc-next (a6ceee26fd5e rtc: pcf85063: Fix reading alarm)
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 (1a3f7484e076 NTB: ntb_transport: fix possible memory leak while device_register() fails)
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 (371fcbd32b26 dt-bindings: slimbus: qcom,slim-ngd: convert to DT schema)
Merging nvmem/for-next (18133a57a935 dt-bindings: nvmem: add YAML schema for the ONIE tlv layout)
Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
Merging hyperv/hyperv-next (fea858dc5d90 iommu/hyper-v: Allow hyperv irq remapping without x2apic)
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 (094226ad94f4 Linux 6.1-rc5)
Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
Merging mhi/mhi-next (5562c6a9657e bus: mhi: host: pci_generic: Add definition for some VIDs)
Merging memblock/for-next (80c2fe022ef5 memblock tests: remove completed TODO item)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging cxl/next (3b39fd6cf12c cxl: Replace HDM decoder granularity magic numbers)
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 (f2e862b7eae2 efi: stub: use random seed from EFI variable)
CONFLICT (content): Merge conflict in arch/loongarch/kernel/efi.c
CONFLICT (modify/delete): arch/x86/boot/compressed/efi_thunk_64.S deleted in HEAD and modified in efi/next.  Version efi/next of arch/x86/boot/compressed/efi_thunk_64.S left in tree.
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile
$ git rm -f arch/x86/boot/compressed/efi_thunk_64.S
Applying: fix up for "efi: libstub: Permit mixed mode return types other than efi_status_t"
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/for-next (dc19745ad0e4 Merge branch 'slub-tiny-v1r6' into slab/for-next)
CONFLICT (content): Merge conflict in include/linux/percpu.h
Merging random/master (1747d6cc5ded random: align entropy_timer_state to cache line)
Merging landlock/next (0b4ab8cd635e Merge tag 'landlock-6.1-rc4' into landlock-next)
Merging rust/rust-next (fd9517a1603f init/Kconfig: Specify the interpreter for rust_is_available.sh)
Merging sysctl/sysctl-next (0dff89c4488f sched: Move numa_balancing sysctls to its own file)
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 (cd57e443831d exec: Remove FOLL_FORCE for stack setup)
CONFLICT (content): Merge conflict in fs/binfmt_elf.c
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 (6fdc3fd27aec panic: Expose "warn_count" to sysfs)
$ git reset --hard HEAD^
Merging next-20221130 version of kspp
Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper)
Merging unsigned-char/unsigned-char (0445d1bae1cc lib: assume char is unsigned)
Merging iommufd/for-next (e60c7c8417da Merge tag 'v6.1-rc7' into iommufd.git for-next)
Merging mm-stable/mm-stable (e0ff42804233 mm/memory-failure.c: cleanup in unpoison_memory)
CONFLICT (content): Merge conflict in mm/damon/sysfs.c
CONFLICT (content): Merge conflict in mm/hugetlb.c
Merging mm-nonmm-stable/mm-nonmm-stable (fe5759d5bfda cpumask: limit visibility of FORCE_NR_CPUS)
Merging mm/mm-everything (33f20e4a37f3 Merge branch 'mm-nonmm-unstable' into mm-everything)
CONFLICT (content): Merge conflict in mm/gup.c
CONFLICT (content): Merge conflict in mm/huge_memory.c

[-- 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 Dec 1
@ 2023-12-01  2:37 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2023-12-01  2:37 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20231130:

The mm tree still had one build failure for which I applied a patch.

The scmi tree gained a build failure so I used the version from
next-20231130.

The riscv-dt tree gained a conflict against the riscv-dt-fixes tree.

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

Non-merge commits (relative to Linus' tree): 3807
 4389 files changed, 173058 insertions(+), 110682 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 is also the merge.log file 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, s390, 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 369 trees (counting Linus' and 105 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 (3b47bc037bd4 Merge tag 'pinctrl-v6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
Merging mm-hotfixes/mm-hotfixes-unstable (d537497237f7 kexec-fix-kexec_file-dependencies-fix)
Merging kbuild-current/fixes (98b1cc82c4af Linux 6.7-rc2)
Merging arc-current/for-curr (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm-current/fixes (2dde18cd1d8f Linux 6.5)
Merging arm64-fixes/for-next/fixes (f5259997f3e8 arm64: Avoid enabling KPTI unnecessarily)
Merging arm-soc-fixes/arm/fixes (736a4aad8a9f Merge tag 'renesas-fixes-for-v6.6-tag3' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/fixes)
Merging davinci-current/davinci/for-current (06c2afb862f9 Linux 6.5-rc1)
Merging drivers-memory-fixes/fixes (b85ea95d0864 Linux 6.7-rc1)
Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8)
Merging m68k-current/for-linus (03191fb3db3d m68k: lib: Include <linux/libgcc.h> for __muldi3())
Merging powerpc-fixes/fixes (dc158d23b33d KVM: PPC: Book3S HV: Fix KVM_RUN clobbering FP/VEC user registers)
Merging s390-fixes/fixes (aab1f809d754 scripts/checkstack.pl: match all stack sizes for s390)
Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build)
Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref())
Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY)
Merging net/main (777f245eec81 Merge branch 'net-ravb-fixes-for-the-ravb-driver')
Merging bpf/master (91fdb30ddfdb net: libwx: fix memory leak on msix entry)
Merging ipsec/master (76df934c6d5f MAINTAINERS: Add netdev subsystem profile link)
Merging netfilter/main (54d4434da824 Merge branch 'hv_netvsc-fix-race-of-netvsc-vf-register-and-slave-bit')
Merging ipvs/main (54d4434da824 Merge branch 'hv_netvsc-fix-race-of-netvsc-vf-register-and-slave-bit')
Merging wireless/for-next (91fdb30ddfdb net: libwx: fix memory leak on msix entry)
Merging wpan/master (2d1c882d4434 Merge tag 'mlx5-fixes-2023-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux)
Merging rdma-fixes/for-rc (2b78832f50c4 RDMA/irdma: Fix UAF in irdma_sc_ccq_get_cqe_info())
Merging sound-current/for-linus (a337c355719c ALSA: hda: Disable power-save on KONTRON SinglePC)
Merging sound-asoc-fixes/for-linus (c7095d154ddf ASoC: SOF: ipc4-topology: Correct data structures for the GAIN module)
Merging regmap-fixes/for-linus (b85ea95d0864 Linux 6.7-rc1)
Merging regulator-fixes/for-linus (b85ea95d0864 Linux 6.7-rc1)
Merging spi-fixes/for-linus (b85ea95d0864 Linux 6.7-rc1)
Merging pci-current/for-linus (b85ea95d0864 Linux 6.7-rc1)
Merging driver-core.current/driver-core-linus (2cc14f52aeb7 Linux 6.7-rc3)
Merging tty.current/tty-linus (58ac1b379979 ARM: PL011: Fix DMA support)
Merging usb.current/usb-linus (2cc14f52aeb7 Linux 6.7-rc3)
Merging usb-serial-fixes/usb-linus (2cc14f52aeb7 Linux 6.7-rc3)
Merging phy/fixes (2a9c713825b3 phy: sunplus: return negative error code in sp_usb_phy_probe)
Merging staging.current/staging-linus (98b1cc82c4af Linux 6.7-rc2)
Merging iio-fixes/fixes-togreg (1cd2fe4fd63e iio: imu: adis16475: use bit numbers in assign_bit())
Merging counter-current/counter-current (58720809f527 Linux 6.6-rc6)
Merging char-misc.current/char-misc-linus (af54d778a038 devcoredump: Send uevent once devcd is ready)
Merging soundwire-fixes/fixes (393cae5f32d6 soundwire: intel_ace2x: fix AC timing setting for ACE2.x)
Merging thunderbolt-fixes/fixes (ac43c9122e42 thunderbolt: Fix memory leak in margining_port_remove())
Merging input-current/for-linus (335fe00319e0 Input: i8042 - add nomux quirk for Acer P459-G2-M)
Merging crypto-current/master (9aedd10fe384 crypto: ahash - Set using_shash for cloned ahash wrapper over shash)
Merging vfio-fixes/for-linus (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
Merging kselftest-fixes/fixes (b85ea95d0864 Linux 6.7-rc1)
Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition)
Merging dmaengine-fixes/fixes (54bed6bafa0f dmaengine: stm32-dma: avoid bitfield overflow assertion)
Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2)
Merging mtd-fixes/mtd/fixes (7c1b1906229d mtd: spinand: gigadevice: Fix the get ecc status issue)
Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2)
Merging v4l-dvb-fixes/fixes (32138be394e5 Merge tag 'media-renesas-fixes-20231113' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git)
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
Merging mips-fixes/mips-fixes (2cc14f52aeb7 Linux 6.7-rc3)
Merging at91-fixes/at91-fixes (b85ea95d0864 Linux 6.7-rc1)
Merging omap-fixes/fixes (c72b9c33ef96 ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init)
Merging kvm-fixes/master (ffc253263a13 Linux 6.6)
Merging kvms390-fixes/master (27072b8e18a7 KVM: s390/mm: Properly reset no-dat)
Merging hwmon-fixes/hwmon (58ebe7fb6eb2 hwmon: max31827: include regulator header)
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size)
Merging cxl-fixes/fixes (8f61d48c83f6 tools/testing/cxl: Slow down the mock firmware transfer)
Merging btrfs-fixes/next-fixes (1472b846cf93 Merge branch 'misc-6.7' into next-fixes)
Merging vfs-fixes/fixes (dc32464a5fe4 ceph_wait_on_conflict_unlink(): grab reference before dropping ->d_lock)
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
Merging drivers-x86-fixes/fixes (fb103b90e944 platform/x86: asus-wmi: Filter Volume key presses if also reported via atkbd)
Merging samsung-krzk-fixes/fixes (b85ea95d0864 Linux 6.7-rc1)
Merging pinctrl-samsung-fixes/fixes (b85ea95d0864 Linux 6.7-rc1)
Merging devicetree-fixes/dt/linus (d79972789d17 of: dynamic: Fix of_reconfig_get_state_change() return value documentation)
Merging dt-krzk-fixes/fixes (b85ea95d0864 Linux 6.7-rc1)
Merging scsi-fixes/fixes (b09d7f8fd50f scsi: sd: Fix system start for ATA devices)
Merging drm-fixes/drm-fixes (2cc14f52aeb7 Linux 6.7-rc3)
Merging drm-intel-fixes/for-linux-next-fixes (d21a3962d304 drm/i915: Call intel_pre_plane_updates() also for pipes getting enabled)
Merging mmc-fixes/fixes (477865af60b2 mmc: sdhci-sprd: Fix vqmmc not shutting down after the card was pulled)
Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource)
Merging gnss-fixes/gnss-linus (98b1cc82c4af Linux 6.7-rc2)
Merging hyperv-fixes/hyperv-fixes (18286883e779 x86/hyperv: Use atomic_try_cmpxchg() to micro-optimize hv_nmi_unknown())
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
Merging risc-v-fixes/fixes (3ca112b71f35 Merge tag 'probes-fixes-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace)
Merging riscv-dt-fixes/riscv-dt-fixes (79997eda0d31 riscv: dts: microchip: move timebase-frequency to mpfs.dtsi)
Merging riscv-soc-fixes/riscv-soc-fixes (b85ea95d0864 Linux 6.7-rc1)
Merging fpga-fixes/fixes (b85ea95d0864 Linux 6.7-rc1)
Merging spdx/spdx-linus (2cc14f52aeb7 Linux 6.7-rc3)
Merging gpio-brgl-fixes/gpio/for-current (b85ea95d0864 Linux 6.7-rc1)
Merging gpio-intel-fixes/fixes (b85ea95d0864 Linux 6.7-rc1)
Merging pinctrl-intel-fixes/fixes (b85ea95d0864 Linux 6.7-rc1)
Merging erofs-fixes/fixes (62b241efff99 MAINTAINERS: erofs: add EROFS webpage)
Merging kunit-fixes/kunit-fixes (1bddcf77ce66 kunit: test: Avoid cast warning when adding kfree() as an action)
Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
Merging memblock-fixes/fixes (55122e0130e5 memblock tests: fix warning ‘struct seq_file’ declared inside parameter list)
Merging nfsd-fixes/nfsd-fixes (bf51c52a1f3c NFSD: Fix checksum mismatches in the duplicate reply cache)
Merging irqchip-fixes/irq/irqchip-fixes (b673fe1a6229 MAINTAINERS: Remove myself from the general IRQ subsystem maintenance)
Merging renesas-fixes/fixes (9eab43facdad soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM)
Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
Merging perf-current/perf-tools (57686a72da08 tools: Disable __packed attribute compiler warning due to -Werror=attributes)
Merging efi-fixes/urgent (01b1e3ca0e5c efi/unaccepted: Fix off-by-one when checking for overlapping ranges)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
Merging battery-fixes/fixes (f37669119423 power: supply: cw2015: correct time_to_empty units in sysfs)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1)
Merging iommufd-fixes/for-rc (83b2a846e779 iommufd: Do not UAF during iommufd_put_object())
Merging rust-fixes/rust-fixes (cfd96726e611 rust: docs: fix logo replacement)
Merging v9fs-fixes/fixes/next (2dde18cd1d8f Linux 6.5)
Merging w1-fixes/fixes (b85ea95d0864 Linux 6.7-rc1)
Merging pmdomain-fixes/fixes (0cb19e50a911 pmdomain: arm: Avoid polling for scmi_perf_domain)
Merging overlayfs-fixes/ovl-fixes (37f32f526438 ovl: fix memory leak in ovl_parse_param())
Merging drm-misc-fixes/for-linux-next-fixes (64111a0e22a9 drm/panfrost: Fix incorrect updating of current device frequency)
Merging mm-stable/mm-stable (5b7ad877e4d8 Merge tag 'afs-fixes-20231124' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
Merging mm-nonmm-stable/mm-nonmm-stable (5b7ad877e4d8 Merge tag 'afs-fixes-20231124' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
Merging mm/mm-everything (69c7014afd0b Merge branch 'mm-nonmm-unstable' into mm-everything)
Applying: powerpc: pmd_move_must_withdraw() is only needed for CONFIG_TRANSPARENT_HUGEPAGE
Merging kbuild/for-next (e4228436deb1 scripts: clean up IA-64 code)
Merging clang-format/clang-format (5d0c230f1de8 Linux 6.5-rc4)
Merging perf/perf-tools-next (72a2a0a494ec perf test record+probe_libc_inet_pton: Fix call chain match on powerpc)
CONFLICT (content): Merge conflict in tools/perf/Makefile.perf
Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4)
Merging dma-mapping/for-next (53c87e846e33 swiotlb: fix out-of-bounds TLB allocations with CONFIG_SWIOTLB_DYNAMIC)
Merging asm-generic/master (47e52b44307b Merge branch 'asm-generic-prototypes' into asm-generic)
Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging arm/for-next (c7368ddba2ff ARM: 9326/1: make <linux/uaccess.h> self-contained for ARM)
Merging arm64/for-next/core (2cc14f52aeb7 Linux 6.7-rc3)
Merging arm-perf/for-next/perf (b805cafc604b perf: hisi: Fix use-after-free when register pmu fails)
Merging arm-soc/for-next (1b52f65d88ad Merge branch 'soc/defconfig' into for-next)
Merging amlogic/for-next (093098370b46 Merge branch 'v6.8/arm64-dt' into for-next)
Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6)
Merging aspeed/for-next (e9be9b34b841 ARM: dts: aspeed: Add ASRock E3C256D4I BMC)
Merging at91/at91-next (b766b70117ac Merge branch 'at91-dt' into at91-next)
Merging broadcom/next (62a3c97f8167 Merge branch 'devicetree/next' into next)
Merging davinci/davinci/for-next (06c2afb862f9 Linux 6.5-rc1)
Merging drivers-memory/for-next (0d6c918011ce memory: tegra: Skip SID programming if SID registers aren't set)
Merging imx-mxs/for-next (258bebe27695 Merge branch 'imx/dt64' into for-next)
Merging mediatek/for-next (9802b60bd6d8 Merge branch 'v6.6-next/soc' into for-next)
Merging mvebu/for-next (93e6b023e552 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (0b70b2d8ea01 Merge branch 'omap-for-v6.8/dt' into for-next)
Merging qcom/for-next (2b05c2dc230b Merge branches 'arm64-defconfig-for-6.7', 'arm64-fixes-for-6.6', 'arm64-for-6.7', 'clk-for-6.7', 'drivers-for-6.7' and 'dts-for-6.7' into for-next)
Merging renesas/next (a89ef75a0104 Merge branch 'renesas-dts-for-v6.8' into renesas-next)
Merging reset/reset/next (c3c46acd5be9 dt-bindings: reset: hisilicon,hi3660-reset: Drop providers and consumers from example)
Merging rockchip/for-next (5d1f1f3b9d04 Merge branch 'v6.8-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (64041620130c Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (98cff2adc789 Merge branch 'for-next/scmi/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
$ git reset --hard HEAD^
Merging next-20231130 version of scmi
Merging stm32/stm32-next (9a7308232a11 ARM: dts: stm32: add SPI support on STM32F746)
Merging sunxi/sunxi/for-next (715a9e70bdd4 Merge branch 'sunxi/clk-for-6.8' into sunxi/for-next)
Merging tee/next (352b5f33b950 Merge branch 'ffa_notif_for_v6.8' into next)
Merging tegra/for-next (650220c2b474 Merge branch for-6.7/arm64/dt into for-next)
Merging ti/ti-next (2b27ce85624e Merge branch 'ti-keystone-dts-next' into ti-next)
Merging xilinx/for-next (1d4723dec415 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (b85ea95d0864 Linux 6.7-rc1)
Merging clk-imx/for-next (b85ea95d0864 Linux 6.7-rc1)
Merging clk-renesas/renesas-clk (5f9e29b9159a clk: renesas: rzg2l-cpg: Reuse code in rzg2l_cpg_reset())
Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging loongarch/loongarch-next (c517fd2738f4 Docs/zh_CN/LoongArch: Update links in LoongArch introduction.rst)
Merging m68k/for-next (03191fb3db3d m68k: lib: Include <linux/libgcc.h> for __muldi3())
Merging m68knommu/for-next (2cc14f52aeb7 Linux 6.7-rc3)
Merging microblaze/next (ffb0399437ef microblaze: defconfig: Enable the Marvell phy driver)
Merging mips/mips-next (2cc14f52aeb7 Linux 6.7-rc3)
Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment)
Merging parisc-hd/for-next (487635756198 parisc: Fix asm operand number out of range build error in bug table)
Merging powerpc/next (ede66cd22441 powerpc/64s: Fix CONFIG_NUMA=n build due to create_section_mapping())
Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
Merging risc-v/for-next (3ca112b71f35 Merge tag 'probes-fixes-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace)
Merging riscv-dt/riscv-dt-for-next (637cb4b61b01 Merge patch series "Add Huashan Pi board support")
CONFLICT (content): Merge conflict in arch/riscv/boot/dts/sophgo/cv1800b.dtsi
Applying: fixup for "riscv: dts: sophgo: Separate compatible specific for CV1800B soc"
Merging riscv-soc/riscv-soc-for-next (94f4018bc9f3 Merge branch 'riscv-cache-for-next' into riscv-soc-for-next)
Merging s390/for-next (99babaaa23b2 Merge branch 'features' into for-next)
Merging sh/for-next (b85ea95d0864 Linux 6.7-rc1)
Merging uml/next (974b808d85ab um: virt-pci: fix missing declaration warning)
Merging xtensa/xtensa-for-next (791beae7335c xtensa: Use PCI_HEADER_TYPE_MFD instead of literal)
Merging bcachefs/for-next (b6a4a08b32c7 bcachefs: remove redundant condition from data_update_index_update)
Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
Merging fscrypt/for-next (15baf55481de fscrypt: track master key presence separately from secret)
Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums)
Merging btrfs/for-next (6d3880a76eed Merge branch 'for-next-next-v6.7-20231129' into for-next-20231129)
Merging ceph/master (d30d7c57a64d ceph: select FS_ENCRYPTION_ALGS if FS_ENCRYPTION)
Merging cifs/for-next (2331016da3f9 smb: client: handle special files and symlinks in SMB3 POSIX)
Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance)
Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix)
Merging erofs/dev (8f146316b1dd erofs: fix memory leak on short-lived bounced pages)
Merging exfat/dev (1373ca10ec04 exfat: fix ctime is not updated)
Merging ext3/for_next (8abc712ea486 ext2: Fix ki_pos update for DIO buffered-io fallback case)
Merging ext4/dev (91562895f803 ext4: properly sync file size update after O_SYNC direct IO)
Merging f2fs/dev (d346fa09abff f2fs: sysfs: support discard_io_aware)
Merging fsverity/for-next (919dc320956e fsverity: skip PKCS#7 parser when keyring is empty)
Merging fuse/for-next (18437366a3a1 fuse: share lookup state between submount and its parent)
Merging gfs2/for-next (8d859dc44163 gfs2: Fix inode_go_instantiate description)
Merging jfs/jfs-next (cca974daeb6c jfs: fix shift-out-of-bounds in dbJoin)
Merging ksmbd/ksmbd-for-next (df60cee26a2e Merge tag '6.7-rc3-smb3-server-fixes' of git://git.samba.org/ksmbd)
Merging nfs/linux-next (f003a717ae90 nfs: Convert nfs_symlink() to use a folio)
Merging nfs-anna/linux-next (379e4adfddd6 NFSv4.1: fixup use EXCHGID4_FLAG_USE_PNFS_DS for DS server)
Merging nfsd/nfsd-next (1ec134cfd5e2 svcrdma: Clean up locking)
Merging ntfs3/master (ffc253263a13 Linux 6.6)
Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init())
Merging overlayfs/overlayfs-next (2c3ef4f89ced ovl: initialize ovl_copy_up_ctx.destname inside ovl_do_copy_up())
Merging ubifs/next (75690493591f ubifs: ubifs_link: Fix wrong name len calculating when UBIFS is encrypted)
Merging v9fs/9p-next (ce0708796420 9p/net: fix possible memory leak in p9_check_errors())
Merging v9fs-ericvh/ericvh/for-next (2dde18cd1d8f Linux 6.5)
Merging xfs/for-next (9c235dfc3d3f xfs: dquot recovery does not validate the recovered dquot)
Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method)
Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter())
Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck)
Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux)
Merging vfs-brauner/vfs.all (c5bf82a9f055 Merge branch 'vfs.fscache' into vfs.all)
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/subpage.c
CONFLICT (content): Merge conflict in fs/btrfs/super.c
CONFLICT (content): Merge conflict in fs/buffer.c
Applying: linux-next: manual merge of the vfs-brauner tree with the btrfs tree
Merging vfs/for-next (bbe6a7c899e7 bch2_ioctl_subvolume_destroy(): fix locking)
Merging printk/for-next (b4908d68609b Merge branch 'for-6.7' into for-next)
Merging pci/next (b8d0cad57d3f Merge branch 'pci/switchtec')
Merging pstore/for-next/pstore (1d49dee6b691 pstore/ram: Fix crash when setting number of cpus to an odd number)
Merging hid/for-next (8674f6b6cdba Merge branch 'for-6.7/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (382561d16854 i2c: ocores: Move system PM hooks to the NOIRQ phase)
Merging i3c/i3c/next (b4da37db3e2c i3c: master: Fix build error)
Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks)
Merging hwmon-staging/hwmon-next (45514f0e7103 hwmon: (pc87360) Bounds check data->innr usage)
Merging jc_docs/docs-next (d254d263f6c8 docs: submitting-patches: improve the base commit explanation)
Merging v4l-dvb/master (a00b3f296eac media: mediatek: vcodec: Set the supported vp9 profile for each platform)
Merging v4l-dvb-next/master (3b8551e73271 media: wave5: add OF and V4L_MEM2MEM_DRIVERS dependencies)
Merging pm/linux-next (d9670e2b2724 Merge branch 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (8f96e29aae31 pmdomain: qcom: rpmpd: Set GENPD_FLAG_ACTIVE_WAKEUP)
Merging cpupower/cpupower (997bbf2accf6 tools cpupower bench: Override CFLAGS assignments)
Merging devfreq/devfreq-next (b85ea95d0864 Linux 6.7-rc1)
Merging pmdomain/next (833811353f70 pmdomain: xilinx/zynqmp: Convert to platform remove callback returning void)
Merging opp/opp/linux-next (19cc8b1819a4 OPP: Check for invalid OPP in dev_pm_opp_find_level_ceil())
Merging thermal/thermal/linux-next (9618efe343ea thermal/qcom/tsens: Drop ops_v0_1)
Merging dlm/next (0c08699744d2 dlm: implement EXPORT_OP_ASYNC_LOCK)
Merging rdma/for-next (50af5d12f7e2 RDMA/IPoIB: Add tx timeout work to recover queue stop situation)
Merging net-next/main (f9893fdac319 net: page_pool: fix general protection fault in page_pool_unlist)
Merging bpf-next/for-next (f690ff9122d2 bpf/tests: Remove duplicate JSGT tests)
CONFLICT (content): Merge conflict in Documentation/netlink/specs/netdev.yaml
Merging ipsec-next/master (aadbd27f9674 net: phy: correctly check soft_reset ret ONLY if defined for PHY)
Merging mlx5-next/mlx5-next (82f9378c443c net/mlx5: Handle IPsec steering upon master unbind/bind)
Merging netfilter-next/main (ac40916a3f72 rtnetlink: introduce nlmsg_new_large and use it in rtnl_getlink)
Merging ipvs-next/main (ac40916a3f72 rtnetlink: introduce nlmsg_new_large and use it in rtnl_getlink)
Merging bluetooth/master (ab3d463ded5d Bluetooth: hci_event: shut up a false-positive warning)
Merging wireless-next/for-next (9f4dee32b783 wifi: rtw89: debug: remove wrapper of rtw89_debug())
Merging wpan-next/master (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call)
Merging wpan-staging/staging (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call)
Merging mtd/mtd/next (b85ea95d0864 Linux 6.7-rc1)
Merging nand/nand/next (3cc4718fa644 mtd: rawnand: brcmnand: exec_op implementation)
Merging spi-nor/spi-nor/next (9b3eae3486c8 docs: mtd: spi-nor: drop obsolete info)
Merging crypto/master (cc03a934c5da dt-bindings: crypto: convert Inside Secure SafeXcel to the json-schema)
Merging drm/drm-next (a13fee31f564 Merge v6.7-rc3 into drm-next)
Merging drm-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape)
Merging drm-misc/for-linux-next (3d1ff9dfdc16 dma-buf: Correct the documentation of name and exp_name symbols)
Merging amdgpu/drm-next (36fd9969fa53 drm/amdgpu: Use another offset for GC 9.4.3 remap)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
Merging drm-intel/for-linux-next (562f33836f51 drm/i915/dgfx: DGFX uses direct VBT pin mapping)
Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
Merging drm-msm/msm-next (07e6de738aa6 drm/msm/a690: Fix reg values for a690)
Merging drm-msm-lumag/msm-next-lumag (d3b4075b173f drm/msm/dp: use correct lifetime device for devm_drm_bridge_add)
Merging etnaviv/etnaviv/next (925b10728f20 drm/etnaviv: disable MLCG and pulse eater on GPU reset)
Merging fbdev/for-next (64a1aed0aa07 fbdev: mmp: Fix typo and wording in code comment)
Merging regmap/for-next (1957b92aaff0 regmap: fix regmap_noinc_write() description)
Merging sound/for-next (f8ccb133c986 ASoC: Intel: avs: Unhardcode HDAudio BE DAI drivers description)
Merging ieee1394/for-next (c12d7aa7ffa4 firewire: Annotate struct fw_node with __counted_by)
Merging sound-asoc/for-next (baaecc2b07ce Merge remote-tracking branch 'asoc/for-6.8' into asoc-next)
Merging modules/modules-next (4652b8e4f3ff Merge tag '6.7-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd)
Merging input/next (a42b4bd51b2a dt-bindings: input: mediatek,pmic-keys: Drop incomplete example)
Merging block/for-next (20d713ea3192 Merge branch 'for-6.8/block' into for-next)
Merging device-mapper/for-next (41e05548fa6b dm-flakey: start allocating with MAX_ORDER)
Merging libata/for-next (804901fdd637 ata: pata_pxa: convert not to use dma_request_slave_channel())
Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer())
Merging mmc/next (fee5a2a60089 mmc: core: Use mrq.sbc in close-ended ffu)
Merging mfd/for-mfd-next (95f44ef666a6 dt-bindings: mfd: qcom,spmi-pmic: Add pm8916 vm-bms and lbc)
Merging backlight/for-backlight-next (58793f263abc backlight: pwm_bl: Use dev_err_probe)
Merging battery/for-next (b55d073e6501 power: supply: bq256xx: fix some problem in bq256xx_hw_init)
Merging regulator/for-next (753e4d5c433d regulator: add under-voltage support (part 2))
Merging security/next (80b4ff1d2c9b selftests: remove the LSM_ID_IMA check in lsm/lsm_list_modules_test)
CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl
CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h
CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl
CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl
CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl
CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl
CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h
CONFLICT (content): Merge conflict in tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl
CONFLICT (content): Merge conflict in tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in tools/perf/arch/s390/entry/syscalls/syscall.tbl
CONFLICT (content): Merge conflict in tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
Applying: fix up for "LSM: wireup Linux Security Module syscalls"
Merging apparmor/apparmor-next (a7e405a2de69 apparmor: add missing params to aa_may_ptrace kernel-doc comments)
Merging integrity/next-integrity (b836c4d29f27 ima: detect changes to the backing overlay file)
Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest)
Merging selinux/next (ae254858ce07 selinux: introduce an initial SID for early boot processes)
Merging smack/next (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso())
Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1)
Merging tpmdd/next (c2d5304e6c64 Merge tag 'platform-drivers-x86-v6.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86)
Merging watchdog/master (b85ea95d0864 Linux 6.7-rc1)
Merging iommu/next (173ff345925a Merge branches 'apple/dart', 'virtio', 'x86/amd' and 'core' into next)
Merging audit/next (24fade412acf Automated merge of 'dev' into 'next')
Merging devicetree/for-next (e185a24eeab3 dt-bindings: correct white-spaces in examples)
Merging dt-krzk/for-next (b85ea95d0864 Linux 6.7-rc1)
Merging mailbox/for-next (96cb7a4e296d dt-bindings: mailbox: qcom-ipcc: document the SM8650 Inter-Processor Communication Controller)
Merging spi/for-next (7a030abc0185 mtd: spi-nor: Stop reporting warning message when soft reset is not suported)
Merging tip/master (0f4427f91d62 Merge branch into tip/master: 'x86/percpu')
Merging clockevents/timers/drivers/next (c28ca80ba3b5 clocksource: ep93xx: Add driver for Cirrus Logic EP93xx)
Merging edac/edac-for-next (12f230c07a95 EDAC/amd64: Add support for family 0x19, models 0x90-9f devices)
Merging irqchip/irq/irqchip-next (19b5a44bee16 irqchip: Add support for Amlogic-C3 SoCs)
Merging ftrace/for-next (e1742fa172d5 Merge probes/for-next)
Merging rcu/rcu/next (68f721e904b2 rcu: Restrict access to RCU CPU stall notifiers)
Merging kvm/next (e9e60c82fe39 selftests/kvm: fix compilation on non-x86_64 platforms)
CONFLICT (content): Merge conflict in include/linux/pagemap.h
Applying: fs: Convert error_remove_page to error_remove_folio
Applying: fix up for "KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory"
Merging kvm-arm/next (307c5436c3f4 Merge branch kvm-arm64/lpa2 into kvmarm-master/next)
Merging kvms390/next (70fea3019516 KVM: s390: add tracepoint in gmap notifier)
Merging kvm-ppc/topic/ppc-kvm (98b1cc82c4af Linux 6.7-rc2)
Merging kvm-riscv/riscv_kvm_next (d9c00f44e5de KVM: riscv: selftests: Add SBI DBCN extension to get-reg-list test)
Merging kvm-x86/next (e26c60015709 Merge branches 'fixes', 'hyperv', 'lam' and 'selftests')
Merging xen-tip/linux-next (7f3da4b698bc xen/events: fix error code in xen_bind_pirq_msi_to_irq())
Merging percpu/for-next (3fcf62f24c80 Merge branch 'for-6.6' into for-next)
Merging workqueues/for-next (4a6c5607d450 workqueue: Make sure that wq_unbound_cpumask is never empty)
Merging drivers-x86/for-next (4a29436f0909 platform/x86: asus-laptop: remove redundant braces in if statements)
Merging chrome-platform/for-next (d131f1f3b459 platform/chrome: sensorhub: Implement quickselect for median calculation)
Merging chrome-platform-firmware/for-firmware-next (ecea08916418 firmware: coreboot: framebuffer: Avoid invalid zero physical address)
Merging hsi/for-next (fa72d143471d HSI: omap_ssi: Remove usage of the deprecated ida_simple_xx() API)
Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1)
Merging leds-lj/for-leds-next (8171710be2d0 leds: max5970: Add support for max5970)
Merging ipmi/for-next (c5d03a0d8461 ipmi: Use regspacings passed as a module parameter)
Merging driver-core/driver-core-next (eec4954b81c3 driver core: make device_is_dependent() static)
Merging usb/usb-next (24af68a0ed53 usb: misc: onboard_usb_hub: Add support for Cypress CY7C6563x)
Merging thunderbolt/next (655b8af57d31 thunderbolt: Remove duplicated re-assignment of pointer 'out')
Merging usb-serial/usb-next (2cc14f52aeb7 Linux 6.7-rc3)
Merging tty/tty-next (d804987153e7 serial: 8250_dw: Decouple DLF register check from UCV)
Merging char-misc/char-misc-next (b9873755a6c8 misc: Add Nitro Secure Module driver)
Merging accel/habanalabs-next (0d1d2a3fa73b accel/habanalabs/gaudi2: add signed dev info uAPI)
Merging coresight/next (60e5f23dc5d6 coresight: ultrasoc-smb: Use guards to cleanup)
Merging fastrpc/for-next (b85ea95d0864 Linux 6.7-rc1)
Merging fpga/for-next (5496fb8eedd6 drivers/fpga: use standard array-copy function)
Merging icc/icc-next (feaf241ae2da Merge branch 'icc-fixes' into icc-next)
Merging iio/togreg (6543f376ec8a iio: buffer: document known issue)
Merging phy-next/next (7f6f9e0def00 phy: qcom-qmp-usb: Add Qualcomm SDX75 USB3 PHY support)
Merging soundwire/next (55d50ace6b88 soundwire: generic_bandwidth_allocation use bus->params.max_dr_freq)
Merging extcon/extcon-next (b85ea95d0864 Linux 6.7-rc1)
Merging gnss/gnss-next (98b1cc82c4af Linux 6.7-rc2)
Merging vfio/next (2b88119e35b0 vfio/mtty: Enable migration support)
Merging w1/for-next (271c81935801 w1: Add AXI 1-wire host driver for AMD programmable logic IP core)
Merging staging/staging-next (d488759416ed Staging: rtl8192e: Rename variable TsCommonInfo)
Merging counter-next/counter-next (7904cdf1397c counter: chrdev: remove a typo in header file comment)
Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
Merging dmaengine/next (306f5df81fcc dmaengine: apple-admac: Keep upper bits of REG_BUS_WIDTH)
Merging cgroup/for-next (357564d50da3 Merge branch 'for-6.8' into for-next)
Merging scsi/for-next (d85d85eab615 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (6bae38ddd3a8 Merge patch series "scsi: arcmsr: support Areca ARC-1688 Raid controller")
Merging vhost/linux-next (e07754e0a1ea vhost-vdpa: fix use after free in vhost_vdpa_probe())
Merging rpmsg/for-next (3f978d9889a2 remoteproc: k3-dsp: Convert to platform remove callback returning void)
Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1)
Merging gpio-brgl/gpio/for-next (58bfaaac0328 gpio: sysfs: fix forward declaration of struct gpio_device)
Merging gpio-intel/for-next (92fc925f8386 gpio: tangier: simplify locking using cleanup helpers)
Merging pinctrl/for-next (75eb87dfebda Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (6191e49de389 pinctrl: baytrail: Simplify code with cleanup helpers)
Merging pinctrl-renesas/renesas-pinctrl (dc99d4c8ac46 dt-bindings: pinctrl: renesas: Drop unneeded quotes)
Merging pinctrl-samsung/for-next (b77f5ef8ebe4 pinctrl: samsung: add irq_set_affinity() for non wake up external gpio interrupt)
Merging pwm/for-next (53a2eaaf19c4 pwm: Update kernel doc for struct pwm_chip)
Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next)
Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie)
Merging kselftest/next (130a83879954 selftests: sched: Remove initialization to 0 for a static variable)
Merging kunit/test (b85ea95d0864 Linux 6.7-rc1)
Merging kunit-next/kunit (5fd4a61acb8e kunit: string-stream-test: Avoid cast warning when testing gfp_t flags)
Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' into for-next)
Merging rtc/rtc-next (3d762e21d563 rtc: cmos: Use ACPI alarm for non-Intel x86 systems too)
Merging nvdimm/libnvdimm-for-next (9ea459e477dc libnvdimm: remove kernel-doc warnings:)
Merging at24/at24/for-next (ec74a1dfcdd1 eeprom: at24: use of_match_ptr())
Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format)
Merging seccomp/for-next/seccomp (31c65705a8cf perf/benchmark: fix seccomp_unotify benchmark for 32-bit)
Merging fsi/next (f04d61a379d6 fsi: fix some spelling mistakes in comment)
Merging slimbus/for-next (b85ea95d0864 Linux 6.7-rc1)
Merging nvmem/for-next (b85ea95d0864 Linux 6.7-rc1)
Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc)
Merging hyperv/hyperv-next (ce9ecca0238b Linux 6.6-rc2)
Merging auxdisplay/auxdisplay (35b464e32c8b auxdisplay: hd44780: move cursor home after clear display command)
Merging kgdb/kgdb/for-next (23816724fdbd kdb: Corrects comment for kdballocenv)
Merging hmm/hmm (0bb80ecc33a8 Linux 6.6-rc1)
Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
Merging mhi/mhi-next (d63ddfb78b23 bus: mhi: ep: Add support for interrupt moderation timer)
Merging memblock/for-next (e96c6b8f212a memblock: report failures when memblock_can_resize is not set)
Merging cxl/next (5d09c63f11f0 cxl/hdm: Remove broken error path)
Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning)
Merging efi/next (b501d5b36f58 efivarfs: automatically update super block flag)
Merging unicode/for-next (c1869dbd2957 Merge branch 'unicode/negative-dentries' into unicode/for-next)
Merging slab/slab/for-next (7eec549256f2 Merge branch 'slab/for-6.8/slab-removal' into slab/for-next)
CONFLICT (content): Merge conflict in mm/kasan/quarantine.c
Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging landlock/next (1c8f324fd1e2 landlock: Document IOCTL support)
Merging rust/rust-next (3857af38e57a docs: rust: add "The Rust experiment" section)
Merging sysctl/sysctl-next (8b793bcda61f watchdog: move softlockup_panic back to early_param)
Merging execve/for-next/execve (21ca59b365c0 binfmt_misc: enable sandboxed mounts)
Merging bitmap/bitmap-for-next (0762cf0860c8 lib/find_bit: Fix the code comments about find_next_bit_wrap)
Merging hte/for-next (b85ea95d0864 Linux 6.7-rc1)
Merging kspp/for-next/kspp (979c1a946570 Merge branches 'for-linus/hardening' and 'for-next/hardening' into for-next/kspp)
Merging kspp-gustavo/for-next/kspp (617ab3c357d2 init: Kconfig: Disable -Wstringop-overflow for GCC-11)
Merging nolibc/nolibc (b85ea95d0864 Linux 6.7-rc1)
Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS)
Merging iommufd/for-next (b2b67c997bf7 iommufd: Organize the mock domain alloc functions closer to Joerg's tree)

[-- 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 Dec 1
@ 2021-12-01  5:37 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2021-12-01  5:37 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20211130:

The fscache tree gained a conflict against Linus' tree.

The tip tree still has its build failure for which I reverted 2 commits.

The gpio-brgl tree still had its build failure so I used the version from
next-20211115.

The akpm tree still had its boot failure for which I reverted 6 commits.
It also gained a build failure for which I applied a patch.

Non-merge commits (relative to Linus' tree): 4036
 4605 files changed, 187261 insertions(+), 88751 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 344 trees (counting Linus' and 94 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 (f080815fdb3e Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging fixes/fixes (d06c942efea4 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging kbuild-current/fixes (e851dfae4371 Merge tag 'kgdb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux)
Merging arc-current/for-curr (b9cac915c541 ARC: thread_info.h: correct two typos in a comment)
Merging arm-current/fixes (418ace9992a7 ARM: 9156/1: drop cc-option fallbacks for architecture selection)
Merging arm64-fixes/for-next/fixes (94902d849e85 arm64: uaccess: avoid blocking within critical sections)
Merging arm-soc-fixes/arm/fixes (383a44aec91c memory: mtk-smi: Fix a null dereference for the ostd)
Merging drivers-memory-fixes/fixes (8c5ba21c16bd memory: mtk-smi: Fix a null dereference for the ostd)
Merging tee-fixes/fixes (d58071a8a76d Linux 5.16-rc3)
Merging m68k-current/for-linus (8a3c0a74ae87 m68k: defconfig: Update defconfigs for v5.15-rc1)
Merging powerpc-fixes/fixes (5bb60ea611db powerpc/32: Fix hardlockup on vmap stack overflow)
Merging s390-fixes/fixes (a03df4546872 s390: update defconfigs)
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 (34d8778a9437 MAINTAINERS: s390/net: add Alexandra and Wenjia as maintainer)
Merging bpf/master (099f83aa2d06 mips, bpf: Fix reference to non-existing Kconfig symbol)
Merging ipsec/master (ec3bb890817e xfrm: fix dflt policy check when there is no policy configured)
Merging netfilter/master (619ca0d0108a selftests: add arp_ndisc_evict_nocarrier to Makefile)
Merging ipvs/master (619ca0d0108a selftests: add arp_ndisc_evict_nocarrier to Makefile)
Merging wireless-drivers/master (191587cd1a5f mt76: fix key pointer overwrite in mt7921s_write_txwi/mt7663_usb_sdio_write_txwi)
Merging mac80211/master (1eda919126b4 nl80211: reset regdom when reloading regdb)
Merging rdma-fixes/for-rc (db6169b5bac1 RDMA/rtrs: Call {get,put}_cpu_ptr to silence a debug kernel warning)
Merging sound-current/for-linus (289047db1143 ALSA: hda/hdmi: fix HDA codec entry table order for ADL-P)
Merging sound-asoc-fixes/for-linus (c5bdc6db6060 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus)
Merging regmap-fixes/for-linus (459e1cd0d5ec Merge remote-tracking branch 'regmap/for-5.15' into regmap-linus)
Merging regulator-fixes/for-linus (6966df483d7b regulator: Update protection IRQ helper docs)
Merging spi-fixes/for-linus (2143e3218a64 Merge remote-tracking branch 'spi/for-5.15' into spi-linus)
Merging pci-current/for-linus (fa55b7dcdc43 Linux 5.16-rc1)
Merging driver-core.current/driver-core-linus (136057256686 Linux 5.16-rc2)
Merging tty.current/tty-linus (bb1201d4b38e serial: 8250_pci: rewrite pericom_do_set_divisor())
Merging usb.current/usb-linus (d58071a8a76d Linux 5.16-rc3)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (d58071a8a76d Linux 5.16-rc3)
Merging usb-chipidea-fixes/for-usb-fixes (f130d08a8d79 usb: chipidea: ci_hdrc_imx: Also search for 'phys' phandle)
CONFLICT (content): Merge conflict in drivers/usb/chipidea/ci_hdrc_imx.c
Merging phy/fixes (f0ae8685b285 phy: HiSilicon: Fix copy and paste bug in error handling)
Merging staging.current/staging-linus (d58071a8a76d Linux 5.16-rc3)
Merging iio-fixes/fixes-togreg (784b470728f5 iio: adc: stm32: fix null pointer on defer_probe error)
Merging char-misc.current/char-misc-linus (d58071a8a76d Linux 5.16-rc3)
Merging soundwire-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging thunderbolt-fixes/fixes (d58071a8a76d Linux 5.16-rc3)
Merging input-current/for-linus (1d72d9f960cc Input: elantech - fix stack out of bound access in elantech_change_report_id())
Merging crypto-current/master (beaaaa37c664 crypto: api - Fix boot-up crash when crypto manager is disabled)
Merging vfio-fixes/for-linus (8704e8934908 vfio/pci: Fix OpRegion read)
Merging kselftest-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging modules-fixes/modules-linus (0d67e332e6df module: fix clang CFI with MODULE_UNLOAD=n)
Merging dmaengine-fixes/fixes (fa51b16d0558 dmaengine: idxd: fix calling wq quiesce inside spinlock)
Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
Merging mtd-fixes/mtd/fixes (bed96b1b5b2c mtd: rawnand: fsmc: Fix timing computation)
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
Merging v4l-dvb-fixes/fixes (d40f0b133b44 media: meson-ir-tx: remove incorrect doc comment)
Merging reset-fixes/reset/fixes (69125b4b9440 reset: tegra-bpmp: Revert Handle errors in BPMP response)
Merging mips-fixes/mips-fixes (d58071a8a76d Linux 5.16-rc3)
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 (7cfc5c653b07 KVM: fix avic_set_running for preemptable kernels)
Merging kvms390-fixes/master (0e9ff65f455d KVM: s390: preserve deliverable_mask in __airqs_kick_single_vcpu)
Merging hwmon-fixes/hwmon (0e4190d762ef hwmon: (sht4x) Fix EREMOTEIO errors)
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 (0426549c5d7d Merge branch 'misc-5.16' 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 (49201b90af81 platform/x86: amd-pmc: Fix s2idle failures on certain AMD laptops)
Merging samsung-krzk-fixes/fixes (4f5d06d381ba arm64: dts: exynos: drop samsung,ufs-shareability-reg-offset in ExynosAutov9)
Merging pinctrl-samsung-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging devicetree-fixes/dt/linus (913d3a3f8408 dt-bindings: watchdog: sunxi: fix error in schema)
Merging scsi-fixes/fixes (7dc9fb47bc9a scsi: ufs: ufs-pci: Add support for Intel ADL)
Merging drm-fixes/drm-fixes (d58071a8a76d Linux 5.16-rc3)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (61e29a0956bd drm/i915: Add support for panels with VESA backlights with PWM enable/disable)
Merging mmc-fixes/fixes (7dba402807a8 mmc: renesas_sdhi: initialize variable properly when tuning)
Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
Merging gnss-fixes/gnss-linus (136057256686 Linux 5.16-rc2)
Merging hyperv-fixes/hyperv-fixes (1dc2f2b81a6a hv: utils: add PTP_1588_CLOCK to Kconfig to fix build)
Merging soc-fsl-fixes/fix (7e5e744183bb soc: fsl: dpio: fix qbman alignment error in the virtualization context)
Merging risc-v-fixes/fixes (298d03c2d7f1 riscv: dts: unmatched: Add gpio card detect to mmc-spi-slot)
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
Merging fpga-fixes/fixes (8bb7eca972ad Linux 5.15)
Merging spdx/spdx-linus (fa55b7dcdc43 Linux 5.16-rc1)
Merging gpio-brgl-fixes/gpio/for-current (d6912b1251b4 gpio: rockchip: needs GENERIC_IRQ_CHIP to fix build errors)
Merging gpio-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging pinctrl-intel-fixes/fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging erofs-fixes/fixes (57bbeacdbee7 erofs: fix deadlock when shrink erofs slab)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (fa55b7dcdc43 Linux 5.16-rc1)
Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
Merging memblock-fixes/fixes (b5013d084e03 Merge tag '5.16-rc-part1-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6)
Merging cel-fixes/for-rc (8bb7eca972ad Linux 5.15)
Merging irqchip-fixes/irq/irqchip-fixes (357a9c4b79f4 irqchip/mips-gic: Use bitfield helpers)
Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
Merging perf-current/perf/urgent (8b98436af2c0 Merge tag 'perf-tools-fixes-for-v5.16-2021-11-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux)
Merging efi-fixes/urgent (38fa3206bf44 efi: Change down_interruptible() in virt_efi_reset_system() to down_trylock())
Merging zstd-fixes/zstd-linus (7416cdc9b9c1 lib: zstd: Don't add -O3 to cflags)
Merging drm-misc-fixes/for-linux-next-fixes (6052a3110be2 drm/vc4: kms: Fix previous HVS commit wait)
Merging kbuild/for-next (7528edbafeef [for -next only] kconfig: generate include/generated/rustc_cfg)
Merging perf/perf/core (8ab774587903 Merge tag 'trace-v5.16-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
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 (0ce29cae5ba4 Merge branches 'devel-stable', 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (d58071a8a76d Linux 5.16-rc3)
Merging arm-perf/for-next/perf (e656972b6986 drivers/perf: Improve build test coverage)
Merging arm-soc/for-next (b86314b30dee Merge branch 'arm/fixes' into for-next)
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (c5468e3c930d arm64: dts: meson: p241: add sound support)
Merging aspeed/for-next (16d6dc8d8030 ARM: dts: aspeed: mtjade: Add uefi partition)
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 (7dda5cc4dca0 Merge branch 'mem-ctrl-next' into for-next)
Merging imx-mxs/for-next (ee4fb9b87b3c Merge branch 'imx/dt64' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (c7f6a2bf61cb Merge branch 'v5.16-next/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 (b287e05999e7 Merge branches 'arm64-for-5.17', 'drivers-for-5.17' and 'dts-for-5.17' into for-next)
Merging raspberrypi/for-next (79c2b7252cc6 ARM: dts: bcm2711-rpi-400: Fix GPIO expander labels)
Merging renesas/next (168c85dfca17 Merge branch 'renesas-drivers-for-v5.17' into renesas-next)
Merging reset/reset/next (c4f5b30dda01 reset: Add of_reset_control_get_optional_exclusive())
Merging rockchip/for-next (e862cef6cdda Merge branch 'v5.16-armsoc/soc-fixes' into for-next)
Merging samsung-krzk/for-next (7b8664f50180 Merge branch 'next/soc' into for-next)
Merging scmi/for-linux-next (ca54383f2adb 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 (1149ccc5e891 ARM: dts: stm32: fix stusb1600 pinctrl used on stm32mp157c-dk)
Merging sunxi/sunxi/for-next (7c6997ef13d4 Merge branch 'sunxi/dt-for-5.17' into sunxi/for-next)
Merging tee/next (ce352be35ba0 Merge branch 'async_notif' into next)
Merging tegra/for-next (bbd827b4de7e Merge branch for-5.16/arm64/defconfig into for-next)
Merging ti/ti-next (71907ae8e0c0 Merge branch 'ti-drivers-soc-next' into ti-next)
Merging xilinx/for-next (326b5e9db528 Merge branch 'zynqmp/soc' into for-next)
Merging clk/clk-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging clk-imx/for-next (9dd81021084f clk: imx8mp: Fix the parent clk of the audio_root_clk)
Merging clk-renesas/renesas-clk (33b22d9c3272 clk: renesas: r9a07g044: Add TSU clock and reset entry)
Merging clk-samsung/for-next (bcda841f9bf2 clk: samsung: exynos850: Register clocks early)
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 (376e3fdecb0d m68k: Enable memtest functionality)
Merging m68knommu/for-next (d58071a8a76d Linux 5.16-rc3)
Merging microblaze/next (54b54ea061a8 microblaze: fix typo in a comment)
Merging mips/mips-next (97ad1d89624d MIPS: TXx9: Let MACH_TX49XX select BOOT_ELF32)
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 (8d88382b7436 parisc/agp: Annotate parisc agp init functions with __init)
Merging powerpc/next (af3fdce4ab07 Revert "powerpc/code-patching: Improve verification of patchability")
Merging soc-fsl/next (54c8b5b6f8a8 soc: fsl: dpio: rename the enqueue descriptor variable)
Merging risc-v/for-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging s390/for-next (eae157f3498e Merge branch 'fixes' 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/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 (0f8821da4845 fs/namespace: Boost the mount_lock.lock owner instead of spinning on PREEMPT_RT.)
Merging fscrypt/master (b7e072f9b77f fscrypt: improve a few comments)
Merging fscache/fscache-next (b3c088faf78b fscache: Rewrite documentation)
CONFLICT (content): Merge conflict in Documentation/filesystems/netfs_library.rst
Merging afs/afs-next (52af7105eceb afs: Set mtime from the client for yfs create operations)
Merging btrfs/for-next (279373dee83e Fixup merge-to-merge conflict in lzo_compress_pages)
Merging ceph/master (c02cb7bdc450 ceph: add a new metric to keep track of remote object copies)
Merging cifs/for-next (3498e7f2bb41 Merge tag '5.16-rc2-ksmbd-fixes' of git://git.samba.org/ksmbd)
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 (a671c22ee2d3 exfat: move super block magic number to magic.h)
Merging ext3/for_next (a48fc69fe658 udf: Fix crash after seekdir)
Merging ext4/dev (124e7c61deb2 ext4: fix error code saved on super block during file system abort)
Merging f2fs/dev (b3b2202d4299 f2fs: use iomap for direct I/O)
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
Merging fuse/for-next (3e2b6fdbdc9a fuse: send security context of inode on file)
Merging gfs2/for-next (cfdb9692082c gfs2: Rework gfs2_inode_lookup)
Merging jfs/jfs-next (c48a14dca2cb JFS: fix memleak in jfs_mount)
Merging ksmbd/ksmbd-for-next (d58071a8a76d Linux 5.16-rc3)
Merging nfs/linux-next (064a91771f7a SUNRPC: use different lock keys for INET6 and LOCAL)
Merging nfs-anna/linux-next (8cfb9015280d NFS: Always provide aligned buffers to the RPC read layers)
Merging nfsd/nfsd-next (136057256686 Linux 5.16-rc2)
Merging cel/for-next (b6eae261e431 NFSD: make symbol 'nfsd_notifier_lock' static)
Merging ntfs3/master (52e00ea6b26e fs/ntfs3: Update valid size if -EIOCBQUEUED)
Merging orangefs/for-next (ac2c63757f4f orangefs: Fix sb refcount leak when allocate sb info failed.)
Merging overlayfs/overlayfs-next (5b0a414d06c3 ovl: fix filattr copy-up failure)
Merging ubifs/next (9aaa6cc099f6 ubifs: Document sysfs nodes)
Merging v9fs/9p-next (6e195b0f7c8e 9p: fix a bunch of checkpatch warnings)
Merging xfs/for-next (1090427bf18f xfs: remove xfs_inew_wait)
Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check)
Merging iomap/iomap-for-next (5ad448ce2976 iomap: iomap_read_inline_data cleanup)
Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID)
Merging file-locks/locks-next (80d8e4d3f313 fs/locks: fix fcntl_getlk64/fcntl_setlk64 stub prototypes)
Merging vfs/for-next (8f40da9494cf Merge branch 'misc.namei' into for-next)
Merging printk/for-next (06cf63cb69be Merge branch 'for-5.16-fixup' into for-next)
Merging pci/next (bef2b1c97d77 Merge branch 'pci/errors')
Merging pstore/for-next/pstore (a5d05b07961a pstore/ftrace: Allow immediate recording)
Merging hid/for-next (cfc95e453afd Merge branch 'for-5.16/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (ff1da8aa15b4 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 (253402129b1a hwmon: (sht4x) Add device tree match table)
Merging jc_docs/docs-next (065db2d90c6b docs/zh_CN: Add zh_CN/accounting/taskstats.rst)
Merging v4l-dvb/master (1f1517fafda5 media: cx18: drop an unused macro)
Merging v4l-dvb-next/master (8cc7a1b2aca0 media: venus: core: Fix a resource leak in the error handling path of 'venus_probe()')
Merging pm/linux-next (7975c7f139bb Merge branches 'acpi-power', 'acpi-dptf', 'acpi-processor' and 'acpi-scan' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (3ed6dfbd3bb9 cpufreq: qcom-hw: Set CPU affinity of dcvsh interrupts)
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 (673c68bd4839 thermal/drivers: Add TSU driver for RZ/G2L)
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (1b9beda83e27 fs: dlm: fix build with CONFIG_IPV6 disabled)
Merging rdma/for-next (81ff48ddda0b RDMA/bnxt_re: Use bitmap_zalloc() when applicable)
Merging net-next/master (196073f9c44b net: ixp4xx_hss: drop kfree for memory allocated with devm_kzalloc)
Merging bpf-next/for-next (b98057ef730a Merge branch 'Add bpf_loop helper')
CONFLICT (content): Merge conflict in Documentation/bpf/index.rst
Merging ipsec-next/master (2e1809208a4a xfrm: Remove duplicate assignment)
Merging mlx5-next/mlx5-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging netfilter-next/master (632cb151ca53 netfilter: ctnetlink: remove useless type conversion to bool)
Merging ipvs-next/master (ec574d9ee5d2 net: phylink: add 1000base-KX to phylink_caps_to_linkmodes())
Merging wireless-drivers-next/master (69831173fcbb rtlwifi: rtl8192de: Style clean-ups)
Merging bluetooth/master (dbf6811abbfc Bluetooth: Limit duration of Remote Name Resolve)
Merging mac80211-next/master (75c5bd68b699 ieee80211: change HE nominal packet padding value defines)
Merging mtd/mtd/next (67bcbe202b48 mtd: core: clear out unregistered devices a bit more)
Merging nand/nand/next (f53d4c109a66 mtd: rawnand: gpmi: Add ERR007117 protection for nfc_apply_timings)
Merging spi-nor/spi-nor/next (228e80459960 MAINTAINERS: Add myself as SPI NOR co-maintainer)
Merging crypto/master (330507fbc9d8 crypto: des - disallow des3 in FIPS mode)
Merging drm/drm-next (c18c8891111b Merge tag 'drm-misc-next-2021-11-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_kms.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
Merging drm-misc/for-linux-next (c99907c723c6 dma-buf: make fence mandatory for dma_resv_add_excl_fence v2)
Merging amdgpu/drm-next (c8d265840be6 drm/amdgpu/UAPI: add new CTX OP for setting profile modes)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
Merging drm-intel/for-linux-next (74ba89c08e30 drm/i915: Fix DPT suspend/resume on !HAS_DISPLAY platforms)
Merging drm-intel-gt/for-linux-next-gt (95d35838880f dma_fence_array: Fix PENDING_ERROR leak in dma_fence_array_signaled())
Merging drm-tegra/drm/tegra/for-next (cef3fb370da3 drm/tegra: Mark nvdec PM functions as __maybe_unused)
CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/gem.c
Merging drm-msm/msm-next (fee328076333 mailmap: add and update email addresses)
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 (02d6fdecb9c3 regmap: allow to define reg_update_bits for no bus configuration)
Merging sound/for-next (322fa4315400 ASoC: Intel: Skylake: Use NHLT API to search for blob)
Merging sound-asoc/for-next (7be10cef0fbe ASoC: soc-pcm: tidyup soc_pcm_pointer()'s delay update method)
CONFLICT (content): Merge conflict in sound/soc/sof/intel/hda.c
Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer)
Merging input/next (fafc66387dc0 Input: wacom_i2c - clean up the query device fields)
Merging block/for-next (c2626d30f312 Merge branch 'for-5.17/io_uring' into for-next)
Merging device-mapper/for-next (1b8d2789dad0 dm btree remove: fix use after free in rebalance_children())
Merging libata/for-next (6f48394cf1f3 sata_fsl: fix warning in remove_proc_entry when rmmod sata_fsl)
Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug)
Merging mmc/next (f9962ac595d2 mmc: sdhci-esdhc-imx: Add sdhc support for i.MXRT series)
Merging mfd/for-mfd-next (5dc6dafe6209 mfd: simple-mfd-i2c: Select MFD_CORE to fix build error)
Merging backlight/for-backlight-next (3976e974df1f video: backlight: ili9320: Make ili9320_remove() return void)
Merging battery/for-next (0838a3bfcd1b power: supply: qcom_smbb: support pm8226)
Merging regulator/for-next (59eadd2af3f7 regulator: qcom-rpmh: Add PMG1110 regulators)
Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
Merging apparmor/apparmor-next (fa55b7dcdc43 Linux 5.16-rc1)
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 (6326948f940d lsm: security_task_getsecid_subj() -> security_current_getsecid_subj())
Merging smack/next (0934ad42bb2c smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi)
Merging tomoyo/master (5d9f4cf36721 Merge tag 'selinux-pr-20211123' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux)
Merging tpmdd/next (7eba41fe8c7b tpm_tis_spi: Add missing SPI ID)
Merging watchdog/master (c738888032ff watchdog: db8500_wdt: Rename symbols)
Merging iommu/next (86dc40c7ea9c iommu/vt-d: Fix unmap_pages support)
Merging audit/next (fa55b7dcdc43 Linux 5.16-rc1)
Merging devicetree/for-next (668b0ffd27ea of: base: Skip CPU nodes with "fail"/"fail-..." status)
Merging mailbox/mailbox-for-next (97961f78e8bc mailbox: imx: support i.MX8ULP S4 MU)
Merging spi/for-next (8393961c53b3 spi: pxa2xx: Get rid of unused enable_loopback member)
Merging tip/auto-latest (b1b6b42a35e7 Merge branch 'locking/core')
Applying: Revert "futex: Remove futex_cmpxchg detection"
Applying: Revert "futex: Ensure futex_atomic_cmpxchg_inatomic() is present"
Merging clockevents/timers/drivers/next (453e2cadc97c dt-bindings: timer: tpm-timer: Add imx8ulp compatible string)
Merging edac/edac-for-next (a9e6b3819b36 dt-bindings: memory: Add entry for version 3.80a)
Merging irqchip/irq/irqchip-next (11e45471abea Merge branch irq/misc-5.16 into irq/irqchip-next)
Merging ftrace/for-next (a55f224ff5f2 tracing: Fix pid filtering when triggers are attached)
Merging rcu/rcu/next (124a6590f96c rcu/nocb: Merge rcu_spawn_cpu_nocb_kthread() and rcu_spawn_one_nocb_kthread())
Merging kvm/next (da1bfd52b930 KVM: x86: Drop arbitrary KVM_SOFT_MAX_VCPUS)
Merging kvm-arm/next (5a2acbbb0179 Merge branch kvm/selftests/memslot into kvmarm-master/next)
Merging kvms390/next (3fd8417f2c72 KVM: s390: add debug statement for diag 318 CPNC data)
Merging xen-tip/linux-next (00db58cf2118 xen: make HYPERVISOR_set_debugreg() always_inline)
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 (e9ff190973df platform/x86: touchscreen_dmi: Add TrekStor SurfTab duo W1 touchscreen info)
Merging chrome-platform/for-next (297d34e73d49 platform/chrome: cros_ec_proto: Use ec_command for check_features)
Merging hsi/for-next (a1ee1c08fcd5 HSI: core: Fix return freed object in hsi_new_client)
Merging leds/for-next (66340b5a6f86 leds: leds-fsg: Drop FSG3 LED driver)
Merging ipmi/for-next (29dbee57174a ipmi: Add the git repository to the MAINTAINERS file)
Merging driver-core/driver-core-next (2043727c2882 driver core: platform: Make use of the helper function dev_err_probe())
Merging usb/usb-next (4d012040161c Merge 5.16-rc3 into usb-next)
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (d58071a8a76d Linux 5.16-rc3)
Merging usb-chipidea-next/for-usb-next (78665f57c3fa usb: chipidea: udc: make controller hardware endpoint primed)
Merging tty/tty-next (3f19fed8d0da Documentation: add TTY chapter)
Merging char-misc/char-misc-next (5d331b592255 Merge 5.16-rc3 into char-misc-next)
Merging extcon/extcon-next (9e6ef3a25e5e dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string)
Merging phy-next/next (77ba6e7ffbd8 phy: stm32: adopt dev_err_probe for regulators)
Merging soundwire/next (bb349fd2d580 soundwire: qcom: remove redundant version number read)
Merging thunderbolt/next (d58071a8a76d Linux 5.16-rc3)
Merging vfio/next (3bf1311f351e vfio/ccw: Convert to use vfio_register_emulated_iommu_dev())
Merging staging/staging-next (24cd719712ae Merge 5.16-rc3 into staging-next)
Merging iio/togreg (7d71d289e1ba iio: light: ltr501: Added ltr303 driver support)
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 (78e488c462e5 Merge branch 'icc-msm8996' into icc-next)
Merging dmaengine/next (7eafa6eed7f1 dmaengine: ppc4xx: remove unused variable `rval')
Merging cgroup/for-next (8291471ea5f1 cgroup: get the wrong css for css_alloc() during cgroup_init_subsys())
Merging scsi/for-next (32f4b58cc162 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (db33028647a3 scsi: Remove superfluous #include <linux/async.h> directives)
Merging vhost/linux-next (4bd5d4c69825 iommu/virtio: Support identity-mapped domains)
Merging rpmsg/for-next (612de6839c55 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 (ea708ac5bf41 gpio: xlp: Remove Netlogic XLP variants)
$ git reset --hard HEAD^
Merging next-20211115 version of gpio-brgl
Merging gpio-intel/for-next (be3dc15ffe64 gpiolib: acpi: Unify debug and other messages format)
Merging gpio-sim/gpio/gpio-sim (5065e08e4ef3 gpio: sim: fix missing unlock on error in gpio_sim_config_commit_item())
CONFLICT (content): Merge conflict in tools/testing/selftests/gpio/Makefile
Merging pinctrl/for-next (2c1aa55d819d Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (db1b2a8caf5b pinctrl: cherryview: Use temporary variable for struct device)
Merging pinctrl-renesas/renesas-pinctrl (7c50a407b868 pinctrl: renesas: Remove unneeded locking around sh_pfc_read() calls)
Merging pinctrl-samsung/for-next (16dd3bb5c190 pinctrl: samsung: Make symbol 'exynos7885_pin_ctrl' static)
Merging pwm/for-next (b6ce2af8766c pwm: img: Use only a single idiom to get a runtime PM reference)
Merging userns/for-next (5ae9497dda62 signal: requeuing undeliverable signals)
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
Merging kselftest/next (60726e868227 selftests/ftrace: make kprobe profile testcase description unique)
Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next)
Merging coresight/next (f9809d565135 Documentation: coresight: Update coresight configuration docs)
Merging rtc/rtc-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging nvdimm/libnvdimm-for-next (e765f13ed126 nvdimm/pmem: move dax_attribute_group from dax to pmem)
Merging at24/at24/for-next (fa55b7dcdc43 Linux 5.16-rc1)
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 (64bc5a949ae1 Merge branch 'for-linus/kspp' into for-next/kspp)
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (b15c90153fd9 gnss: drop stray semicolons)
Merging fsi/next (7cc2f34e1f4d fsi: sbefifo: Use interruptible mutex locking)
Merging slimbus/for-next (fa55b7dcdc43 Linux 5.16-rc1)
Merging nvmem/for-next (42f65ea5a727 nvmem: mtk-efuse: support minimum one byte access stride and granularity)
Merging xarray/main (f2aa11fd5144 tools: Fix math.h breakage)
Merging hyperv/hyperv-next (285f68afa8b2 x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted)
Merging auxdisplay/auxdisplay (4daa9ff89ef2 auxdisplay: charlcd: checking for pointer reference before dereferencing)
Merging kgdb/kgdb/for-next (b77dbc86d604 kdb: Adopt scheduler's task classification)
Merging hmm/hmm (6880fa6c5660 Linux 5.15-rc1)
Merging fpga/for-next (8886a579744f fpga: region: Use standard dev_release for class driver)
Merging kunit/test (fa55b7dcdc43 Linux 5.16-rc1)
Merging cfi/cfi/next (baaf965f9430 mtd: hyperbus: rpc-if: fix bug in rpcif_hb_remove)
Merging kunit-next/kunit (fa55b7dcdc43 Linux 5.16-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 mhi/mhi-next (46827f596963 bus: mhi: pci_generic: Simplify code and axe the use of a deprecated API)
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 samples/Makefile
CONFLICT (content): Merge conflict in samples/Kconfig
CONFLICT (content): Merge conflict in Makefile
Applying: Kbuild: fix for "kbuild: split DEBUG_CFLAGS out to scripts/Makefile.debug"
Merging cxl/next (53989fad1286 cxl/pmem: Fix module reload vs workqueue state)
Merging folio/for-next (c03571399870 mm: Add functions to zero portions of a folio)
Merging bitmap/bitmap-master-5.15 (785cb064e2f8 vsprintf: rework bitmap_list_string)
CONFLICT (content): Merge conflict in drivers/dma/ti/edma.c
CONFLICT (content): Merge conflict in arch/parisc/include/asm/bitops.h
Merging zstd/zstd-next (fa55b7dcdc43 Linux 5.16-rc1)
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
Merging akpm-current/current (3333af6434fb configs: introduce debug.config for CI-like setup)
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (0998e5c96faa lib/stackdepot: allow optional init and stack_table allocation by kvmalloc() - fixup3)
Applying: Revert "kprobe: move sysctl_kprobes_optimization to kprobes.c"
Applying: Revert "fs/coredump: move coredump sysctls into its own file"
Applying: Revert "printk: fix build warning when CONFIG_PRINTK=n"
Applying: Revert "kernel/sysctl.c: rename sysctl_init() to sysctl_init_bases()"
Applying: Revert "fs: move namespace sysctls and declare fs base directory"
Applying: Revert "sysctl: add and use base directory declarer and registration helper"
Applying: firmware_loader-move-firmware-sysctl-to-its-own-files-fix-3

[-- 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 Dec 1
@ 2020-12-01 10:03 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2020-12-01 10:03 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20201130:

The arm64 tree gained a conflict against the arm64-fixes tree.

The bpf-next tree gained a build failure for which I applied a patch.

The regmap tree lost its build failure.

The devicetree tree gained a conflict against the devicetree-fixes tree.

The phy-next tree gained a build failure so I reverted a commit.

The akpm tree gained conflicts against the bpf-next and jc_docs trees.

Non-merge commits (relative to Linus' tree): 8747
 8236 files changed, 645729 insertions(+), 140666 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 (b65054597872 Linux 5.10-rc6)
Merging fixes/fixes (4e33a343ac74 powerpc: fix the allyesconfig build)
Merging kbuild-current/fixes (d1889589a4f5 builddeb: Fix rootless build in setuid/setgid directory)
Merging arc-current/for-curr (b65054597872 Linux 5.10-rc6)
Merging arm-current/fixes (9fa2e7af3d53 ARM: 9019/1: kprobes: Avoid fortify_panic() when copying optprobe template)
Merging arm64-fixes/for-next/fixes (9e5344e0ffc3 arm64: mte: Fix typo in macro definition)
Merging arm-soc-fixes/arm/fixes (ae597565d13f Merge tag 'optee-valid-memory-type-for-v5.11' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes)
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 (10f78fd0dabb powerpc/numa: Fix a regression on memoryless node 0)
Merging s390-fixes/fixes (1179f170b6f0 s390: fix fpu restore in entry.S)
Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro)
Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files)
Merging net/master (4d521943f76b dt-bindings: net: correct interrupt flags in examples)
Merging bpf/master (4d521943f76b dt-bindings: net: correct interrupt flags in examples)
Merging ipsec/master (48f486e13ffd net: xfrm: fix memory leak in xfrm_user_policy())
Merging netfilter/master (4d521943f76b dt-bindings: net: correct interrupt flags in examples)
Merging ipvs/master (c0700dfa2cae netfilter: nf_tables: avoid false-postive lockdep splat)
Merging wireless-drivers/master (fe56d05ee6c8 iwlwifi: mvm: fix kernel panic in case of assert during CSA)
Merging mac80211/master (849920c70339 devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill())
Merging rdma-fixes/for-rc (b65054597872 Linux 5.10-rc6)
Merging sound-current/for-linus (aeedad250499 ALSA: hda/realtek: Add mute LED quirk to yet another HP x360 model)
Merging sound-asoc-fixes/for-linus (5b5bb93961ec Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus)
Merging regmap-fixes/for-linus (e6e9354b5830 regmap: Remove duplicate `type` field from regmap `regcache_sync` trace event)
Merging regulator-fixes/for-linus (34c5aa2666db regulator: Kconfig: Fix REGULATOR_QCOM_RPMH dependencies to avoid build error)
Merging spi-fixes/for-linus (ba1cee33fd17 Merge remote-tracking branch 'spi/for-5.10' into spi-linus)
Merging pci-current/for-linus (cce14622a703 PCI: Add function 1 DMA alias quirk for Marvell 9215 SATA controller)
Merging driver-core.current/driver-core-linus (f8394f232b1e Linux 5.10-rc3)
Merging tty.current/tty-linus (418baf2c28f3 Linux 5.10-rc5)
Merging usb.current/usb-linus (d3f31301894d Merge tag 'thunderbolt-for-v5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus)
Merging usb-gadget-fixes/fixes (129aa9734559 usb: raw-gadget: fix memory leak in gadget_setup)
Merging usb-serial-fixes/usb-linus (6d6556c04eba USB: serial: option: add support for Thales Cinterion EXS82)
Merging usb-chipidea-fixes/for-usb-fixes (3ed55d528a54 usb: cdns3: core: fix goto label for error path)
Merging phy/fixes (fb89b2544b64 phy: mediatek: fix spelling mistake in Kconfig "veriosn" -> "version")
Merging staging.current/staging-linus (418baf2c28f3 Linux 5.10-rc5)
Merging char-misc.current/char-misc-linus (a71464d0b930 Merge tag 'misc-habanalabs-fixes-2020-11-30' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux into char-misc-linus)
Merging soundwire-fixes/fixes (3650b228f83a Linux 5.10-rc1)
Merging thunderbolt-fixes/fixes (600c0849cf86 thunderbolt: Fix use-after-free in remove_unplugged_switch())
Merging input-current/for-linus (855b69857830 Input: i8042 - fix error return code in i8042_setup_aux())
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 (7d764b685ee1 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 (418baf2c28f3 Linux 5.10-rc5)
Merging backlight-fixes/for-backlight-fixes (bbf5c979011a Linux 5.9)
Merging mtd-fixes/mtd/fixes (b36bf0a0fe5d mtd: rawnand: socrates: Move the ECC initialization to ->attach_chip())
Merging mfd-fixes/for-mfd-fixes (bbf5c979011a Linux 5.9)
Merging v4l-dvb-fixes/fixes (44f28934af14 media: vidtv.rst: add kernel-doc markups)
Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
Merging mips-fixes/mips-fixes (ac3b57adf87a MIPS: Alchemy: Fix memleak in alchemy_clk_setup_cpu)
Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
Merging omap-fixes/fixes (05d5de6ba7db ARM: dts: dra76x: m_can: fix order of clocks)
Merging kvm-fixes/master (c2b1209d852f MAINTAINERS: Update email address for Sean Christopherson)
Merging kvms390-fixes/master (735931f9a51a MAINTAINERS: add uv.c also to KVM/s390)
Merging hwmon-fixes/hwmon (418baf2c28f3 Linux 5.10-rc5)
Merging nvdimm-fixes/libnvdimm-fixes (88b67edd7247 dax: Fix compilation for CONFIG_DAX && !CONFIG_FS_DAX)
Merging btrfs-fixes/next-fixes (462b8e885b92 Merge branch 'misc-5.10' into next-fixes)
Merging vfs-fixes/fixes (4bbf439b09c5 fix return values of seq_read_iter())
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 (c9aa128080cb platform/x86: touchscreen_dmi: Add info for the Irbis TW118 tablet)
Merging samsung-krzk-fixes/fixes (cd12e4f14f7c CREDITS: remove trailing white spaces)
Merging pinctrl-samsung-fixes/fixes (3650b228f83a Linux 5.10-rc1)
Merging devicetree-fixes/dt/linus (48ae42d22a71 dt-bindings: Don't error out on yamllint errors)
Merging scsi-fixes/fixes (e92643db5148 scsi: ufs: Fix race between shutdown and runtime resume flow)
Merging drm-fixes/drm-fixes (b65054597872 Linux 5.10-rc6)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (280ffdb6ddb5 drm/i915/gt: Free stale request on destroying the virtual engine)
Merging mmc-fixes/fixes (a42a7ec9bb99 mmc: sdhci-of-arasan: Fix clock registration error for Keem Bay SOC)
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 (5f1251a48c17 video: hyperv_fb: Fix the cache type when mapping the VRAM)
Merging soc-fsl-fixes/fix (2663b3388551 soc: fsl: dpio: Get the cpumask through cpumask_of(cpu))
Merging risc-v-fixes/fixes (30aca1bacb39 RISC-V: fix barrier() use in <vdso/processor.h>)
Merging pidfd-fixes/fixes (aabe19b82793 nsproxy: use put_nsproxy() in switch_task_namespaces())
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 (5f714771d01e pinctrl: baytrail: Avoid clearing debounce value when turning it off)
Merging erofs-fixes/fixes (a30573b3cdc7 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 (3084db0e0d50 kunit: fix display of failed expectations for strings)
Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
Merging memblock-fixes/fixes (b9bc36704cca ARM, xtensa: highmem: avoid clobbering non-page aligned memory reservations)
Merging drm-misc-fixes/for-linux-next-fixes (fd4e788e971c drm/omap: sdi: fix bridge enable/disable)
Merging kspp-gustavo/for-next/kspp (36f9ff9e03de lib: Fix fall-through warnings for Clang)
Merging kbuild/for-next (f5037e22315c kconfig: clean up header inclusion)
Merging compiler-attributes/compiler-attributes (971385eae4fc Compiler Attributes: remove CONFIG_ENABLE_MUST_CHECK)
Merging dma-mapping/for-next (7679325702c9 selftests/dma: add test application for DMA_MAP_BENCHMARK)
Merging asm-generic/master (8eb42bcea5ae Merge branch 'asm-generic-fixes' into asm-generic)
Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
Merging arm/for-next (40bd54f12902 Merge branch 'devel-stable' into for-next)
Merging arm64/for-next/core (e9da8ce2582e Merge remote-tracking branch 'arm64/for-next/iommu/core' into for-next/core)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/exception.h
Merging arm-perf/for-next/perf (367c820ef080 arm64: Enable perf events based hard lockup detector)
Merging arm-soc/for-next (33fa6976a384 soc: document merges)
Merging amlogic/for-next (5557389af533 Merge branch 'v5.11/soc' into tmp/aml-rebuild)
Merging aspeed/for-next (41707a524026 Merge branches 'soc-for-v5.11' and 'defconfig-for-v5.11' into for-next)
Merging at91/at91-next (65cc8babccce Merge branches 'at91-drivers', 'at91-dt' and 'at91-defconfig' into at91-next)
Merging drivers-memory/for-next (a4f11eac544c Merge branch 'mem-ctrl-next' into for-next)
Merging imx-mxs/for-next (24462a1e187c Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (b2a8f6ce4bdc Merge branch 'for_5.11/drivers-soc' into next)
Merging mediatek/for-next (727bfb2c55b0 Merge branch 'v5.10-next/soc' into for-next)
Merging mvebu/for-next (dc14300bb67b Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (6a5044c84dfa Merge branch 'omap-for-v5.11/genpd' into for-next)
Merging qcom/for-next (d7288346e0a4 Merge branches 'arm64-for-5.11', 'arm64-defconfig-for-5.11', 'drivers-for-5.11' and 'dts-for-5.11' into for-next)
Merging raspberrypi/for-next (278407a53c3b ARM: dts: bcm283x: increase dwc2's RX FIFO size)
Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next)
Merging renesas/next (c51a6c86347a Merge branch 'renesas-drivers-for-v5.11' into renesas-next)
Merging reset/reset/next (3bfe8933f9d1 reset: meson: make it possible to build as a module)
Merging rockchip/for-next (460fe7594617 Merge branch 'v5.11-clk/next' into for-next)
Merging samsung-krzk/for-next (4792bcc96771 Merge branch 'next/defconfig' into for-next)
Merging scmi/for-linux-next (b65054597872 Linux 5.10-rc6)
Merging stm32/stm32-next (814fddb955f8 ARM: multi_v7_defconfig: enable STM32 dfsdm audio support)
Merging sunxi/sunxi/for-next (8ebd74f80194 Merge branches 'sunxi/dt-for-5.11', 'sunxi/fixes-for-5.10' and 'sunxi/config-for-5.11' into sunxi/for-next)
Merging tegra/for-next (b11a0dfbd316 Merge branch for-5.11/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 (de7caab0974f Merge branch 'ti-k3-dts-next' into ti-k3-next)
Merging clk/clk-next (9dc1f9729380 Merge branch 'clk-qcom' into clk-next)
Merging clk-samsung/for-next (44a9e78f9242 clk: samsung: Prevent potential endless loop in the PLL ops)
Merging csky/linux-next (ba3b26607f55 csky: Optimize atomic operations with correct barrier usage)
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 (a7b5458ce73b m68k: Fix WARNING splat in pmac_zilog driver)
Merging m68knommu/for-next (3237f7dedb6d m68k: m68328: remove duplicate code)
Merging microblaze/next (ed2124c0b9a8 microblaze: add support for TIF_NOTIFY_SIGNAL)
Merging mips/mips-next (1dac4585f585 MIPS: Loongson64: Fix up reserving kernel memory range)
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 (d8398bf840f8 openrisc: add local64.h to fix blk-iocost build)
Merging parisc-hd/for-next (19621e5fd02b 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 (0bd4b96d9910 powernv/memtrace: don't abuse memory hot(un)plug infrastructure for memory allocations)
Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
Merging soc-fsl/next (e95f287deed2 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A)
Merging risc-v/for-next (b5b11a8ac4b5 RISC-V: Move dynamic relocation section under __init)
Merging s390/for-next (629a4d2c38ad Merge branch 'features' into for-next)
CONFLICT (content): Merge conflict in arch/s390/include/asm/mmu_context.h
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 (9a5085b3fad5 um: Call pgtable_pmd_page_dtor() in __pmd_free_tlb())
Merging xtensa/xtensa-for-next (dc293f210690 xtensa: uaccess: Add missing __user to strncpy_from_user() prototype)
Merging fscrypt/master (4a4b8721f1a5 fscrypt: simplify master key locking)
Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly)
Merging btrfs/for-next (30da94ea78c2 Merge branch 'for-next-next-v5.10-20201127' into for-next-20201127)
Merging ceph/master (62575e270f66 ceph: check session state after bumping session->s_seq)
Merging cifs/for-next (212253367dc7 cifs: fix potential use-after-free in cifs_echo_request())
Merging configfs/for-next (65cdb4a214c0 configfs: fix kernel-doc markup issue)
Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
Merging erofs/dev (1b2b66d55670 erofs: remove a void EROFS_VERSION macro set in Makefile)
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 (d2bc88b6e0fd Pull reiserfs disk corruption handling fix.)
Merging ext4/dev (f902b2165010 ext4: fix bogus warning in ext4_update_dx_flag())
Merging f2fs/dev (632cc618fa14 f2fs: Handle casefolding with Encryption)
Merging fsverity/fsverity (bde493349025 fs-verity: move structs needed for file signing to UAPI header)
Merging fuse/for-next (9d769e6aa252 fuse: support SB_NOSEC flag to improve write performance)
Merging jfs/jfs-next (c61b3e483900 jfs: Fix array index bounds check in dbAdjTree)
Merging nfs/linux-next (b5aadf7e79b2 NFSv4: Fix a pNFS layout related use-after-free race when freeing the inode)
Merging nfs-anna/linux-next (11decaf8127b NFS: Remove unnecessary inode lock in nfs_fsync_dir())
Merging nfsd/nfsd-next (c3213d260a23 SUNRPC: Fix oops in the rpc_xdr_buf event class)
Merging cel/cel-next (a4f1e6982408 nfsd: Set PF_LOCAL_THROTTLE on local filesystems only)
Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret)
Merging overlayfs/overlayfs-next (c11faf32599f ovl: fix incorrect extent info in metacopy case)
Merging ubifs/next (e2a05cc7f822 ubifs: mount_ubifs: Release authentication resource in error handling path)
Merging v9fs/9p-next (5bfe97d7382b 9p: Fix writeback fid incorrectly being attached to dentry)
Merging xfs/for-next (eb8409071a1d xfs: revert "xfs: fix rmap key and record comparison functions")
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 (9b8523423b23 vfs: move __sb_{start,end}_write* to fs.h)
Merging file-locks/locks-next (8d1ddb5e7937 fcntl: Fix potential deadlock in send_sig{io, urg}())
Merging vfs/for-next (61c207915a76 Merge branches 'work.sparc', 'work.epoll', 'work.sparc32' and 'regset.followup' into for-next)
Merging printk/for-next (eb4e76080fcf Merge branch 'for-5.10-pr_cont-fixup' into for-next)
Merging pci/next (46f821a9cff2 Merge branch 'remotes/lorenzo/pci/misc')
Merging pstore/for-next/pstore (3cea11cd5e3b Linux 5.10-rc2)
Merging hid/for-next (cdaa1e42b483 Merge branch 'for-5.10/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (c97e7615c15b Merge branch 'i2c/for-current' into i2c/for-next)
Merging i3c/i3c/next (015cbe1f0506 i3c: Resign from my maintainer role)
Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved)
Merging hwmon-staging/hwmon-next (cf9c31cd71fa hwmon: (applesmc) Add DMI product matches for Intel-based Xserves (non-RackMac*))
Merging jc_docs/docs-next (fb568273c055 docs: automarkup.py: Allow automatic cross-reference inside C namespace)
Merging v4l-dvb/master (a3f132df0e5f media: bttv: use generic power management)
CONFLICT (content): Merge conflict in drivers/media/platform/marvell-ccic/mmp-driver.c
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 (735f7fba25ec Merge branch 'pm-acpi' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (32c855670808 cpufreq: vexpress-spc: Add missing MODULE_ALIAS)
Merging cpupower/cpupower (748f0d70087c cpupower: Provide online and offline CPU information)
Merging devfreq/devfreq-next (98fd9972ed60 PM / devfreq: tegra20: Deprecate in a favor of emc-stat based driver)
Merging opp/opp/linux-next (ed40e33c0b91 opp: Reduce the size of critical section in _opp_kref_release())
Merging thermal/thermal/linux-next (1b57b9597c77 thermal: rcar_gen3_thermal: Do not use interrupts for normal operation)
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 (4f19d071f9be fs: dlm: check on existing node address)
Merging swiotlb/linux-next (fc0021aa340a swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single)
Merging rdma/for-next (dd37d2f59eb8 RDMA/cma: Fix deadlock on &lock in rdma_cma_listen_on_all() error unwind)
CONFLICT (content): Merge conflict in include/linux/dma-mapping.h
Merging net-next/master (be5724240b39 Merge branch 'dpaa_eth-add-xdp-support')
CONFLICT (content): Merge conflict in drivers/net/ethernet/ibm/ibmvnic.c
Merging bpf-next/for-next (df5422851559 Merge branch 'xdp-preferred-busy-polling')
Merging ipsec-next/master (c7a5899eb26e xfrm: redact SA secret with lockdown confidentiality)
Merging mlx5-next/mlx5-next (617b860c1875 net/mlx5: Treat host PF vport as other (non eswitch manager) vport)
Merging netfilter-next/master (988187e88103 ipvs: replace atomic_add_return())
Merging ipvs-next/master (988187e88103 ipvs: replace atomic_add_return())
Merging wireless-drivers-next/master (7ec8a926188e cw1200: fix missing destroy_workqueue() on error in cw1200_init_common)
Merging bluetooth/master (7c6601813962 Bluetooth: Fix attempting to set RPA timeout when unsupported)
Merging mac80211-next/master (0064c5c1b3bf net: xfrm: use core API for updating/providing stats)
Merging gfs2/for-next (28c332b941a7 gfs2: remove trailing semicolons from macro definitions)
Merging mtd/mtd/next (22ca56a34b32 mtd: devices: powernv_flash: Add function names to headers and fix 'dev')
Merging nand/nand/next (e42a6fc7c543 mtd: rawnand: gpmi: fix reference count leak in gpmi ops)
Merging spi-nor/spi-nor/next (ad624dfd7bb6 mtd: spi-nor: micron-st: allow using MT35XU512ABA in Octal DTR mode)
Merging crypto/master (05c2a705917b crypto: ccree - rework cache parameters handling)
Merging drm/drm-next (22f8c80566c4 Merge tag 'drm-misc-next-2020-11-18' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_bo.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/ast/ast_mode.c
Merging amdgpu/drm-next (7ff818f97c30 drm/amdgpu: Enable GPU reset for vangogh)
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Merging drm-intel/for-linux-next (5cc2b61fb251 drm/i915/display: Suppress "Combo PHY A HW state changed unexpectedly")
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/gvt.h
Merging drm-tegra/drm/tegra/for-next (bf3a3cdcad40 drm/tegra: sor: Disable clocks on error in tegra_sor_init())
Merging drm-misc/for-linux-next (025ae8255d33 video: fbdev: nvidia: Fix set but not used warnings)
Merging drm-msm/msm-next (ff8b941a39d1 drm/msm/disp/dpu1/dpu_encoder: Remove a bunch of unused variables)
CONFLICT (content): Merge conflict in include/drm/drm_crtc.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
Applying: drm/msm/gem: fix up for "drm/msm: Introduce GEM object funcs"
Merging imx-drm/imx-drm/next (099e5bde9bd2 drm/imx: depend on COMMON_CLK to fix compile tests)
Merging etnaviv/etnaviv/next (4612bad5701e drm/etnaviv: Add lockdep annotations for context lock)
Merging regmap/for-next (4616c509d187 Merge remote-tracking branch 'regmap/for-5.11' into regmap-next)
Merging sound/for-next (2c854e5c63ac ALSA: usb-audio: Add quirk for Pioneer DJ DDJ-SR2)
Merging sound-asoc/for-next (660429d0714e Merge remote-tracking branch 'asoc/for-5.11' into asoc-next)
Merging modules/modules-next (2aec389e1915 params: clean up module-param macros)
Merging input/next (f7bda6662fd4 Input: libps2 - fix fall-through warnings for Clang)
Merging block/for-next (6d5c4f0d3e85 Merge branch 'for-5.11/drivers' into for-next)
Merging device-mapper/for-next (3f5dba110d12 dm writecache: remove BUG() and fail gracefully instead)
Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static)
Merging mmc/next (8223e885e74b mmc: mxc: Convert the driver to DT-only)
Merging mfd/for-mfd-next (14639a22de65 mfd: cpcap: Fix interrupt regression with regmap clear_ack)
Merging backlight/for-backlight-next (789eb04b6c56 backlight: pwm_bl: Fix interpolation)
Merging battery/for-next (faa2cec66798 power: supply: wm831x_power: remove unneeded break)
Merging regulator/for-next (14415bb80aa0 Merge remote-tracking branch 'regulator/for-5.11' into regulator-next)
Merging security/next-testing (3650b228f83a Linux 5.10-rc1)
Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable)
Merging integrity/next-integrity (207cdd565dfc ima: Don't modify file descriptor mode on the fly)
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 (3df98d79215a lsm,selinux: pass flowi_common instead of flowi to the LSM hooks)
Merging smack/next (9b0072e2b2b5 security/smack: remove unused varible 'rc')
Merging tomoyo/master (1b6b924efeb9 tomoyo: Fix null pointer check)
Merging tpmdd/next (1ce46c91fdfe tpm: Fix fall-through warnings for Clang)
Merging watchdog/master (3650b228f83a Linux 5.10-rc1)
Merging iommu/next (4dd6ce478003 iommu: Fix a check in iommu_check_bind_data())
Merging audit/next (ba59eae72385 audit: fix macros warnings)
Merging devicetree/for-next (d7a3fd7f00ee dt-bindings: fsl-imx-drm: fix example compatible string)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/Makefile
Merging mailbox/mailbox-for-next (c7dacf5b0f32 mailbox: avoid timer start from callback)
Merging spi/for-next (05178a6ded2c Merge remote-tracking branch 'spi/for-5.11' into spi-next)
Merging tip/auto-latest (c1c38fd953ac Merge branch 'core/entry')
CONFLICT (content): Merge conflict in tools/power/cpupower/utils/helpers/misc.c
CONFLICT (content): Merge conflict in arch/x86/pci/i386.c
Merging clockevents/timers/drivers/next (e588acdb8087 clocksource/drivers/riscv: Make RISCV_TIMER depends on RISCV_SBI)
Merging edac/edac-for-next (8763e5cbb958 Merge remote-tracking branch 'ras/edac-spr' into edac-for-next)
Merging irqchip/irq/irqchip-next (74cde1a53368 irqchip/gic-v3-its: Unconditionally save/restore the ITS state on suspend)
Merging ftrace/for-next (b111545d26c0 tracing: Remove the useless value assignment in test_create_synth_event())
Merging rcu/rcu/next (0c61524f0b02 tools/memory-model: Fix typo in klitmus7 compatibility table)
Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup)
Merging kvm-arm/next (90f0e16c649a Merge branch 'kvm-arm64/misc-5.11' into kvmarm-master/next)
Merging kvm-ppc/kvm-ppc-next (cf59eb13e151 KVM: PPC: Book3S: Fix symbol undeclared warnings)
Merging kvms390/next (d121365715a0 s390/gmap: make gmap memcg aware)
Merging xen-tip/linux-next (65cae18882f9 x86/xen: don't unbind uninitialized lock_kicker_irq)
Merging percpu/for-next (eb4c8d15efda Merge branch 'for-5.11' into for-next)
Merging workqueues/for-next (ac87f8ff6cf1 workqueue: Kick a worker based on the actual activation of delayed works)
Merging drivers-x86/for-next (912b341585e3 platform/x86: mlx-platform: Remove PSU EEPROM from MSN274x platform configuration)
Merging chrome-platform/for-next (de0f49487db3 platform/chrome: cros_ec_typec: Register partner altmodes)
Merging hsi/for-next (41fff6e19bc8 HSI: omap_ssi: Don't jump to free ID in ssi_add_controller())
Merging leds/for-next (98650b087417 leds: turris-omnia: check for LED_COLOR_ID_RGB instead LED_COLOR_ID_MULTI)
Merging ipmi/for-next (368ffd9adc7a ipmi: msghandler: Suppress suspicious RCU usage warning)
Merging driver-core/driver-core-next (33c0c9bdf7a5 drivers: base: fix some kernel-doc markups)
Merging usb/usb-next (ebad43260d22 Merge 5.10-rc6 into usb-next)
Merging usb-gadget/next (b2c586eb07ef usb: dwc2: Fix INTR OUT transfers in DDMA mode.)
Merging usb-serial/usb-next (053af9e6e817 USB: serial: mos7720: defer state restore to a workqueue)
Merging usb-chipidea-next/for-usb-next (d75fcc0d4da2 usb: chipidea: ci_hdrc_imx: Use of_device_get_match_data())
Merging phy-next/next (d7bb92e3c908 phy: mediatek: Make PHY_MTK_{XSPHY, TPHY} depend on HAS_IOMEM and OF_ADDRESS to fix build errors)
CONFLICT (content): Merge conflict in drivers/phy/samsung/phy-exynos-pcie.c
CONFLICT (content): Merge conflict in MAINTAINERS
Applying: Revert "phy: ralink: Add PHY driver for MT7621 PCIe PHY"
Merging tty/tty-next (f35a07f92616 tty: serial: bcm63xx: lower driver dependencies)
Merging char-misc/char-misc-next (3473065927a8 Merge 5.10-rc6 into char-misc-next)
Merging extcon/extcon-next (54589b557a8d extcon: fsa9480: Support TI TSU6111 variant)
Merging soundwire/next (47edc0104c61 soundwire: qcom: Fix build failure when slimbus is module)
Merging thunderbolt/next (db0746e3399e thunderbolt: Add support for Intel Maple Ridge)
Merging vfio/next (2e6cfd496f5b vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages)
Merging staging/staging-next (1de16e38f1fd staging: mt7621-pci: remove 'RALINK_PCI_IMBASEBAR0_ADDR' register)
Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr)
Merging icc/icc-next (abb888d86f62 Merge branch 'icc-5.11' into HEAD)
Merging dmaengine/next (5d051f37f49d dmaengine: ti: drop of_match_ptr and mark of_device_id table as maybe unused)
CONFLICT (content): Merge conflict in drivers/dma/idxd/submit.c
CONFLICT (content): Merge conflict in drivers/dma/idxd/registers.h
CONFLICT (content): Merge conflict in drivers/dma/idxd/device.c
Merging cgroup/for-next (5a7b5f32c5aa cgroup/cgroup.c: replace 'of->kn->priv' with of_cft())
Merging scsi/for-next (f9123bc98a4f Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (b75ef77e652f scsi: target: core: Fix fall-through warnings for Clang)
Merging vhost/linux-next (502cb1133adb vhost_vdpa: switch to vmemdup_user())
Merging rpmsg/for-next (ca08b94fd559 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (6c33287665e0 pinctrl: pinctrl-microchip-sgpio: Add pinctrl driver for Microsemi Serial GPIO)
Merging gpio-brgl/gpio/for-next (2ae136a34fce gpio: omap: handle deferred probe with dev_err_probe() for gpiochip_add_data())
Merging gpio-intel/for-next (e709a7b5a066 gpiolib: acpi: Make Intel GPIO tree official for GPIO ACPI work)
Merging pinctrl/for-next (8e5008b1a9a0 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (0b74e40a4e41 pinctrl: baytrail: Avoid clearing debounce value when turning it off)
Merging pinctrl-samsung/for-next (c5564a50d990 pinctrl: samsung: s3c24xx: remove unneeded break)
Merging pwm/for-next (228fe8e4deb2 pwm: keembay: Fix build failure with -Os)
Merging userns/for-next (5e46d6af38a3 Merge of signal-for-v5.11, and exec-for-v5.11 for testing in linux-next)
CONFLICT (content): Merge conflict in kernel/bpf/task_iter.c
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 (c2e46f6b3e35 selftests/cgroup: Fix build on older distros)
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 (daaf30b01ed0 coresight: tmc-etr: Fix barrier packet insertion for perf buffer)
Merging rtc/rtc-next (673536cc5f21 rtc: pcf8523: use BIT)
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 (7ef95e3dbcee Merge branch 'for-linus/seccomp' into for-next/seccomp)
CONFLICT (content): Merge conflict in arch/csky/include/asm/Kbuild
Merging kspp/for-next/kspp (f2f20a989227 orphans: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1)
Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2)
Merging fsi/next (4a851d714ead fsi: aspeed: Support CFAM reset GPIO)
Merging slimbus/for-next (567d838588d8 slimbus: qcom-ngd-ctrl: remove redundant out of memory messages)
Merging nvmem/for-next (292b72c982a6 nvmem: imx-ocotp: add support for the unaliged word count)
Merging xarray/main (80c1dbebf308 XArray: Fix splitting to non-zero orders)
Merging hyperv/hyperv-next (206ad34d52a2 hv_netvsc: Validate number of allocated sub-channels)
Merging auxdisplay/auxdisplay (351dcacc6d77 auxdisplay: panel: Remove redundant charlcd_ops structures)
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 (aaf8fe39c952 Revert "fpga: dfl: fix the definitions of type & feature_id for dfl devices")
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 (f3ed003e64fe kunit: Introduce get_file_path() helper)
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 (10ea8bcda5ae bus: mhi: core: Fix device hierarchy)
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 (5bdba520c1b3 mm: memblock: drop __init from memblock functions to make it inline)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging counters/counters (3650b228f83a Linux 5.10-rc1)
Applying: fix for "xsk: Propagate napi_id to XDP socket Rx path"
Merging akpm-current/current (ab573a2b40b2 lib/lzo/lzo1x_compress.c: make lzogeneric1x_1_compress() static)
CONFLICT (content): Merge conflict in mm/highmem.c
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in include/linux/mm.h
CONFLICT (content): Merge conflict in include/linux/kernel.h
CONFLICT (content): Merge conflict in arch/riscv/Kconfig
CONFLICT (content): Merge conflict in arch/arc/Kconfig
CONFLICT (content): Merge conflict in arch/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (c21a90dc9792 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 Dec 1
@ 2017-12-01  2:53 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2017-12-01  2:53 UTC (permalink / raw)
  To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List

Hi all,

Changes since 20171130:

Dropped tree:	vfs (badly conflicting commit)

The vfs tree still had bad conflicts against Linus' tree so I dropped
it again for today.

The etnaviv tree still had its build failure, so I used the version from
next-20171127.

The akpm-current tree lost its build failure.

Non-merge commits (relative to Linus' tree): 1673
 2026 files changed, 43136 insertions(+), 24818 deletions(-)

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

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

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

Below is a summary of the state of the merge.

I am currently merging 251 trees (counting Linus' and 40 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 (9e0600f5cf6c Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
Merging kbuild-current/fixes (4fbd8d194f06 Linux 4.15-rc1)
Merging arc-current/for-curr (329b4130bc5e ARC: Fix detection of dual-issue enabled)
Merging arm-current/fixes (3aaf33bebda8 ARM: avoid faulting on qemu)
Merging m68k-current/for-linus (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (7e4d4233260b powerpc: Do not assign thread.tidr if already assigned)
Merging sparc/master (a0908a1b7d68 Merge branch 'akpm' (patches from Andrew))
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (6fef90c6b3f6 net: dsa: bcm_sf2: Set correct CHAIN_ID and slice number mask)
Merging bpf/master (2b2794195671 tools/bpf: adjust rlimit RLIMIT_MEMLOCK for test_verifier_log)
Merging ipsec/master (6a53b7593233 xfrm: check id proto in validate_tmpl())
Merging netfilter/master (8b1836c4b643 netfilter: conntrack: clamp timeouts to INT_MAX)
Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set)
Merging wireless-drivers/master (f859b4af1c52 sit: update frag_off info)
Merging mac80211/master (72e2c3438ba3 mac80211: tear down RX aggregations first)
Merging sound-current/for-linus (43a354287032 ALSA: seq: Remove spurious WARN_ON() at timer check)
Merging pci-current/for-linus (4fbd8d194f06 Linux 4.15-rc1)
Merging driver-core.current/driver-core-linus (0946b2fb38fd firmware: cleanup FIRMWARE_IN_KERNEL message)
Merging tty.current/tty-linus (c8ec2041f549 MIPS: Add custom serial.h with BASE_BAUD override for generic kernel)
Merging usb.current/usb-linus (1ac7c8a78be8 usbip: fix usbip attach to find a port that matches the requested speed)
Merging usb-gadget-fixes/fixes (a3acc696085e usb: f_fs: Force Reserved1=1 in OS_DESC_EXT_COMPAT)
Merging usb-serial-fixes/usb-linus (762ff4678e89 USB: serial: usb_debug: add new USB device id)
Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show)
Merging phy/fixes (4fbd8d194f06 Linux 4.15-rc1)
Merging staging.current/staging-linus (0590cdfead8c staging: octeon-usb: use __delay() instead of cvmx_wait())
Merging char-misc.current/char-misc-linus (0631fb8b027f firmware: vpd: Fix platform driver and device registration/unregistration)
Merging input-current/for-linus (4c83c071b784 Input: elants_i2c - do not clobber interrupt trigger on x86)
Merging crypto-current/master (ecaaab564978 crypto: salsa20 - fix blkcipher_walk API usage)
Merging ide/master (0c86a6bd85ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging vfio-fixes/for-linus (e41dd1556d4d Merge branch 'iommu-fixes/vt-d' into for-linus)
Merging kselftest-fixes/fixes (a323335e62cc selftests: lib.mk: print individual test results to console by default)
Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks)
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
Merging spi-nor-fixes/spi-nor/fixes (1085b2c2461c mtd: spi-nor: add support for ISSI is25lp128)
Merging mfd-fixes/for-mfd-fixes (001dde9400d5 mfd: cros ec: spi: Fix "in progress" error signaling)
Merging v4l-dvb-fixes/fixes (781b045baefd media: imx274: Fix error handling, add MAINTAINERS entry)
Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation)
Merging mips-fixes/mips-fixes (b084116f8587 MIPS: AR7: Ensure that serial ports are properly set up)
Merging kvm-fixes/master (a63dd7480d8f Merge tag 'kvm-ppc-fixes-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-master)
Merging drm-intel-fixes/for-linux-next-fixes (fd50fbb6bfde drm/i915: Disable THP until we have a GPU read BW W/A)
Merging drm-misc-fixes/for-linux-next-fixes (4dbd6c03fbf8 drm/bridge: tc358767: fix 1-lane behavior)
Merging kbuild/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
Merging dma-mapping/for-next (c9eb6172c328 dma-mapping: turn dma_cache_sync into a dma_map_ops method)
Merging asm-generic/master (a351e9b9fc24 Linux 4.11)
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging arm/for-next (383f07dc0a84 Merge branches 'fixes', 'misc' and 'sa1111' into for-next)
Merging arm-perf/for-next/perf (07141342149a arm64: MAINTAINERS: hisi: Add HiSilicon SoC PMU support)
Merging arm-soc/for-next (cf9b0772f2e4 Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging actions/for-next (a15f031b7361 Merge branch 'v4.16/drivers' into next)
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (1142a3a457d0 meson-gx-socinfo: Fix package id parsing)
Merging aspeed/for-next (9c9ae757dc8b Merge branch 'dt-for-v4.15' into for-next)
Merging at91/at91-next (bee152d6af7d Merge branch 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (e83e7335d059 Merge branch anholt/bcm2835-defconfig-next into for-next)
Merging imx-mxs/for-next (3d48b83d1ab5 Merge branch 'imx/dt64' into for-next)
Merging keystone/next (8270bfa5860d Merge branch 'for_4.15/keystone-soc' into next)
Merging mvebu/for-next (c6c5ff72be36 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (612c2ca32cf5 Merge branch 'omap-for-v4.15/fixes-v2' into for-next)
Merging reset/reset/next (0e5721f76252 reset: meson-axg: add compatible string for Meson-AXG SoC)
Merging qcom/for-next (e7048ed58ed9 Merge tag 'qcom-drivers-for-4.15-2' into final-for-4.15)
Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next)
Merging renesas/next (810e62c61fb2 Merge branch 'arm64-dt-for-v4.16' into next)
Merging rockchip/for-next (308c3c77ccb3 Merge branch 'v4.15-armsoc/dts64' into for-next)
Merging samsung/for-next (bebc6082da0a Linux 4.14)
Merging samsung-krzk/for-next (a126f0ad6b75 Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (df7cacd062cd Merge branches 'sunxi/dt-for-4.16', 'sunxi/dt64-for-4.16' and 'sunxi/fixes-for-4.15' into sunxi/for-next)
Merging tegra/for-next (ec0c973f47c7 Merge branch for-4.15/reset into for-next)
Merging arm64/for-next/core (6cfa7cc46b1a arm64: Make ARMV8_DEPRECATED depend on SYSCTL)
Merging clk/clk-next (4fbd8d194f06 Linux 4.15-rc1)
Merging clk-samsung/for-next (bebc6082da0a Linux 4.14)
Merging c6x/for-linux-next (62016565bb04 c6x: remove unused KTHREAD_SIZE definition)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging m68k/for-next (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7)
Merging m68knommu/for-next (c8b61d508986 m68k: add Sysam stmark2 open board support)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
Merging microblaze/next (da25f490a0b3 microblaze: add missing include to mmu_context_mm.h)
Merging mips/mips-next (e0c5f36b2a63 MIPS: Add iomem resource for kernel bss section.)
Merging nios2/for-next (65d1e3ddeae1 nios2: time: Read timer in get_cycles only if initialized)
Merging openrisc/for-next (610f01b9a88a openrisc: fix possible deadlock scenario during timer sync)
Merging parisc-hd/for-next (bebc6082da0a Linux 4.14)
Merging powerpc/next (5b0e2cb02008 Merge tag 'powerpc-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
Merging fsl/next (a4e89ffb5923 powerpc/e6500: Update machine check for L1D cache err)
Merging risc-v/for-linux-next (f0b0655e9936 Merge tag 'v4.14-rc8' into for-linux-next)
Merging s390/features (345f8f34bb47 s390: revert ELF_ET_DYN_BASE base changes)
Merging sparc-next/master (1deab8ce2c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
Merging tile/master (777a45b45866 arch/tile: Implement ->set_state_oneshot_stopped())
Merging uml/linux-next (02eb0b11eab5 um: Add missing EXPORT for free_irq_by_fd())
Merging xtensa/xtensa-for-next (271335b9726e Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (a0b3bc855374 fscrypt: lock mutex before checking for bounce page pool)
Merging befs/for-next (5771a8c08880 Linux v4.13-rc1)
Merging btrfs/next (5226fcac7841 squashfs: Add zstd support)
Merging btrfs-kdave/for-next (930a0ad9223a Merge branch 'for-next-next-v4.15-20171130' into for-next-20171130)
CONFLICT (content): Merge conflict in fs/btrfs/super.c
Merging ceph/master (3cfa3b16dd2f rbd: default to single-major device number scheme)
Merging cifs/for-next (d13ecaa98be7 cifs: avoid a kmalloc in smb2_send_recv/SendReceive2 for the common case)
Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const)
Merging ecryptfs/next (4670269faba7 eCryptfs: constify attribute_group structures.)
Merging ext3/for_next (88bc0ede8d35 quota: Check for register_shrinker() failure.)
Merging ext4/dev (232530680290 ext4: improve smp scalability for inode generation)
Merging f2fs/dev (4fbd8d194f06 Linux 4.15-rc1)
Merging fuse/for-next (c6cdd51404b7 fuse: fix READDIRPLUS skipping an entry)
Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location)
Merging nfs/linux-next (4fbd8d194f06 Linux 4.15-rc1)
Merging nfsd/nfsd-next (a14fbdff76ba lockd: convert nlm_rqst.a_count from atomic_t to refcount_t)
Merging orangefs/for-next (db0267e7afc7 orangefs: call op_release sooner when creating inodes)
Merging overlayfs/overlayfs-next (d9768076068f ovl: remove unneeded arg from ovl_verify_origin())
Merging ubifs/linux-next (15e5178339b9 ubi: fastmap: Clean up the initialization of pointer p)
Merging xfs/for-next (373b0589dc8d xfs: Properly retry failed dquot items in case of error during buffer writeback)
Merging file-locks/locks-next (1deab8ce2c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging vfs/for-next (7d8c430e7e22 Merge branch 'work.mount' into for-next)
CONFLICT (content): Merge conflict in fs/overlayfs/super.c
CONFLICT (content): Merge conflict in fs/nfs/internal.h
CONFLICT (content): Merge conflict in fs/jffs2/super.c
CONFLICT (content): Merge conflict in fs/f2fs/super.c
CONFLICT (content): Merge conflict in fs/f2fs/checkpoint.c
CONFLICT (content): Merge conflict in fs/ext2/super.c
CONFLICT (content): Merge conflict in fs/cifs/cifsglob.h
CONFLICT (content): Merge conflict in fs/btrfs/super.c
CONFLICT (content): Merge conflict in fs/afs/super.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/via/via-rhine.c
$ git reset --hard HEAD
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (9afe77ed849d added new line symbol after warning about dropped messages)
Merging pci/next (625955ba7f2c Merge branch 'pci/virtualization' into next)
Merging pstore/for-next/pstore (a99f41a1b441 fs: pstore: remove unused hardirq.h)
Merging hid/for-next (6c08525dc1af Merge branch 'for-4.16/elo' into for-next)
Merging i2c/i2c/for-next (41493dd4c8b6 Merge branch 'i2c/for-4.16' into i2c/for-next)
Merging dmi/master (0bcea5c474d1 firmware: dmi: handle missing DMI data gracefully)
Merging hwmon-staging/hwmon-next (113dd7553780 hwmon: (max31785) Add OF device ID table)
Merging jc_docs/docs-next (3a025e1d1c2e Add optional check for bad kernel-doc comments)
Merging v4l-dvb/master (781b045baefd media: imx274: Fix error handling, add MAINTAINERS entry)
Merging v4l-dvb-next/master (db6321a1af84 media: platform: VIDEO_QCOM_CAMSS should depend on HAS_DMA)
Merging fbdev/fbdev-for-next (5f215d252496 OMAPFB: prevent buffer underflow in omapfb_parse_vram_param())
Merging pm/linux-next (d94f8ef6efe1 Merge branch 'acpi-pm' into linux-next)
Merging cpupower/cpupower (dbdc468f35ee cpupower : Fix cpupower working when cpu0 is offline)
Merging idle/next (8a5776a5f498 Linux 4.14-rc4)
Merging opp/opp/linux-next (4fbd8d194f06 Linux 4.15-rc1)
Merging thermal/next (1e032393d968 Merge branches 'thermal-core', 'thermal-tool', 'thermal-intel' and 'thermal-soc' into next)
Merging thermal-soc/next (b2fd708ffa7f thermal: cpu_cooling: pr_err() strings should end with newlines)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (201c78e05c5a Merge branch 'macb-rx-packet-filtering')
Merging bpf-next/master (51de082570e5 samples/bpf: Convert magic numbers to names in multi-prog cgroup test case)
Merging ipsec-next/master (b9151761021e Merge tag 'nfsd-4.15-1' of git://linux-nfs.org/~bfields/linux)
Merging netfilter-next/master (c5c44aa5791e netfilter: conntrack: timeouts can be const)
Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support)
Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.)
Merging wireless-drivers-next/master (0fc66ddfaf8b Documentation: net: dsa: Cut set_addr() documentation)
Merging bluetooth/master (da3768401021 Bluetooth: hci_bcm: Add support for BCM2E72)
Merging mac80211-next/master (5048a9c329af mac80211: make __ieee80211_start_rx_ba_session static)
CONFLICT (content): Merge conflict in net/mac80211/agg-tx.c
CONFLICT (content): Merge conflict in net/mac80211/agg-rx.c
Merging rdma/for-next (4190b4e96954 RDMA/core: Rename kernel modify_cq to better describe its usage)
Merging gfs2/for-next (9aa015932727 gfs2: Remove unused gfs2_write_jdata_pagevec parameter)
Merging mtd/master (36de80740008 mtd: nand: atmel: fix buffer overflow in atmel_pmecc_user)
Merging l2-mtd/master (1530578abdac mtd: Avoid probe failures when mtd->dbg.dfs_dir is invalid)
Merging nand/nand/next (8a8c8ba1c8a6 mtd: nand: denali: rename misleading dma_buf to tmp_buf)
Merging spi-nor/spi-nor/next (4fbd8d194f06 Linux 4.15-rc1)
Merging crypto/master (45223b78118c crypto: arm64/aes - do not call crypto_unregister_skcipher twice on error)
Merging drm/drm-next (c209101fc1c9 Merge tag 'drm-misc-fixes-2017-11-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
Merging drm-amd-dc/drm-next-amd-dc-staging (49e37ba07a3a Merge branch 'drm-next-4.15-dc' of git://people.freedesktop.org/~agd5f/linux into drm-next)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (3572f04c69ed drm/i915: Fix init_clock_gating for resume)
Merging drm-tegra/drm/tegra/for-next (e1335e2f0cfc drm/tegra: sor: Reimplement pad clock)
Merging drm-misc/for-linux-next (c209101fc1c9 Merge tag 'drm-misc-fixes-2017-11-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
Merging drm-msm/msm-next (ad9d50c79043 drm/msm: free kstrdup'd cmdline)
Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.)
Merging mali-dp/for-upstream/mali-dp (54243016ae35 drm: mali-dp: Disable planes when their CRTC gets disabled.)
Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next)
Merging imx-drm/imx-drm/next (d66611856832 drm/imx: advertise supported plane format modifiers)
Merging etnaviv/etnaviv/next (ec4abe26f8e3 drm/etnaviv: Improve unlocking of a mutex in etnaviv_iommu_map_gem())
$ git reset --hard HEAD^
Merging next-20171127 version of etnaviv
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
Merging regmap/for-next (a1a68fcaf165 regmap: Remove the redundant config to select hwspinlock)
Merging sound/for-next (108884e6c5aa ALSA: usb-audio: Change the semantics of the enable option)
Merging sound-asoc/for-next (8c49cd81d9fd Merge remote-tracking branches 'asoc/topic/uda1380', 'asoc/topic/utils', 'asoc/topic/wm0010', 'asoc/topic/wm2000' and 'asoc/topic/wm8903' into asoc-next)
Merging modules/modules-next (ece1996a21ee module: Do not paper over type mismatches in module_param_call())
Merging input/next (c1b433e04ef9 Input: gamecon - mark expected switch fall-throughs)
Merging block/for-next (50da70ed9c48 Merge branch 'for-4.15/block' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (a453c57c2278 dm table: fix regression from improper dm_dev_internal.count refcount_t conversion)
Merging mmc/next (850e518b8d2b mmc_test: use ktime_get_ts64 for timestamps)
Merging md/for-next (0868b99c214a md: free unused memory after bitmap resize)
Merging mfd/for-mfd-next (deed10c2d603 mfd: pm8xxx: Make elegible for COMPILE_TEST)
Merging backlight/for-backlight-next (29fae2c1db24 backlight: ili922x: Remove redundant variable len)
Merging battery/for-next (838c8afa67f9 power: supply: cpcap-charger: fix incorrect return value check)
Merging regulator/for-next (f933da1cc85c Merge remote-tracking branches 'regulator/topic/doc' and 'regulator/topic/tps65218' into regulator-next)
Merging security/next-testing (4c6082336a74 Merge tag 'seccomp-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next-testing)
Merging integrity/next (e87dafe70acc ima: Remove redundant conditional operator)
CONFLICT (content): Merge conflict in Documentation/ABI/testing/evm
Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting)
Merging selinux/next (4f0753e708c2 security: replace FSF address with web source in license notices)
Merging tpmdd/next (f8b73d394f91 tpm: parse TPM event logs based on EFI table)
CONFLICT (content): Merge conflict in include/linux/tpm_eventlog.h
Merging watchdog/master (14807b07a7d8 watchdog: pcwd_usb: remove unneeded DRIVER_LICENSE #define)
CONFLICT (content): Merge conflict in drivers/watchdog/mpc8xxx_wdt.c
Merging iommu/next (a593472591a5 Merge branches 'iommu/fixes', 'arm/omap', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (d04222983379 Merge branches 'iommu/arm/smmu', 'iommu/updates', 'vfio/fixes', 'vfio/platform', 'iommu/vt-d', 'iommu/ipmmu-vmsa' and 'iommu/iova' into next)
Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig)
Merging audit/next (42d5e37654e4 audit: filter PATH records keyed on filesystem magic)
Merging devicetree/for-next (54192011468d of: overlay: Remove else after goto)
Merging mailbox/mailbox-for-next (1f90a2162fb3 mailbox/omap: unregister mbox class)
Merging spi/for-next (3924e5143344 Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/imx', 'spi/topic/meson', 'spi/topic/sh-msiof' and 'spi/topic/xilinx' into spi-next)
Merging tip/auto-latest (0df8a88e651b Merge branch 'WIP.x86/mm')
Merging clockevents/clockevents/next (8a7507eea818 clocksource/drivers/mips-gic-timer: Add fastpath for local timer updates)
CONFLICT (content): Merge conflict in drivers/clocksource/mips-gic-timer.c
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (86a18ee21e5e EDAC, ti: Add support for TI keystone and DRA7xx EDAC)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (a96a5037ed0f tracing, thermal: Hide cpu cooling trace events when not in use)
Merging rcu/rcu/next (844d60c937d9 rcu: Remove unnecessary spinlock in rcu_boot_init_percpu_data())
Merging kvm/linux-next (4fbd8d194f06 Linux 4.15-rc1)
Merging kvm-arm/next (4fbd8d194f06 Linux 4.15-rc1)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (432953b4455d KVM: PPC: Book3S HV: Cosmetic post-merge cleanups)
Merging kvms390/next (da9a1446d248 KVM: s390: provide a capability for AIS state migration)
Merging xen-tip/linux-next (646d944c2ef5 xen/pvcalls: fix potential endless loop in pvcalls-front.c)
Merging percpu/for-next (abee210500ed percpu: hack to let the CRIS architecture to boot until they clean up)
Merging workqueues/for-next (c98a98050964 workqueue: respect isolated cpus when queueing an unbound work)
Merging drivers-x86/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging chrome-platform/for-next (859eb05676f6 platform/chrome: Use proper protocol transfer function)
Merging hsi/for-next (8635d6b3afe6 dt-bindings: hsi: add omap4 hsi controller bindings)
Merging leds/for-next (6650fea34004 leds: pwm: Remove unneeded header file)
Merging ipmi/for-next (942e1563654c ipmi: Stop timers before cleaning up the module)
CONFLICT (content): Merge conflict in drivers/char/ipmi/ipmi_si_intf.c
Merging driver-core/driver-core-next (82bdf495169f test_firmware: wrap custom sysfs load tests into helper)
Merging usb/usb-next (7739376eb1ed USB: of: clean up device-node helper)
Merging usb-gadget/next (ce2b21a4e5ce usb: dwc2: Fix UDC state tracking)
Merging usb-serial/usb-next (d8a42b1ff8a3 USB: serial: ark3116: clean up return values of register accessors)
Merging usb-chipidea-next/ci-for-usb-next (2a53e060a053 usb: chipidea: fix trivial typo in Kconfig)
Merging phy-next/next (4fbd8d194f06 Linux 4.15-rc1)
Merging tty/tty-next (4fbd8d194f06 Linux 4.15-rc1)
Merging char-misc/char-misc-next (9a450484089d lp: support 64-bit time_t user space)
Merging extcon/extcon-next (4f65b63ecc4c extcon: axp288:: Handle return value of platform_get_irq)
Merging staging/staging-next (dfe571ac1208 staging: ipx: depends on NET)
Merging mux/for-next (aae4e7a8bc44 Linux 4.13-rc4)
Merging slave-dma/next (85747adf9b86 Merge branch 'topic/tegra' into next)
Merging cgroup/for-next (52cf373c37a6 cgroup: properly init u64_stats)
Merging scsi/for-next (c2e8fbf908af scsi: libsas: align sata_device's rps_resp on a cacheline)
Merging scsi-mkp/for-next (2caffcb40267 scsi: wd719x: make card_types static const, shrinks object size)
CONFLICT (content): Merge conflict in drivers/scsi/arcmsr/arcmsr_hba.c
Merging target-updates/for-next (97488c73190b tcmu: Add a missing unlock on an error path)
Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging libata/for-next (20f9ceed72f1 pata_pdc2027x : make pdc2027x_*_timing structures const)
Merging vhost/linux-next (e7569f44044f Merge branch 'this' into vhost)
Merging rpmsg/for-next (c4ec2b7731d8 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging pinctrl/for-next (4bd6683da2e6 pinctrl: denverton: Fix UART2 RTS pin mode)
Merging pinctrl-samsung/for-next (4fbd8d194f06 Linux 4.15-rc1)
Merging pwm/for-next (f83e2ae2606b pwm: stm32-lp: Remove pwm_is_enabled() check before calling pwm_disable())
Merging userns/for-next (116ceac9741e autofs4: Modify autofs_wait to use current_uid() and current_gid())
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (9e66317d3c92 Linux 4.14-rc3)
Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (c3e0d179bff5 selftests: firmware: skip unsupported custom firmware fallback tests)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging livepatching/for-next (3602b15a20a6 Merge branch 'for-4.15/callbacks' into for-next)
Merging coresight/next (869704675319 coresight: Use PTR_ERR_OR_ZERO())
Merging rtc/rtc-next (9f33399c9074 rtc: stm32: Fix copyright)
Merging nvdimm/libnvdimm-for-next (4247f24c2358 Merge branch 'for-4.15/dax' into libnvdimm-for-next)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging at24/at24/for-next (2d0336eb3393 eeprom: at24: remove now unneeded smbus-related code)
Merging ntb/ntb-next (49400481bbab NTB: switchtec_ntb: Add new line on appropriate printks)
Merging kspp/for-next/kspp (e0726376acd2 lkdtm: Update usercopy tests for whitelisting)
Merging akpm-current/current (ba0cf5d1a44b pids: introduce find_get_task_by_vpid() helper)
CONFLICT (content): Merge conflict in lib/vsprintf.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: tools/objtool/Makefile: don't assume sync-check.sh is executable
Applying: vfs: remove might_sleep() from clear_inode()
Applying: sparc64: NG4 memset 32 bits overflow
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (655042332e3c lib/crc-ccitt: add CCITT-FALSE CRC16 variant)

^ permalink raw reply	[flat|nested] 10+ messages in thread
* linux-next: Tree for Dec 1
@ 2016-12-01  6:42 Stephen Rothwell
  2016-12-01 20:17 ` Randy Dunlap
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2016-12-01  6:42 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

Changes since 20161130:

New tree: openrisc

The cifs tree lost its build failure.

The net-next tree gained conflicts against the net and arm-soc trees.

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

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

The akpm-current tree lost its build failure.

The akpm tree lost several patches that turned up in the powerpc tree.

Non-merge commits (relative to Linus' tree): 9134
 8734 files changed, 530030 insertions(+), 199813 deletions(-)

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

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

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

Below is a summary of the state of the merge.

I am currently merging 246 trees (counting Linus' and 35 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 (e2b588ab60c7 Merge tag 'pwm/for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (152b695d7437 builddeb: fix cross-building to arm64 producing host-arch debs)
Merging arc-current/for-curr (7badf6fefca8 ARC: axs10x: really enable ARC PGU)
Merging arm-current/fixes (8478132a8784 Revert "arm: move exports to definitions")
Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro)
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (dd7b2f035ec4 powerpc/mm: Fix lazy icache flush on pre-POWER5)
Merging sparc/master (88abd8249ee8 Merge branch 'for-4.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata)
Merging net/master (aa196eed3d80 macvtap: handle ubuf refcount correctly when meet errors)
Merging ipsec/master (a55e23864d38 esp6: Fix integrity verification when ESN are used)
Merging netfilter/master (17a49cd549d9 netfilter: arp_tables: fix invoking 32bit "iptable -P INPUT ACCEPT" failed in 64bit kernel)
Merging ipvs/master (9b6c14d51bd2 net: tcp response should set oif only if it is L3 master)
Merging wireless-drivers/master (fcd2042e8d36 mwifiex: printk() overflow with 32-byte SSIDs)
Merging mac80211/master (9590112241ba tipc: fix link statistics counter errors)
Merging sound-current/for-linus (b5337cfe067e ALSA: hda/ca0132 - Add quirk for Alienware 15 R2 2016)
Merging pci-current/for-linus (e42010d8207f PCI: Set Read Completion Boundary to 128 iff Root Port supports it (_HPX))
Merging driver-core.current/driver-core-linus (a25f0944ba9b Linux 4.9-rc5)
Merging tty.current/tty-linus (a909d3e63699 Linux 4.9-rc3)
Merging usb.current/usb-linus (e5517c2a5a49 Linux 4.9-rc7)
Merging usb-gadget-fixes/fixes (05e78c6933d6 usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match())
Merging usb-serial-fixes/usb-linus (2ab13292d7a3 USB: serial: cp210x: add ID for the Zone DPMX)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu)
Merging staging.current/staging-linus (a25f0944ba9b Linux 4.9-rc5)
Merging char-misc.current/char-misc-linus (a25f0944ba9b Linux 4.9-rc5)
Merging input-current/for-linus (2425f1808123 Input: change KEY_DATA from 0x275 to 0x277)
Merging crypto-current/master (57891633eeef crypto: rsa - Add Makefile dependencies to fix parallel builds)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging vfio-fixes/for-linus (05692d7005a3 vfio/pci: Fix integer overflows, bitmask check)
Merging kselftest-fixes/fixes (1001354ca341 Linux 4.9-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging drm-intel-fixes/for-linux-next-fixes (e411072d5740 drm/i915: drop the struct_mutex when wedged or trying to reset)
Merging drm-misc-fixes/for-linux-next-fixes (e94bd1736f1f drm: Don't call drm_for_each_crtc with a non-KMS driver)
Merging kbuild/for-next (8549430410ed Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
Merging arm/for-next (b4871f457978 Merge branch 'syscalls' into for-next)
Merging arm-perf/for-next/perf (f43365ee17f8 selftests: arm64: add test for unaligned/inexact watchpoint handling)
Merging pinctrl/for-next (ec61168bc0bc pinctrl: sx150x: support setting multiple pins at once)
Merging arm-soc/for-next (1be977c048b5 arm-soc: document merges)
Merging amlogic/for-next (0ef8bcc8c1b3 Merge branch 'v4.10/defconfig' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (ec09fdf764ee Merge branch anholt/bcm2835-defconfig-64-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (242a001e48b7 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (7943083ec2a8 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (4aecea63ed81 Merge branch 'omap-for-v4.10/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (bbf9c90768f9 Merge tag 'qcom-dts-for-4.10-2' into all-for-4.10-part2)
Merging renesas/next (ba049962976b Merge branch 'soc-match-for-v4.10' into next)
Merging rockchip/for-next (7e02e53c6ecf Merge branch 'v4.10-clk/next' into for-next)
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (2d2a2b87438b Merge branch 'next/soc' into for-next)
Merging tegra/for-next (e8d16d40e269 Merge branch for-4.10/i2c into for-next)
Merging arm64/for-next/core (00cc2e074537 Merge Will Deacon's for-next/perf branch into for-next/core)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
Applying: arm64: merge fix for code movement to cpucaps.h
Merging clk/clk-next (96893e101eb2 clk: qcom: Put venus core0/1 gdscs to hw control mode)
CONFLICT (content): Merge conflict in drivers/soc/renesas/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r8a7796.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r8a7795.dtsi
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-rcar-gen2.c
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7794.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7793.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7792.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7791.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7790.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7779.dtsi
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (c78874f116be tty: serial: make crisv10 explicitly non-modular)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (25ba49085c4f m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (32a4bca3464f m68knommu: AMCORE board, add iMX i2c support)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (d31d3a72d41b Merge branch '4.9-fixes' into mips-for-linux-next)
Merging nios2/for-next (476080a79367 nios2: use of_property_read_bool)
Merging openrisc/for-next (56cb5749b239 openrisc: prevent VGA console, fix builds)
Merging parisc-hd/for-next (033b41e56bf2 parisc: Try to fix TLB problems)
Merging powerpc/next (500c7ab1a9db powerpc: Enable CONFIG_KEXEC_FILE in powerpc server defconfigs.)
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/asm-prototypes.h
Merging fsl/next (18058822768f soc/qman: Handle endianness of h/w descriptors)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (dd5224986eb4 s390/uapi: sort header export list)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (03eae3aca94c xtensa: fix screen_info, clean up unused declarations in setup.c)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (986ee488b9fd Merge branch 'for-next-next-4.9-20161125' into for-next-20161125)
Merging ceph/master (264048afab27 libceph: initialize last_linger_id with a large integer)
Merging cifs/for-next (22d3d4fbbd58 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (c3b004460d77 quota: Remove dqonoff_mutex)
Merging ext4/dev (b72b1f3b125e ext4: Add select for CONFIG_FS_IOMAP)
Merging f2fs/dev (19c526515f6b f2fs: fix 32-bit build)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (59c3b76cc61d fuse: fix fuse_write_end() if zero bytes were copied)
Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (14155cafeadd btrfs: assign error values to the correct bio structs)
Merging nfsd/nfsd-next (fafedf81700d svcrdma: Further clean-up of svc_rdma_get_inv_rkey())
Merging orangefs/for-next (19ff7fcc76e6 orangefs: add .owner to debugfs file_operations)
Merging overlayfs/overlayfs-next (f5b9f1e5ee46 ovl: create directories inside merged parent opaque)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (a00052a296e5 ubifs: Fix regression in ubifs_readdir())
Merging xfs/for-next (5f1c6d28cfcd Merge branch 'iomap-4.10-directio' into for-next)
CONFLICT (content): Merge conflict in include/linux/iomap.h
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (b26b5ef5ec7e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (c8d2bc9bc39e Linux 4.8)
Merging pci/next (1a452ec24b3f Merge branch 'pci/host-vmd' into next)
Merging pstore/for-next/pstore (fc46d4e453f5 ramoops: add pdata NULL check to ramoops_probe)
Merging hid/for-next (c6fc9d91a4b1 Merge branch 'for-4.10/cp2112' into for-next)
Merging i2c/i2c/for-next (470f1b298ef2 Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (c8d2bc9bc39e Linux 4.8)
Merging hwmon-staging/hwmon-next (98d7b5a40c3a hwmon: (core) Simplify sysfs attribute name allocation)
Merging jc_docs/docs-next (d6ba7a9c8b5a doc: Sphinxify the tracepoint docbook)
Merging v4l-dvb/master (bf0396ea4727 Merge branch 'patchwork' into to_next)
Merging pm/linux-next (88f93b2f6c49 Merge branch 'powerclamp' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (9245ac20d829 Merge branches 'thermal-core', 'thermal-intel', 'thermal-soc-fixes' and 'thermal-reorg' into next)
Merging thermal-soc/next (6ee459f5f967 devfreq_cooling: pass a pointer to devfreq in the power model callbacks)
Merging ieee1394/for-next (e9300a4b7bba firewire: net: fix fragmented datagram_size off-by-one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (d29fa0cb7602 swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support)
Merging net-next/master (8f679ed88f88 driver: ipvlan: Remove useless member mtu_adj of struct ipvl_dev)
CONFLICT (content): Merge conflict in net/sched/cls_flower.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/en_netdev.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/macb.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/amd/xgbe/xgbe-main.c
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
Merging ipsec-next/master (2258d927a691 xfrm: remove unused helper)
Merging netfilter-next/master (7d384846b998 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (59391a96dc73 bcma: add Dell Inspiron 3148)
Merging bluetooth/master (1ae6d00ad057 Bluetooth: hci_qca: Use setup_timer Kernel API instead of init_timer)
Merging mac80211-next/master (bd0e6d8d5803 mac80211: Remove unused 'struct rate_control_ref' variable)
Merging rdma/for-next (e37a79e5d4ca net/mlx5e: Add tc support for FWD rule with counter)
Merging rdma-leon/rdma-next (b66df7cc9ee7 Merge branch 'topic/shared-for-4.10' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (0e2ce9d3fcba Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (b2c4ba5cf712 mtd: mtdswap: fix spelling mistake "erassure" -> "erasure")
Merging nand/nand/next (8fcfba072420 mtd: nand: tango: Use nand_to_mtd() instead of directly accessing chip->mtd)
Merging crypto/master (81126d1a8bc2 crypto: arm/aesbs - fix brokenness after skcipher conversion)
Merging drm/drm-next (0d5320fc1941 Merge tag 'tilcdc-4.10' of https://github.com/jsarha/linux into drm-next)
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
Merging drm-intel/for-linux-next (e9cbc4bd0140 drm/i915: Update DRIVER_DATE to 20161121)
Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin)
Merging drm-misc/for-linux-next (a53ca63502e6 drm: Protect fb_helper list manipulation with a mutex)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (8e3eb71c80ad drm/arm/malidp: Fix possible dereference of NULL)
Merging sunxi/sunxi/for-next (63e8e44adfdc Merge branch 'sunxi/dt-late-for-4.10' into sunxi/for-next)
Merging kspp/for-next/kspp (68fdc678df46 MAINTAINERS: add GCC plugins Makefile)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (d56ec48ebe5f Merge remote-tracking branch 'regmap/topic/lzo' into regmap-next)
Merging sound/for-next (4763601a56f1 ALSA: usb-audio: Fix bogus error return in snd_usb_create_stream())
Merging sound-asoc/for-next (633a1cf45224 Merge remote-tracking branches 'asoc/topic/wm8978', 'asoc/topic/wm9081', 'asoc/topic/wm9705', 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next)
Merging modules/modules-next (4d217a5adccf module: fix DEBUG_SET_MODULE_RONX typo)
Merging input/next (accbcea3465b Input: imx6ul_tsc - convert int to u32)
Merging block/for-next (a5f78b7f7dd1 Merge branch 'for-4.10/block' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
Applying: iomap: fix up for blk_poll and WRITE_ODIRECT change
Merging lightnvm/for-next (039d17753cdd lightnvm: manage lun partitions internally in mm)
CONFLICT (content): Merge conflict in include/linux/lightnvm.h
CONFLICT (content): Merge conflict in drivers/lightnvm/rrpc.h
CONFLICT (content): Merge conflict in drivers/lightnvm/rrpc.c
CONFLICT (content): Merge conflict in drivers/lightnvm/gennvm.h
CONFLICT (content): Merge conflict in drivers/lightnvm/gennvm.c
CONFLICT (content): Merge conflict in drivers/lightnvm/core.c
Merging device-mapper/for-next (fb8f766c5cee dm raid: don't allow "write behind" with raid4/5/6)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (38cdf7e0bfee mmc: dw_mmc: display the clock message only one time when card is polling)
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (e8d7c33232e5 md/raid5: limit request size according to implementation limits)
CONFLICT (content): Merge conflict in drivers/md/raid5-cache.c
CONFLICT (content): Merge conflict in drivers/md/md.c
Merging mfd/for-mfd-next (b56ded9282ab mfd: tps65217: Support an interrupt pin as the system wakeup)
CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (6480af4915d6 power_supply: wm97xx_battery: use power_supply_get_drvdata)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (68d8fdbe6374 Merge remote-tracking branch 'regulator/topic/twl' into regulator-next)
Merging security/next (9430066a15d6 tpm: adjust return value of tpm_read_log)
Merging integrity/next (b4bfec7f4a86 security/integrity: Harden against malformed xattrs)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (9287aed2ad1f selinux: Convert isec->lock into a spinlock)
Merging tpmdd/next (9430066a15d6 tpm: adjust return value of tpm_read_log)
Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support)
Merging iommu/next (a2c3bc6d10e2 Merge branches 'arm/mediatek', 'arm/smmu', 'x86/amd', 's390', 'core' and 'arm/exynos' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (5ba6de98c78a vfio: fix vfio_info_cap_add/shift)
Merging trivial/for-next (380cc42d5a6c nvme: add missing \n to end of dev_warn message)
Merging audit/next (5b52b1d37a6f netns: avoid disabling irq for netns id)
CONFLICT (content): Merge conflict in net/core/net_namespace.c
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (3c263bc7b727 add bindings document for altera freeze bridge)
Merging mailbox/mailbox-for-next (16ae16c6e561 Merge tag 'mmc-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc)
Merging spi/for-next (f1ec71fc5faf Merge remote-tracking branches 'spi/topic/topcliff-pch' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (6513ae48330f Merge branch 'linus')
CONFLICT (content): Merge conflict in drivers/net/ethernet/sfc/Kconfig
CONFLICT (content): Merge conflict in drivers/net/ethernet/amd/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c
Applying: net: busy-poll: fix up for cpu_relax_lowlatency() removal
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (dce5d2c614c8 edac.rst: move concepts dictionary from edac.h)
Merging edac-amd/for-next (95d3af6bd18f EDAC, amd64: Autoload amd64_edac_mod on Fam17h systems)
CONFLICT (content): Merge conflict in drivers/edac/edac_mc.c
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (38e11df13429 ring-buffer: Force rb_end_commit() and rb_set_commit_to_write() inline)
Merging rcu/rcu/next (42b4ae9cb794 rcu: Check cond_resched_rcu_qs() state less often to reduce GP overhead)
Merging kvm/linux-next (ffcb09f27f46 Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc)
CONFLICT (content): Merge conflict in arch/x86/kvm/cpuid.c
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/asm-prototypes.h
Merging kvm-arm/next (fd5ebf99f814 arm/arm64: KVM: Clean up useless code in kvm_timer_enable)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (6ccad8cea5bc KVM: Add halt polling documentation)
Merging kvms390/next (e1788bb995be KVM: s390: handle floating point registers in the run ioctl not in vcpu_put/load)
Merging xen-tip/linux-next (b36585a0a3c1 xen/events: use xen_vcpu_id mapping for EVTCHNOP_status)
Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (401df5ace9d6 intel_pmc_core: Add KBL CPUID support)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (f00662b45979 leds: pca955x: Add ACPI support)
Merging ipmi/for-next (f0cee6244aa1 ipmi_ssif: create hardware-independent softdep for ipmi_devintf)
Merging driver-core/driver-core-next (cd74da957ba2 drivers: base: dma-mapping: Fix typo in dmam_alloc_non_coherent comments)
Merging tty/tty-next (a9b01b5823f7 serial: 8250_mid fix calltrace when hotplug 8250 serial controller)
CONFLICT (modify/delete): Documentation/VGA-softcursor.txt deleted in HEAD and modified in tty/tty-next. Version tty/tty-next of Documentation/VGA-softcursor.txt left in tree.
$ git rm -f Documentation/VGA-softcursor.txt
Merging usb/usb-next (7faf44bf9255 usb: fix improper return value when kzalloc fails)
Merging usb-gadget/next (d5c024f3761d usb: gadget: serial: fix possible Oops caused by calling kthread_stop(NULL))
Merging usb-serial/usb-next (3c3dd1e058cb USB: serial: kl5kusb105: abort on open exception path)
Merging usb-chipidea-next/ci-for-usb-next (3be3251db088 usb: chipidea: imx: Disable internal 60Mhz clock with ULPI PHY)
Merging phy-next/next (5e253dfbdbea phy: rockchip-inno-usb2: select USB_COMMON)
Merging staging/staging-next (f1706cb74e2e staging: sm750fb: fix tabstop style warning)
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c
CONFLICT (content): Merge conflict in drivers/staging/unisys/include/iochannel.h
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/i2c/trivial-devices.txt
Merging char-misc/char-misc-next (31114fa95bdb auxdisplay: ht16k33: select framebuffer helper modules)
CONFLICT (content): Merge conflict in drivers/lightnvm/core.c
Merging extcon/extcon-next (d361a5ebe994 extcon: adc-jack: Fix incompatible pointer type warning)
Merging slave-dma/next (a9439a5b774f Merge branch 'for-linus' into next)
Merging cgroup/for-next (7c0dce2f2c43 cpuset: Remove unused 'struct cpuset*' variable)
Merging scsi/for-next (ee8a864ceaf4 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
Merging scsi-mkp/for-next (9dadfb973f0d scsi: ipr: Fix runaway IRQs when falling back from MSI to LSI)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (751ef0f0c817 Merge branch 'for-4.9-fixes' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (75bfa81bf089 virtio_ring: mark vring_dma_dev inline)
Merging rpmsg/for-next (10b0916beb03 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (468a90f893d8 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (fdd3ff4db177 Merge branch 'for-4.10/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (f84df2a6f268 exec: Ensure mm->user_ns contains the execed files)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1001354ca341 Linux 4.9-rc1)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
Merging coresight/next (e615a9a8e481 coresight: perf: Add a missing call to etm_free_aux)
Merging rtc/rtc-next (1c02cbfec5c7 rtc: twl: make driver DT only)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (4cb19355ea19 device-dax: fail all private mapping attempts)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (61ba078c334d ipc/shm.c: coding style fixes)
CONFLICT (content): Merge conflict in mm/memcontrol.c
CONFLICT (content): Merge conflict in mm/filemap.c
CONFLICT (content): Merge conflict in fs/dax.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: posix-timers: give lazy compilers some help optimizing code away
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: ktest.pl: fix english
Applying: kernel/watchdog.c: move shared definitions to nmi.h
Applying: kernel/watchdog.c: move hardlockup detector to separate file
Applying: sparc: implement watchdog_nmi_enable and watchdog_nmi_disable
Applying: ipc/sem: do not call wake_sem_queue_do() prematurely
Applying: ipc/sem: rework task wakeups
Applying: ipc/sem: merge fix for WAKE_Q to DEFINE_WAKE_Q rename
Applying: ipc-sem-rework-task-wakeups-checkpatch-fixes
Applying: ipc/sem: optimize perform_atomic_semop()
Applying: ipc/sem: ensure we left shift a ULL rather than a 32 bit integer
Applying: ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes
Applying: ipc/sem: explicitly inline check_restart
Applying: ipc/sem: use proper list api for pending_list wakeups
Applying: ipc/sem: simplify wait-wake loop
Applying: ipc-sem-simplify-wait-wake-loop-checkpatch-fixes
Applying: ipc/sem: avoid idr tree lookup for interrupted semop
Applying: mm: add locked parameter to get_user_pages_remote()
Applying: vfio iommu type1: merge fix for get_user_pages_remote API change
Applying: mm: unexport __get_user_pages_unlocked()
Applying: mm-unexport-__get_user_pages_unlocked-checkpatch-fixes
Applying: mm: join struct fault_env and vm_fault
Applying: mm: use vmf->address instead of of vmf->virtual_address
Applying: mm: use pgoff in struct vm_fault instead of passing it separately
Applying: mm: use passed vm_fault structure in __do_fault()
Applying: mm: trim __do_fault() arguments
Applying: mm: use passed vm_fault structure for in wp_pfn_shared()
Applying: mm: add orig_pte field into vm_fault
Applying: mm: allow full handling of COW faults in ->fault handlers
Applying: mm: factor out functionality to finish page faults
Applying: mm: move handling of COW faults into DAX code
Applying: mm: factor out common parts of write fault handling
Applying: mm: pass vm_fault structure into do_page_mkwrite()
Applying: mm: use vmf->page during WP faults
Applying: mm: move part of wp_page_reuse() into the single call site
Applying: mm: provide helper for finishing mkwrite faults
Applying: mm: change return values of finish_mkwrite_fault()
Applying: mm: export follow_pte()
Applying: dax: make cache flushing protected by entry lock
Applying: dax: protect PTE modification on WP fault by radix tree entry lock
Applying: dax: clear dirty entry tags on cache flush
Applying: powerpc: ima: get the kexec buffer passed by the previous kernel
Applying: ima: on soft reboot, restore the measurement list
Applying: ima: permit duplicate measurement list entries
Applying: ima: maintain memory size needed for serializing the measurement list
Applying: powerpc: ima: send the kexec buffer to the next kernel
Applying: ima: on soft reboot, save the measurement list
Applying: ima: store the builtin/custom template definitions in a list
Applying: ima: support restoring multiple template formats
Applying: ima: define a canonical binary_runtime_measurements list format
Applying: ima: platform-independent hash value
Merging akpm/master (3de823bbe53b ima: platform-independent hash value)

^ permalink raw reply	[flat|nested] 10+ messages in thread
* linux-next: Tree for Dec 1
@ 2014-12-01 10:10 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2014-12-01 10:10 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

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

Hi all,

I will not be releasing a linux-next tree tomorrow.

Changes since 20141128:

The samsung tree gained a conflict against the arm-soc tree.

The v4l-dvb tree gained a conflict against the arm-soc tree.

The mmc-uh tree gained a conflict against the arm-soc tree.

The driver-core tree gained conflicts against the net-next tree and a
build failure for which I applied a patch.

The usb tree gained a build failure so I used the version from
next-20141128.

Non-merge commits (relative to Linus' tree): 9484
 9021 files changed, 350402 insertions(+), 264052 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 229 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 (2f19cad94cee btrfs: zero out left over bytes after processing compression streams)
Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kbuild-current/rc-fixes (f114040e3ea6 Linux 3.18-rc1)
Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4)
Merging arm-current/fixes (3f4aa45ceea5 ARM: 8226/1: cacheflush: get rid of restarting block)
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 (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk)
Merging powerpc-merge-mpe/fixes (152d44a853e4 powerpc: 32 bit getcpu VDSO function uses 64 bit instructions)
Merging sparc/master (0d1d9092b536 sparc: Add NOP dma_cache_sync() implementation.)
Merging net/master (7fa2955ff70c sh_eth: Fix sleeping function called from invalid context)
Merging ipsec/master (d10845fc85b2 Merge branch 'gso_encap_fixes')
Merging sound-current/for-linus (d42472ecffd7 ALSA: pcm: Add big-endian DSD sample formats and fix XMOS DSD sample format)
Merging pci-current/for-linus (7fc986d8a972 PCI: Support 64-bit bridge windows if we have 64-bit dma_addr_t)
Merging wireless/master (7d63a5f9b25b rtlwifi: Change order in device startup)
Merging driver-core.current/driver-core-linus (206c5f60a3d9 Linux 3.18-rc4)
Merging tty.current/tty-linus (a5e9ab291c60 Revert "serial: of-serial: add PM suspend/resume support")
Merging usb.current/usb-linus (263e80b43559 usb-quirks: Add reset-resume quirk for MS Wireless Laser Mouse 6000)
Merging usb-gadget-fixes/fixes (520fe7633692 usb: dwc3: ep0: fix for dead code)
Merging usb-serial-fixes/usb-linus (75bcbf29c284 USB: ssu100: fix overrun-error reporting)
Merging staging.current/staging-linus (6d4556fc0309 staging: r8188eu: Add new device ID for DLink GO-USB-N150)
Merging char-misc.current/char-misc-linus (0df1f2487d2f Linux 3.18-rc3)
Merging input-current/for-linus (a1f9a4072655 Input: xpad - use proper endpoint type)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (24c65bc7037e hwrng: pseries - port to new read API and fix stack corruption)
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 (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap)
Merging rr-fixes/fixes (3438cf549d2f param: fix crash on bad kernel arguments)
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 (884716497d4c selftests/timers: change test to use ksft framework)
Merging drm-intel-fixes/for-linux-next-fixes (afa4e53a7bcd drm/i915: Cancel vdd off work before suspend)
Merging asm-generic/master (cb61f6769b88 ARM64: use GENERIC_PCI_IOMAP)
Merging arc/for-next (996bad6cb351 ARC: add power management options)
Merging arm/for-next (71a4d7620f94 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (cac7f2429872 Linux 3.18-rc2)
Merging arm-soc/for-next (ee5254b783f6 arm-soc: document merges)
Merging bcm2835/for-next (6298ed17a404 ARM: bcm2835: Add device tree for Raspberry Pi model B+)
Merging berlin/berlin/for-next (91bcb334bf0b 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 (8a73e870fc56 Merge tag 'imx-dt-3.19' into for-next)
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (9993917cbc99 Merge branch 'mvebu/dt-usb_phy' into mvebu/for-next)
Merging renesas/next (2ed235fdf545 Merge branches 'heads/dt-cleanups-for-v3.19', 'heads/dt-clocksource-for-v3.19', 'heads/dt-fixes-for-v3.18', 'heads/kconfig-cleanups-for-v3.19', 'heads/clock-fixes-for-v3.18' and 'heads/runtime-pm-for-v3.19' into next)
Merging samsung/for-next (9db7d78aca2c Merge branch 'v3.19-next/dt-samsung-3' into for-next)
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
Merging sunxi/sunxi/for-next (ad01dbad5626 Merge branch 'sunxi/clocks-for-3.19' into sunxi/for-next)
Merging tegra/for-next (620e0b217672 Merge branch for-3.19/soc into for-next)
Merging arm64/for-next/core (a1ae65b21941 arm64: add seccomp support)
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 (069fb0b63722 syslog: Provide stub check_syslog_permissions)
Merging m68k/for-next (f0b99a643e96 m68k/mm: Eliminate memset after alloc_bootmem_pages)
Merging m68knommu/for-next (0259650b4cf7 m68knommu: fix irq handler types in 68360/commproc.c)
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 (17aabbd94a29 Merge branch '3.18-fixes' into mips-for-linux-next)
Merging nios2/nios2-next (26981a83bf16 nios2: Make NIOS2_CMDLINE_IGNORE_DTB depend on CMDLINE_BOOL)
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 (56c381f93d57 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging powerpc/next (5d01410fe4d9 Linux 3.18-rc6)
Merging powerpc-mpe/next (e39f223fc935 powerpc: Remove more traces of bootmem)
Merging fsl/next (76f3e2929bb6 powerpc/config: Enable memory driver)
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging s390/features (57f2ffe14fd1 s390: remove diag 44 calls from cpu_relax())
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (c47b15c4928c arch/tile: update MAINTAINERS email to EZchip)
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 (c0d7aa07504a Merge tag 'xtensa-for-next-20141021-2' 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 (388cfdc9bc19 libceph: require cephx message signature by default)
Merging cifs/for-next (a8a7a807cd94 Update MAINTAINERS entry)
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 (942080643bce eCryptfs: Remove buggy and unnecessary write in file name decode routine)
Merging ext3/for_next (fdf2657bc81b udf: One function call less in udf_fill_super() after error detection)
Merging ext4/dev (ca83cc75a16f ext4: forbid journal_async_commit in data=ordered mode)
Merging f2fs/dev (31a3268839c1 f2fs: cleanup if-statement of phase in gc_data_segment)
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 (ec7d879c4576 GFS2: gfs2_atomic_open(): simplify the use of finish_no_open())
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 (388f0c776781 sunrpc: add a debugfs rpc_xprt directory with an info file in it)
Merging nfsd/nfsd-next (d395ac8becda sunrpc: release svc_pool_map reference when serv allocation fails)
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
Merging overlayfs/overlayfs-next (8cb983cec9d1 ovl: support multiple lower layers)
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
Merging ubifs/linux-next (f38aed975c0c UBI: Fix invalid vfree())
Merging xfs/for-next (216875a594e0 Merge branch 'xfs-consolidate-format-defs' into for-next)
Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING)
Merging vfs/for-next (8ce74dd60578 Merge tag 'trace-seq-file-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into for-next)
Merging pci/next (149792795d2b Merge branch 'pci/msi' into next)
Merging hid/for-next (f26441f561c8 Merge branch 'for-3.19/wacom' into for-next)
Merging i2c/i2c/for-next (6e79807443cb Merge branch 'i2c/for-3.19' into i2c/for-next)
Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro)
Merging hwmon-staging/hwmon-next (e46066eae1df hwmon: Driver for Nuvoton NCT7802Y)
Merging v4l-dvb/master (7996d58f03c1 [media] omap: disable COMPILE_TEST)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51-peripherals.c
Merging kbuild/for-next (7c87cfee71f2 Merge branch 'kbuild/kbuild' into kbuild/for-next)
CONFLICT (content): Merge conflict in scripts/Kbuild.include
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
Merging libata/for-next (598e9a9005ef sata_rcar: Document deprecated "renesas,rcar-sata")
Merging pm/linux-next (0349e91d602f Merge branch 'acpi-pm' into linux-next)
Merging idle/next (a8b65b07d753 tools/power turbostat: decode MSR_*_PERF_LIMIT_REASONS)
CONFLICT (content): Merge conflict in arch/x86/include/uapi/asm/msr-index.h
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 (b1d52b27ea8d Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (51b04d59c274 firewire: ohci: replace vm_map_ram() with vmap())
Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks)
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
Merging slave-dma/next (14d0f54d42c8 Merge branch 'topic/at_xdmac' into next)
Merging net-next/master (cd4c910e0075 netpoll: delete defconfig references to obsolete NETPOLL_TRAP)
CONFLICT (content): Merge conflict in net/netfilter/nf_log.c
Merging ipsec-next/master (12bfa8bdba05 xfrm: Use __xfrm_policy_link in xfrm_policy_insert)
Merging wireless-next/master (18ca43823f3c mwifiex: add Tx status support for ACTION frames)
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-fw.h
Merging bluetooth/master (f6af675ef548 Bluetooth: Automatically flushable packets aren't allowed on LE links)
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 (c30e1f790b0e mtd: nand: correct the comment of function nand_block_isreserved())
Merging crypto/master (1e104f9a251b crypto: algif_skcipher - Fixed blocking recvmsg)
Merging drm/drm-next (21769c675412 Merge branch 'drm/du/adv7511' of git://linuxtv.org/pinchartl/fbdev into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/dc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_drm_drv.c
Merging drm-panel/drm/panel/for-next (1976dbca047e drm/panel: Add Sharp LQ101R1SX01 support)
Merging drm-intel/for-linux-next (372ee59699d9 drm/i915: Only init engines once)
Merging drm-tegra/drm/tegra/for-next (7e0180e3570c drm/tegra: gem: Check before freeing CMA memory)
Merging drm-misc/topic/core-stuff (e5b5341c28c6 drm/atomic: clear plane's CRTC and FB when shutting down)
Merging sound/for-next (fc5d3c70f97b ALSA: virmidi: Fix wrong error check)
Merging sound-asoc/for-next (1e2f1a5f8c48 Merge remote-tracking branches 'asoc/topic/wm9081', 'asoc/topic/wm9090', 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next)
Merging modules/modules-next (18eb74fa9416 params: cleanup sysfs allocation)
Merging virtio/virtio-next (5a10b7dbf904 virtio_balloon: free some memory from balloon on OOM)
Merging input/next (5447326ff7e4 Input: atkbd - correct MSC_SCAN events for force_release keys)
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
Merging block/for-next (2ef5864b6dee Merge branch 'for-3.19/drivers' into for-next)
Merging device-mapper/for-next (c864e2483f19 dm cache: when reloading a discard bitset allow for a different discard block size)
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 (903101a83949 mmc: omap_hsmmc: Fix UHS card with DDR50 support)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-n8x0.c
CONFLICT (modify/delete): arch/arm/mach-at91/at91sam9g45_devices.c deleted in HEAD and modified in mmc-uh/next. Version mmc-uh/next of arch/arm/mach-at91/at91sam9g45_devices.c left in tree.
$ git rm -f arch/arm/mach-at91/at91sam9g45_devices.c
Merging kgdb/kgdb-next (0f16996cf2ed kernel/debug/debug_core.c: Logging clean-up)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (206c5f60a3d9 Linux 3.18-rc4)
Merging mfd/for-mfd-next (439b8bddaa1e mfd: da9063: Get irq base dynamically before registering device)
CONFLICT (content): Merge conflict in drivers/mfd/viperboard.c
Merging backlight/for-backlight-next (3e0e9ce4ae9b backlight: Extend of_find_backlight_by_node stub-check to modules)
Merging battery/master (99a79565e6db power: ds2782_battery: Simplify the PM hooks)
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 (10254e83abe1 Merge branches '3.19/simplefb' and '3.19/omapdss' into for-next)
CONFLICT (content): Merge conflict in include/linux/of.h
Merging regulator/for-next (3a0028b1f0f3 Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/stub' into regulator-next)
Merging security/next (ac14ae25b676 Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel into next)
Merging integrity/next (6fb5032ebb1c VFS: refactor vfs_read())
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 (0747669a8f9f Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU)
Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation)
Merging jc_docs/docs-next (86d3e023e05d Merge branch 'docs-3.19' into docs-next)
Merging trivial/for-next (078014dd3698 intel_ips: fix a type in error message)
Merging audit/next (0288d7183c41 audit: convert status version to a feature bitmap)
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (a81a6c654bbe ARM: dt: fix up PL011 device tree bindings)
CONFLICT (content): Merge conflict in include/linux/of.h
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
Merging dt-rh/for-next (a0e27f51ba8a documentation: pinctrl bindings: Fix trivial typo 'abitrary')
Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings)
Merging spi/for-next (6c32695a7cfe Merge remote-tracking branches 'spi/topic/pxa', 'spi/topic/rockchip', 'spi/topic/samsung', 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next)
Merging tip/auto-latest (1fdf2540a41b Merge branch 'x86/vdso')
CONFLICT (content): Merge conflict in drivers/pci/host/pcie-rcar.c
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 (50872ccd8786 EDAC, MCE, AMD: Correct formatting of decoded text)
Merging irqchip/irqchip/for-next (5cc8f658723f Merge branch 'irqchip/irqdomain-arm' into irqchip/for-next)
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (1dc38aa215e8 Merge branch 'for-next/ftrace/seq-buf' into trace/for-next)
Merging rcu/rcu/next (71f55432d812 rcu: Expand SRCU ->completed to 64 bits)
CONFLICT (content): Merge conflict in kernel/sched/core.c
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (b65d6e17fe22 kvm: x86: mask out XSAVES)
CONFLICT (modify/delete): arch/ia64/kvm/kvm-ia64.c deleted in kvm/linux-next and modified in HEAD. Version HEAD of arch/ia64/kvm/kvm-ia64.c left in tree.
$ git rm -f arch/ia64/kvm/kvm-ia64.c
Merging kvm-arm/next (016ed39c54b8 arm/arm64: KVM: vgic: kick the specific vcpu instead of iterating through all)
CONFLICT (modify/delete): arch/ia64/kvm/kvm-ia64.c deleted in HEAD and modified in kvm-arm/next. Version kvm-arm/next of arch/ia64/kvm/kvm-ia64.c left in tree.
$ git rm -f arch/ia64/kvm/kvm-ia64.c
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 (689562c293a6 swiotlb-xen: remove BUG_ON in xen_bus_to_phys)
Merging percpu/for-next (bfaa047a9415 Merge branch 'for-3.18-fixes' into for-next)
Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue())
Merging drivers-x86/for-next (ba98b33a5709 Sony-laptop: Deletion of an unnecessary check before the function call "pci_dev_put")
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 (a63b87838a59 Merge remote-tracking branches 'regmap/topic/ac97' and 'regmap/topic/headers' into regmap-next)
Merging hsi/for-next (d95dc9e38810 HSI: nokia-modem: fix error handling of irq_of_parse_and_map)
Merging leds/for-next (7a8685accb95 leds: lp8860: Introduce TI lp8860 4 channel LED driver)
Merging ipmi/for-next (ee0a40fd288e Change ACPI IPMI support to "default y")
CONFLICT (content): Merge conflict in arch/powerpc/platforms/powernv/opal-wrappers.S
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/opal.h
Merging driver-core/driver-core-next (daa3d67fa3b5 firmware class: Deletion of an unnecessary check before the function call "vunmap")
CONFLICT (content): Merge conflict in sound/soc/intel/sst-haswell-pcm.c
CONFLICT (modify/delete): drivers/staging/media/omap24xx/omap24xxcam.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of drivers/staging/media/omap24xx/omap24xxcam.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/debug.c
CONFLICT (modify/delete): drivers/net/ieee802154/fakehard.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of drivers/net/ieee802154/fakehard.c left in tree.
CONFLICT (content): Merge conflict in drivers/mtd/devices/docg3.c
CONFLICT (content): Merge conflict in drivers/mfd/syscon.c
CONFLICT (modify/delete): drivers/memory/tegra30-mc.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of drivers/memory/tegra30-mc.c left in tree.
CONFLICT (content): Merge conflict in drivers/leds/leds-gpio.c
CONFLICT (content): Merge conflict in drivers/iommu/tegra-smmu.c
CONFLICT (content): Merge conflict in drivers/input/keyboard/gpio_keys_polled.c
CONFLICT (content): Merge conflict in drivers/hwmon/ibmpowernv.c
CONFLICT (content): Merge conflict in drivers/bus/omap_l3_noc.c
CONFLICT (content): Merge conflict in drivers/base/Makefile
$ git rm -f drivers/memory/tegra30-mc.c drivers/net/ieee802154/fakehard.c drivers/staging/media/omap24xx/omap24xxcam.c
Applying: debugfs: predeclare struct device
Merging tty/tty-next (50d1e7d1077b serial: pxa: hold port.lock when reporting modem line changes)
CONFLICT (content): Merge conflict in drivers/tty/serial/of_serial.c
CONFLICT (content): Merge conflict in drivers/tty/n_tty.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/serial/pl011.txt
Merging usb/usb-next (842f57baab18 Merge tag 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-testing)
CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/pxa27x_udc.c
CONFLICT (content): Merge conflict in drivers/usb/dwc3/ep0.c
CONFLICT (content): Merge conflict in drivers/usb/dwc2/gadget.c
CONFLICT (content): Merge conflict in drivers/usb/chipidea/core.c
$ git reset --hard HEAD^
Merging next-20141128 version of usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/pxa27x_udc.c
CONFLICT (content): Merge conflict in drivers/usb/dwc3/ep0.c
CONFLICT (content): Merge conflict in drivers/usb/dwc2/gadget.c
CONFLICT (content): Merge conflict in drivers/usb/chipidea/core.c
[master d5e8ba233594] next-20141128/usb
Merging usb-gadget/next (ebf3992061db usb: musb: Use IS_ENABLED for tusb6010)
Merging usb-serial/usb-next (e7181d005e84 USB: qcserial: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem)
Merging staging/staging-next (aa9d9be96d33 staging: unisys: remove pointless macros)
CONFLICT (modify/delete): drivers/staging/media/omap24xx/tcm825x.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/omap24xx/tcm825x.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/omap24xx/omap24xxcam.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/omap24xx/omap24xxcam.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_imon.c
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_igorplugusb.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_igorplugusb.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/statahead.c
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/llite_internal.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/file.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/dcache.c
$ git rm -f drivers/staging/media/lirc/lirc_igorplugusb.c drivers/staging/media/omap24xx/omap24xxcam.c drivers/staging/media/omap24xx/tcm825x.c
Merging char-misc/char-misc-next (91905b6f4afe parport: parport_pc, do not remove parent devices early)
CONFLICT (content): Merge conflict in drivers/misc/cxl/irq.c
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Kconfig
CONFLICT (modify/delete): arch/arm/kernel/etm.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of arch/arm/kernel/etm.c left in tree.
$ git rm -f arch/arm/kernel/etm.c
Merging cgroup/for-next (eeecbd197151 cgroup: implement cgroup_get_e_css())
Merging scsi/for-next (68a899759b2b Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-next)
CONFLICT (content): Merge conflict in drivers/usb/storage/uas.c
Merging target-updates/for-next (697835872811 tcm_loop: Fix wrong I_T nexus association)
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 (0878e5c4dd02 pinctrl: rockchip: Fix enable/disable/mask/unmask)
CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-rockchip.c
CONFLICT (content): Merge conflict in arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
Applying: pinctrl: nomadik: fix up for binding changes
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 (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (0fac0914776b seria: mctrl_gpio: use gpiod_set_array function)
Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition)
Merging pwm/for-next (06e4cb6b1d5c pwm: samsung: Allow Samsung PWM driver to be enabled on Exynos7)
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 (17150fef4ab1 ktest: Add back "tail -1" to kernelrelease make)
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 (ffa3a37a6111 Merge tag 'ib-mfd-regulator-clk-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into clk-next)
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 (d3785cf42979 Merge ../aio-fixes)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL)
Merging kselftest/next (a2f19efd2e10 selftests/user: add install target to enable installing test)
CONFLICT (content): Merge conflict in tools/testing/selftests/user/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/net/Makefile
Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c)
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c
CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
Merging akpm-current/current (8895b8fe5776 shmdt: use i_size_read() instead of ->i_size)
CONFLICT (content): Merge conflict in mm/hugetlb.c
CONFLICT (content): Merge conflict in kernel/printk/printk.c
CONFLICT (content): Merge conflict in kernel/exit.c
CONFLICT (content): Merge conflict in fs/ocfs2/inode.h
CONFLICT (content): Merge conflict in drivers/usb/storage/debug.c
CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/i2c/trivial-devices.txt
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/gpio/gpio-zevio.c: fix build
Applying: slab: fix cpuset check in fallback_alloc
Applying: slub: fix cpuset check in get_any_partial
Applying: mm/cma: make kmemleak ignore CMA regions
Applying: mm: cma: split cma-reserved in dmesg log
Applying: fs: proc: include cma info in proc/meminfo
Applying: lib/show_mem.c: adds cma reserved information
Applying: lib-show_mem-this-patch-adds-cma-reserved-infromation-fix
Applying: fallocate: create FAN_MODIFY and IN_MODIFY events
Applying: tools/testing/selftests/Makefile: alphasort the TARGETS list
Applying: fsnotify: unify inode and mount marks handling
Applying: fsnotify: remove destroy_list from fsnotify_mark
Applying: mm: replace remap_file_pages() syscall with emulation
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
Merging akpm/master (984907efd4a7 mm: add strictlimit knob)

[-- 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 Dec 1
@ 2011-12-01  4:53 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2011-12-01  4:53 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Changes since 20111130:

The at91 tree lost its conflicts.

The v9fs tree gained a build failure, so I used the version from
next-20111130.

The hid tree lost its build failure.

The trivial tree gained a conflict against the 4xx tree.

The staging tree gained conflicts against the hid tree.

The akpm tree lost one build failure.

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

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

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

Below is a summary of the state of the merge.

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

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

Thanks to Randy Dunlap for doing many randconfig builds.

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

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

$ git checkout master
$ git reset --hard stable
Merging origin/master (883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging fixes/master (aaa0b4f iio: iio_event_getfd -- fix ev_int build failure)
Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.)
Merging arm-current/fixes (fe41db7 ARM: 7177/1: GIC: avoid skipping non-existent PPIs in irq_start calculation)
Merging m68k-current/for-linus (2690e21 m68k/mac: Remove mac_irq_{en,dis}able() wrappers)
Merging powerpc-merge/merge (49e4406 powerpc/44x: Add mtd ndfc to the ppx44x defconfig)
Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
Merging sparc/master (0b64120 sparc64: Patch sun4v code sequences properly on module load.)
Merging scsi-rc-fixes/master (e5a44df [SCSI] hpsa: Disable ASPM)
Merging net/master (218fa90 ipv4: fix lockdep splat in rt_cache_seq_show)
Merging sound-current/for-linus (ae7cc70 ALSA: usb-audio - Support for Roland GAIA SH-01 Synthesizer)
Merging pci-current/for-linus (4cac2eb PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs)
Merging wireless/master (c72e8d3 mac80211: fill rate filter for internal scan requests)
Merging driver-core.current/driver-core-linus (caca6a0 Linux 3.2-rc3)
Merging tty.current/tty-linus (caca6a0 Linux 3.2-rc3)
Merging usb.current/usb-linus (6414e94 usb: gadget: fsl_udc: fix dequeuing a request in progress)
Merging staging.current/staging-linus (dfd8ee9 Staging: comedi: fix integer overflow in do_insnlist_ioctl())
Merging char-misc.current/char-misc-linus (caca6a0 Linux 3.2-rc3)
Merging cpufreq-current/fixes (eb0b38a [CPUFREQ] db8500: fix build error due to undeclared i variable)
Merging input-current/for-linus (77f6ca5 Input: ams_delta_serio - include linux/module.h)
Merging md-current/for-linus (257a4b4 md/raid5: STRIPE_ACTIVE has lock semantics, add barriers)
Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
Merging crypto-current/master (2742528 crypto: mv_cesa - fix hashing of chunks > 1920 bytes)
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 (50e07f8 dt: add empty of_machine_is_compatible)
Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
Merging arm/for-next (7c4fba6 Merge branch 'devel' into for-next)
Merging arm-lpae/for-next (b0d153e ARM: LPAE: Add the Kconfig entries)
CONFLICT (content): Merge conflict in arch/arm/mm/ioremap.c
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
Merging arm-soc/for-next (7958e98 Merge branch 'next/timer' into for-next)
CONFLICT (content): Merge conflict in arch/arm/tools/mach-types
CONFLICT (content): Merge conflict in arch/arm/plat-omap/include/plat/common.h
CONFLICT (content): Merge conflict in arch/arm/mach-at91/setup.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c
Merging arm-perf/for-next/perf (f2288ad Merge branches 'perf/fixes', 'perf/event-nos', 'perf/omap4' and 'perf/updates' into for-next/perf)
Merging at91/at91-next (8748dfa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
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 (modify/delete): arch/arm/mach-mx5/pm-imx5.c deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/pm-imx5.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-mx5/Makefile deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Makefile left in tree.
CONFLICT (modify/delete): arch/arm/mach-mx5/Kconfig deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Kconfig left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx5.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/devices-imx53.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/clock-mx51-mx53.c
$ git rm -f arch/arm/mach-mx5/pm-imx5.c arch/arm/mach-mx5/Makefile arch/arm/mach-mx5/Kconfig
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 (a188e1e Merge branch 'next-samsung-devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/include/mach/entry-macro.S
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpu.c
Merging tegra/for-next (b48c54e Merge branch 'for-3.3/boards' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (9059054 blackfin: Fixup export.h includes)
Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
Merging cris/for-next (ea78f5b CRIS: Update documentation)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
Merging ia64/next (2174f6d pstore: gracefully handle NULL pstore_info functions)
Merging m68k/for-next (2e50d63 m68k: Don't comment out syscalls used by glibc)
Merging m68knommu/for-next (285aa94 m68knommu: fix broken ColdFire slice timer read_clk() code)
CONFLICT (content): Merge conflict in arch/m68k/Kconfig.debug
Merging microblaze/next (7f80850 Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh)
Merging mips/mips-for-linux-next (1fc140c Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next)
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 (fa8cbaa powerpc+sparc64/mm: Remove hack in mmap randomize layout)
Merging 4xx/next (f1ab937 MAINTAINERS: Update PowerPC 4xx git tree)
Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
Merging galak/next (fa8cbaa powerpc+sparc64/mm: Remove hack in mmap randomize layout)
Merging s390/features (4a6f04b [S390] topology: increase poll frequency if change is anticipated)
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 (1583171 Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile)
Merging unicore32/unicore32 (ed96dfb unicore32, exec: remove redundant set_fs(USER_DS))
Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
Merging cifs/master (9c32c63 cifs: Fix sparse warning when calling cifs_strtoUCS)
Merging configfs/linux-next (420118c configfs: Rework configfs_depend_item() locking and make lockdep happy)
Merging ecryptfs/next (aaef29d eCryptfs: Flush file in vma close)
Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
Merging ext4/dev (4c81f04 ext4: fix racy use-after-free in ext4_end_io_dio())
Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
Merging fuse/for-next (cfcfc9e Linux 3.2-rc2)
Merging gfs2/master (018a01c GFS2: We only need one ACL getting function)
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 (21f3eb8 logfs: update page reference count for pined pages)
CONFLICT (content): Merge conflict in fs/logfs/file.c
Merging nfs/linux-next (883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging nfsd/nfsd-next (353de31 nfsd4: fix CONFIG_NFSD_FAULT_INJECTION compile error)
Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
Merging ocfs2/linux-next (249ec93 ocfs2: Use filemap_write_and_wait() instead of write_inode_now())
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 (be9e4aa 9p: Reduce object size with CONFIG_NET_9P_DEBUG)
$ git reset --hard HEAD^
Merging refs/next/20111130/v9fs
Merging ubifs/linux-next (eaecf43 UBIFS: Use kmemdup rather than duplicating its implementation)
Merging xfs/master (4c393a6 xfs: fix attr2 vs large data fork assert)
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 (cfbf1bd PCI: msi: Disable msi interrupts when we initialize a pci device)
Merging hid/for-next (2ddfbbc Merge branch 'multitouch' into for-next)
Merging quilt/i2c (caca6a0 Linux 3.2-rc3)
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 (dda4fa1 hwmon: (lm63) Add support for LM96163)
Merging hwmon-staging/hwmon-next (a976c2a hwmon: (pmbus/zl6100) Only instantiate external temperature sensor if enabled)
Merging quilt/kernel-doc (c3b92c8 Linux 3.1)
Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
Merging v4l-dvb/master (ed3825f Merge branch 'poll-pwc2' of /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in drivers/staging/media/as102/as102_drv.h
Merging kbuild/for-next (ddb550d Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (3fab0c1 ahci: start engine only during soft/hard resets)
Merging infiniband/for-next (a493f1a Merge branches 'cxgb4', 'ipoib', 'misc' and 'qib' into for-next)
Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next)
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 (9beb3bf dlm: convert rsb list to rb_tree)
Merging scsi/master (f7c9c6b [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev)
Merging target-updates/for-next (5bda90c target: use ->exectute_task for all CDB emulation)
Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
Merging slave-dma/next (02f88be dmaengine: at_hdmac: simplify device selection from platform data or DT)
CONFLICT (content): Merge conflict in drivers/dma/pl330.c
Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
Merging net-next/master (449fa02 sfc: fix race in efx_enqueue_skb_tso())
Merging wireless-next/master (ba5736a ath9k_hw: add default chainmask for AR9462)
Merging bluetooth/master (c6feeb2 Bluetooth: Use queue in the device list)
Merging mtd/master (e0d6511 Merge git://git.infradead.org/mtd-2.6)
Merging l2-mtd/master (63c646f mtd: gpmi: add missing include 'module.h')
Merging crypto/master (741e8c2 crypto: convert drivers/crypto/* to use module_platform_driver())
Merging sound/for-next (ad32d58 Merge branch 'fix/asoc' into for-next)
Merging sound-asoc/for-next (a169134 ASoC: Provide debug log of accessory status on WM8958)
Merging cpufreq/next (5aace58 [CPUFREQ] ARM Exynos4210 PM/Suspend compatibility with different bootloaders)
Merging quilt/rr (78173d1 lguest: switch segment-voodoo-numbers to readable symbols)
Merging input/next (a6c6178 Input: remove redundant spi driver bus initialization)
CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c
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 (5dc34f4 Merge branch 'for-3.3/mtip32xx' into for-next)
Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
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 (00a159a max8925_power: Check at probe time if power to set online)
Merging mmc/mmc-next (ce8fda6 mmc: core: Fix typo at mmc_card_sleep)
Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
Merging slab/for-next (7436099 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (c7eefaf md/raid1: Mark device replaceable when we see a write error.)
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 (248dbc2 drm: move the fb bpp/depth helper into the core.)
Merging fbdev/fbdev-next (64cebcb Merge branch 'fbdev-for-linus' into fbdev-next)
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 (eb29674 regulator: Allow regulators to register with no init_data)
Merging security/next (de35353 digsig: build dependency fix)
CONFLICT (content): Merge conflict in lib/Makefile
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 (3d17ee5 watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API)
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 (a7e892e Merge branches 'iommu/fixes', 'iommu/page-sizes' and 'iommu/group-id' into next)
Merging cputime/cputime (c5927fe [S390] cputime: add sparse checking and cleanup)
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 (a13b032 clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR)
CONFLICT (content): Merge conflict in arch/powerpc/platforms/40x/Kconfig
Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
Merging pm/linux-next (46fc057 Freezer / NFS: make TASK_KILLABLE sleeps attempt to freeze)
CONFLICT (content): Merge conflict in kernel/cgroup_freezer.c
Merging apm/for-next (282e5aa x86: Kconfig: drop unknown symbol 'APM_MODULE')
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 (ed8ccfa Merge branch '3.3-edac-scrubrate' into edac-for-next)
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 (e79d72b Merge branch 'sched/core' into auto-latest)
CONFLICT (content): Merge conflict in arch/mips/kernel/perf_event_mipsxx.c
Merging rcu/rcu/next (afe24b1 rcu: Move propagation of ->completed from rcu_start_gp() to rcu_report_qs_rsp())
Merging uprobes/for-next (b23a347 x86: skip singlestep where possible)
Merging cgroup/for-next (a34815b Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
Merging kmemleak/kmemleak (99781ba kmemleak: Add support for memory hotplug)
Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
Merging oprofile/for-next (de346b6 Merge branch 'perf/core' into oprofile/master)
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 (54e6a3c Merge branch 'stable/for-linus-3.3' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (a34815b Merge branch 'for-3.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup)
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 (bc7ee55 regmap: Add trace event for successful cache reads)
Merging hsi/for-next (a8b4dea HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (11e3123 uio: convert drivers/uio/* to use module_platform_driver())
Merging tty/tty-next (7962fce tty: n_hdlc not atomic use tty->flags.)
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig
Merging usb/usb-next (b870def USB: ohci-s3c2410: add PM support)
Merging staging/staging-next (976d534 rtl8192e: Rename clashing symbols)
CONFLICT (content): Merge conflict in drivers/staging/iio/industrialio-core.c
CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad799x_core.c
CONFLICT (content): Merge conflict in drivers/staging/hv/Makefile
CONFLICT (content): Merge conflict in drivers/staging/hv/Kconfig
CONFLICT (content): Merge conflict in drivers/hid/hid-hyperv.c
Merging char-misc/char-misc-next (7f3379d misc: ad525x_dpot: Add support for SPI module device table matching)
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 (16ed8d9 btrfs: fix dirtied pages accounting on sub-page writes)
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 (5becdc7 pinctrl/coh901: driver to request its pins)
Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
Merging vhost/linux-next (cf64b8c frv: switch to GENERIC_PCI_IOMAP)
CONFLICT (content): Merge conflict in arch/m68k/Kconfig
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging kvmtool/master (1fbd119 kvm tools: Drop write operation in ro_ops_nowrite)
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: vmscan: fix initial shrinker size handling
Applying: vmscan: use atomic-long for shrinker batching
Applying: fs/proc/meminfo.c: fix compilation error
Applying: thp: reduce khugepaged freezing latency
Applying: CREDITS: update Kees's expired fingerprint and fix details
Applying: cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask
Applying: drivers/rtc/rtc-s3c.c: fix driver clock enable/disable balance issues
Applying: memcg: update maintainers
Applying: printk: avoid double lock acquire
Applying: thp: add compound tail page _mapcount when mapped
Applying: thp: set compound tail page _count to zero
Applying: mm/migrate.c: pair unlock_page() and lock_page() when migrating huge pages
Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
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: x86: rtc: don't register a platform RTC device for Intel MID platforms
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/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
Applying: mm/vmalloc.c: eliminate extra loop in pcpu_get_vm_areas error path
Applying: mm-vmallocc-eliminate-extra-loop-in-pcpu_get_vm_areas-error-path-fix
Applying: x86: mpparse: account for bus types other than ISA and PCI
Applying: drivers/platform/x86/sony-laptop.c: fix scancodes
Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-checkpatch-fixes
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: arm, exec: remove redundant set_fs(USER_DS)
Applying: intel-iommu: Fix __init section missmatch of dmar_parse_rmrr_atsr_dev
Applying: hrtimers: Special-case zero length sleeps
Applying: ia64, exec: remove redundant set_fs(USER_DS)
Applying: kconfig: add merge_config.sh script
Applying: merge_config.sh: use signal names compatible with dash and bash
Applying: merge_config.sh: whitespace cleanup
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: include/net/netprio_cgroup.h: various fixes
Applying: debugobjects: be smarter about static objects
Applying: debugobjects: extend 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: 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/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: fs: remove unneeded plug in mpage_readpages()
Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media
Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
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-add-free_hot_cold_page_list-helper-v2
Applying: mm-add-free_hot_cold_page_list-helper-v3
Applying: mm: remove unused pagevec_free
Applying: mm-tracepoint: rename page-free events
Applying: mm-tracepoint: fix documentation and examples
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: mm: migrate: one less atomic operation
Applying: mm: do not stall in synchronous compaction for THP allocations
Applying: mm-do-not-stall-in-synchronous-compaction-for-thp-allocations-v3
Applying: mm: reduce the amount of work done when updating min_free_kbytes
Applying: mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes-checkpatch-fixes
Applying: mm: avoid livelock on !__GFP_FS allocations
Applying: mm: account reaped page cache on inode cache pruning
Applying: hugetlb: detect race upon page allocation failure during COW
Applying: hugetlb: clarify hugetlb_instantiation_mutex usage
Applying: mm/hugetlb.c: fix virtual address handling in hugetlb fault
Applying: mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault-fix
Applying: kernel.h: add BUILD_BUG() macro
Applying: kernel.h: Add BUILD_BUG() macro.
Applying: hugetlb: replace BUG() with BUILD_BUG() for dummy definitions
Applying: mm: more intensive memory corruption debugging
Applying: mm-more-intensive-memory-corruption-debug-fix
Applying: PM/Hibernate: do not count debug pages as savable
Applying: slub: min order when debug_guardpage_minorder > 0
Applying: fadvise: only initiate writeback for specified range with FADV_DONTNEED
Applying: mm, debug: test for online nid when allocating on single node
Applying: vmscan: add task name to warn_scan_unevictable() messages
Applying: mm: exclude reserved pages from dirtyable memory
Applying: mm-exclude-reserved-pages-from-dirtyable-memory-fix
Applying: mm: writeback: cleanups in preparation for per-zone dirty limits
Applying: mm: try to distribute dirty pages fairly across zones
Applying: mm: filemap: pass __GFP_WRITE from grab_cache_page_write_begin()
Applying: Btrfs: pass __GFP_WRITE for buffered write page allocations
Applying: mm: compaction: push isolate search base of compact control one pfn ahead
Applying: hpet: factor timer allocate from open
Applying: intel_idle: fix API misuse
Applying: intel_idle: disable auto_demotion for hotplugged CPUs
Applying: kernel.h: neaten panic prototype
Applying: include/linux/linkage.h: remove unused NORET_AND macro
Applying: treewide: remove useless NORET_TYPE macro and uses
Applying: treewide: convert uses of ATTRIB_NORETURN to __noreturn
Applying: treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes
Applying: include/linux/linkage.h: remove unused ATTRIB_NORET macro
Applying: mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL
Applying: mm,x86,um: move CMPXCHG_LOCAL config option
Applying: mm,x86,um: move CMPXCHG_DOUBLE config option
Applying: audit: always follow va_copy() with va_end()
Applying: brlocks/lglocks: clean up code
Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
Applying: include/log2.h: fix rounddown_pow_of_two(1)
Applying: get_maintainers.pl: follow renames when looking up commit signers
Applying: backlight: remove ADX backlight device support
Applying: leds: convert led platform drivers to module_platform_driver
Applying: leds: convert led i2c drivers to module_i2c_driver
Applying: leds: convert leds-dac124s085 to module_spi_driver
Applying: lib: add GENERIC_PCI_IOMAP
Applying: checkpatch: update signature "might be better as" warning
Applying: checkpatch: prefer __printf over __attribute__((format(printf,...)))
Applying: crc32: optimize inner loop
Applying: epoll: limit paths
Applying: fs: binfmt_elf: create Kconfig variable for PIE randomization
Applying: MIPS: randomize PIE load address
Applying: drivers/rtc/rtc-cmos.c: fix broken NVRAM bank 2 writing
Applying: drivers/rtc/rtc-mxc.c: fix setting time for MX1 SoC
Applying: drivers-rtc-rtc-mxcc-fix-setting-time-for-mx1-soc-fix
Applying: drivers/rtc/rtc-mxc.c: make alarm work
Applying: drivers-rtc-rtc-mxcc-make-alarm-work-fix
Applying: rtc/ab8500: don't disable IRQ:s when suspending
Applying: rtc/ab8500: set can_wake flag
Applying: rtc/ab8500: change to mdelay
Applying: rtc/ab8500: Add calibration attribute to AB8500 RTC
Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-checkpatch-fixes
Applying: reiserfs: delete comments refering to the BKL
Applying: reiserfs: delay reiserfs lock until journal initialization
Applying: reiserfs: don't lock journal_init()
Applying: reiserfs: don't lock root inode searching
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: cgroup: Fix task counter common ancestor logic
Applying: cgroup-fix-task-counter-common-ancestor-logic-checkpatch-fixes
Applying: mm: memcg: consolidate hierarchy iteration primitives
Applying: mm: vmscan: distinguish global reclaim from global LRU scanning
Applying: mm: vmscan: distinguish between memcg triggering reclaim and memcg being scanned
Applying: mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes
Applying: mm: memcg: per-priority per-zone hierarchy scan generations
Applying: mm: move memcg hierarchy reclaim to generic reclaim code
Applying: mm: memcg: remove optimization of keeping the root_mem_cgroup LRU lists empty
Applying: mm: vmscan: convert global reclaim to per-memcg LRU lists
Applying: mm: collect LRU list heads into struct lruvec
Applying: mm: make per-memcg LRU lists exclusive
Applying: mm: memcg: remove unused node/section info from pc->flags
Applying: mm: memcg: remove unused node/section info from pc->flags fix
Applying: memcg: make mem_cgroup_split_huge_fixup() more efficient
Applying: memcg-make-mem_cgroup_split_huge_fixup-more-efficient-fix
Applying: mm: memcg: shorten preempt-disabled section around event checks
Applying: Documentation/cgroups/memory.txt: fix typo
Applying: memcg: fix pgpgin/pgpgout documentation
Applying: thp: improve the error code path
Applying: thp: remove unnecessary tlb flush for mprotect
Applying: thp: add tlb_remove_pmd_tlb_entry
Applying: thp: improve order in lru list for split huge page
Applying: procfs: make proc_get_link to use dentry instead of inode
Applying: procfs: introduce the /proc/<pid>/map_files/ directory
Applying: procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes
Applying: procfs: parse mount options
Applying: procfs: add hidepid= and gid= mount options
Applying: workqueue: make alloc_workqueue() take printf fmt and args for name
Applying: workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-fix
Applying: cpumask: update setup_node_to_cpumask_map() comments
Applying: kexec: remove KMSG_DUMP_KEXEC
Applying: kdump: add missing RAM resource in crash_shrink_memory()
Applying: kdump: add udev events for memory online/offline
Applying: kdump: crashk_res init check for /sys/kernel/kexec_crash_size
Applying: ipc/mqueue: simplify reading msgqueue limit
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: user namespace: make signal.c respect user namespaces
Applying: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2)
Applying: drivers/memstick: use kmemdup rather than duplicating its implementation
Applying: fs/direct-io.c: calculate 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: fix use of rounddown_pow_of_two()
Applying: ramoops: update parameters only after successful init
Applying: unlzo: Fix input buffer free
Applying: cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix
Merging akpm (0993075 cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix)
[master a3a0e7c] Revert "include/net/netprio_cgroup.h: various fixes"

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

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

end of thread, other threads:[~2023-12-01  2:37 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-01  4:49 linux-next: Tree for Dec 1 Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2023-12-01  2:37 Stephen Rothwell
2021-12-01  5:37 Stephen Rothwell
2020-12-01 10:03 Stephen Rothwell
2017-12-01  2:53 Stephen Rothwell
2016-12-01  6:42 Stephen Rothwell
2016-12-01 20:17 ` Randy Dunlap
2016-12-01 20:23   ` Stephen Rothwell
2014-12-01 10:10 Stephen Rothwell
2011-12-01  4:53 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).