LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: Tree for Sep 1
@ 2021-09-01  8:17 Stephen Rothwell
  2021-09-01 20:55 ` linux-next: Tree for Sep 1 [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko] Randy Dunlap
  0 siblings, 1 reply; 40+ messages in thread
From: Stephen Rothwell @ 2021-09-01  8:17 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Please do not add any v5.16 related code to your linux-next included
branches until after v5.15-rc1 has been released.

Changes since 20210831:

Linus' tree gained a build failure for which I applied patch.

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

The vhost tree gained conflicts against the driver-core, amr-soc and
Linus' trees.

Non-merge commits (relative to Linus' tree): 8758
 8720 files changed, 505899 insertions(+), 201490 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 334 trees (counting Linus' and 90 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 (a998a62be9cd Merge tag 'leds-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds)
Merging fixes/fixes (614124bea77e Linux 5.13-rc5)
Merging kbuild-current/fixes (36a21d51725a Linux 5.14-rc5)
Merging arc-current/for-curr (7c60610d4767 Linux 5.14-rc6)
Merging arm-current/fixes (463dbba4d189 ARM: 9104/2: Fix Keystone 2 kernel mapping regression)
Merging arm64-fixes/for-next/fixes (3eb9cdffb397 Partially revert "arm64/mm: drop HAVE_ARCH_PFN_VALID")
Merging arm-soc-fixes/arm/fixes (6c35ca069741 Merge tag 'reset-fixes-for-v5.14' of git://git.pengutronix.de/pza/linux into arm/fixes)
Merging drivers-memory-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
Merging m68k-current/for-linus (87d93029fe83 m68k: Fix asm register constraints for atomic ops)
Merging powerpc-fixes/fixes (787c70f2f999 powerpc/64s: Fix scv implicit soft-mask table for relocated kernels)
Merging s390-fixes/fixes (c7a5238ef68b Merge tag 's390-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging sparc/master (05a59d79793d Merge git://git.kernel.org:/pub/scm/linux/kernel/git/netdev/net)
Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files)
Merging net/master (57f780f1c433 atlantic: Fix driver resume flow.)
Merging bpf/master (57f780f1c433 atlantic: Fix driver resume flow.)
Merging ipsec/master (57f780f1c433 atlantic: Fix driver resume flow.)
Merging netfilter/master (d7e7747ac5c2 netfilter: refuse insertion if chain has grown too large)
Merging ipvs/master (e3245a7b7b34 netfilter: nft_ct: protect nft_ct_pcpu_template_refcnt with mutex)
Merging wireless-drivers/master (abf3d98dee7c mt76: fix enum type mismatch)
Merging mac80211/master (57f780f1c433 atlantic: Fix driver resume flow.)
Merging rdma-fixes/for-rc (cc4f596cf85e RDMA/rxe: Zero out index member of struct rxe_queue)
Merging sound-current/for-linus (a8729efbbb84 Merge tag 'asoc-v5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc-fixes/for-linus (38b767300094 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus)
Merging regmap-fixes/for-linus (e22ce8eb631b Linux 5.14-rc7)
Merging regulator-fixes/for-linus (c1ff86006574 Merge remote-tracking branch 'regulator/for-5.14' into regulator-linus)
Merging spi-fixes/for-linus (d5f78f50fff3 Merge remote-tracking branch 'spi/for-5.14' into spi-linus)
Merging pci-current/for-linus (045a9277b561 PCI/sysfs: Use correct variable for the legacy_mem sysfs object)
Merging driver-core.current/driver-core-linus (36a21d51725a Linux 5.14-rc5)
Merging tty.current/tty-linus (36a21d51725a Linux 5.14-rc5)
Merging usb.current/usb-linus (068fdad20454 usb: gadget: u_audio: fix race condition on endpoint stop)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (dcf097e7d21f USB: serial: pl2303: fix GL type detection)
Merging usb-chipidea-fixes/for-usb-fixes (5df09c15bab9 usb: cdnsp: Fix the IMAN_IE_SET and IMAN_IE_CLEAR macro)
Merging phy/fixes (e73f0f0ee754 Linux 5.14-rc1)
Merging staging.current/staging-linus (7c60610d4767 Linux 5.14-rc6)
Merging iio-fixes/fixes-togreg (ce9e3d5989e5 iio: adc128s052: Fix the error handling path of 'adc128_probe()')
Merging char-misc.current/char-misc-linus (e22ce8eb631b Linux 5.14-rc7)
Merging soundwire-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
Merging thunderbolt-fixes/fixes (7d2a07b76933 Linux 5.14)
Merging input-current/for-linus (818b26588994 Merge branch 'next' into for-linus)
Merging crypto-current/master (6ae51ffe5e76 crypto: sha512 - remove imaginary and mystifying clearing of variables)
Merging vfio-fixes/for-linus (dc51ff91cf2d vfio/platform: fix module_put call in error flow)
Merging kselftest-fixes/fixes (567c39047dbe selftests/sgx: Fix Q1 and Q2 calculation in sigstruct.c)
Merging modules-fixes/modules-linus (055f23b74b20 module: check for exit sections in layout_sections() instead of module_init_section())
Merging dmaengine-fixes/fixes (7199ddede9f0 dmaengine: imx-dma: configure the generic DMA type to make it work)
Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
Merging mtd-fixes/mtd/fixes (b48027083a78 mtd: rawnand: Fix probe failure due to of_get_nand_secure_regions())
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
Merging v4l-dvb-fixes/fixes (f1de1c780359 media: atmel: fix build when ISC=m and XISC=y)
Merging reset-fixes/reset/fixes (ed104ca4bd9c reset: reset-zynqmp: Fixed the argument data type)
Merging mips-fixes/mips-fixes (6aa32467299e MIPS: check return value of pgtable_pmd_page_ctor)
Merging at91-fixes/at91-fixes (6efb943b8616 Linux 5.13-rc1)
Merging omap-fixes/fixes (e879f855e590 bus: ti-sysc: Add break in switch statement in sysc_init_soc())
Merging kvm-fixes/master (c7dfa4009965 KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656))
Merging kvms390-fixes/master (cd4220d23bf3 KVM: selftests: do not require 64GB in set_memory_region_test)
Merging hwmon-fixes/hwmon (276281b8e898 hwmon: sht4x: update Documentation for Malformed table)
Merging nvdimm-fixes/libnvdimm-fixes (32b2397c1e56 libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbind)
Merging cxl-fixes/fixes (fae8817ae804 cxl/mem: Fix memory device capacity probing)
Merging btrfs-fixes/next-fixes (01e9fcf19c13 Merge branch 'misc-5.14' into next-fixes)
Merging vfs-fixes/fixes (173e84953eaa fs: fix reporting supported extra file attributes for statx())
Merging dma-mapping-fixes/for-linus (18a3c5f7abfd Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1)
Merging drivers-x86-fixes/fixes (1e35b8a7780a platform/x86: gigabyte-wmi: add support for B450M S2H V2)
Merging samsung-krzk-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
Merging pinctrl-samsung-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
Merging devicetree-fixes/dt/linus (50d8d7e19c43 dt-bindings: display: renesas,du: Make resets optional on R-Car H1)
Merging scsi-fixes/fixes (02c6dcd543f8 scsi: core: Fix hang of freezing queue between blocking and running device)
Merging drm-fixes/drm-fixes (7d2a07b76933 Linux 5.14)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (7d2a07b76933 Linux 5.14)
Merging mmc-fixes/fixes (885814a97f5a Revert "mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711")
Merging rtc-fixes/rtc-fixes (bd33335aa93d rtc: cmos: Disable irq around direct invocation of cmos_interrupt())
Merging gnss-fixes/gnss-linus (e73f0f0ee754 Linux 5.14-rc1)
Merging hyperv-fixes/hyperv-fixes (f5a11c69b699 Revert "x86/hyperv: fix logical processor creation")
Merging soc-fsl-fixes/fix (c1e64c0aec8c soc: fsl: qe: fix static checker warning)
Merging risc-v-fixes/fixes (417166ddec02 riscv: dts: microchip: Add ethernet0 to the aliases node)
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
Merging fpga-fixes/fixes (1d345c3e5941 fpga: machxo2-spi: Fix missing error code in machxo2_write_complete())
Merging spdx/spdx-linus (36a21d51725a Linux 5.14-rc5)
Merging gpio-brgl-fixes/gpio/for-current (9b87f43537ac gpio: tqmx86: really make IRQ optional)
Merging gpio-intel-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
Merging pinctrl-intel-fixes/fixes (2f658f7a3953 pinctrl: tigerlake: Fix GPIO mapping for newer version of software)
Merging erofs-fixes/fixes (0852b6ca941e erofs: fix 1 lcluster-sized pcluster for big pcluster)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (2734d6c1b1a0 Linux 5.14-rc2)
Merging ubifs-fixes/fixes (78c7d49f55d8 ubifs: journal: Make sure to not dirty twice for auth nodes)
Merging memblock-fixes/fixes (024591f9a6e0 arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM)
Merging cel-fixes/for-rc (9f4ad9e425a1 Linux 5.12)
Merging irqchip-fixes/irq/irqchip-fixes (1fee9db9b42d irqchip/mips: Fix RCU violation when using irqdomain lookup on interrupt entry)
Merging renesas-fixes/fixes (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
Merging drm-misc-fixes/for-linux-next-fixes (fa0b1ef5f7a6 drm: Copy drm_wait_vblank to user before returning)
Merging kspp-gustavo/for-next/kspp (7bc04ce6b914 Makefile: Enable -Wimplicit-fallthrough for Clang)
Merging kbuild/for-next (087e856cfb76 kbuild: redo fake deps at include/ksym/*.h)
Merging compiler-attributes/compiler-attributes (7ed012969bbc Compiler Attributes: fix __has_attribute(__no_sanitize_coverage__) for GCC 4)
CONFLICT (content): Merge conflict in include/linux/compiler_attributes.h
Merging dma-mapping/for-next (c1dec343d7ab hexagon: use the generic global coherent pool)
Merging asm-generic/master (8f76f9c46952 bitops/non-atomic: make @nr unsigned to avoid any DIV)
CONFLICT (content): Merge conflict in include/asm-generic/bitops/non-atomic.h
Merging arc/for-next (56809a28d45f ARC: mm: vmalloc sync from kernel to user table to update PMD ...)
Merging arm/for-next (1c9b5911f53b Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (65266a7c6abf Merge remote-tracking branch 'tip/sched/arm64' into for-next/core)
Merging arm-perf/for-next/perf (fd264b310579 arm64/perf: Replace '0xf' instances with ID_AA64DFR0_PMUVER_IMP_DEF)
Merging arm-soc/for-next (5e115b419d2b soc: document merges)
CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (6285af2a2821 Merge tags 'amlogic-arm-configs-for-v5.15', 'amlogic-arm64-dt-for-v5.15' and 'amlogic-arm-dt-for-v5.15' into for-next)
Merging aspeed/for-next (0f32f00af344 Merge branches 'dt-for-v5.15', 'soc-for-v5.15' and 'defconfig-for-v5.15' into for-next)
Merging at91/at91-next (b102356e5bc1 Merge branch 'at91-dt' into at91-next)
Merging drivers-memory/for-next (c28b584deb1b Merge branch 'for-v5.15/omap-gpmc' into for-next)
Merging imx-mxs/for-next (2cb411d89676 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (69862ae4e378 Merge branch 'v5.14-next/soc' into for-next)
Merging mvebu/for-next (930af8dda750 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (7911f95d1713 Merge branch 'fixes' into for-next)
Merging qcom/for-next (57249830120b Merge remote-tracking branch 'refs/remotes/origin/for-next' into for-next)
Merging raspberrypi/for-next (b1f2fcb28228 ARM: dts: bcm283x: Fix VEC address for BCM2711)
Merging renesas/next (59d7f78144a8 Merge branches 'renesas-arm-dt-for-v5.15' and 'renesas-drivers-for-v5.15' into renesas-next)
Merging reset/reset/next (09f3824342f6 reset: simple: remove ZTE details in Kconfig help)
Merging rockchip/for-next (d46148623f26 Merge branch 'v5.15-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (90861bf54255 Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (7c414a7d93c6 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 (1e6bc5987a52 ARM: dts: stm32: Update AV96 adv7513 node per dtbs_check)
Merging sunxi/sunxi/for-next (3f1c53207cf0 Merge branches 'sunxi/dt-for-5.14' and 'sunxi/fixes-for-5.13' into sunxi/for-next)
Merging tegra/for-next (cc701ccede61 Merge branch for-5.15/arm64/dt 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 (c1fa5ac6c2f4 arm64: dts: ti: k3-am642-sk: Add pwm nodes)
Merging xilinx/for-next (4d7e3c8de98e Merge branch 'zynqmp/dt' of https://github.com/Xilinx/linux-xlnx into for-next)
Merging clk/clk-next (5fad6cff0fb8 Merge branch 'clk-qcom' into clk-next)
Merging clk-imx/for-next (86842d255b45 clk: imx8mn: Add M7 core clock)
Merging clk-renesas/renesas-clk (e8425dd55abb clk: renesas: Make CLK_R9A06G032 invisible)
Merging clk-samsung/for-next (a38fd8748464 Linux 5.12-rc2)
Merging csky/linux-next (90dc8c0e664e csky: Kconfig: Remove unused selects)
Merging h8300/h8300-next (1ec10274d436 h8300: don't implement set_fs)
Merging m68k/for-next (87d93029fe83 m68k: Fix asm register constraints for atomic ops)
Merging m68knommu/for-next (db87db65c105 m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch)
Merging microblaze/next (315511166469 microblaze: move core-y in arch/microblaze/Makefile to arch/microblaze/Kbuild)
Merging mips/mips-next (71f8817c28e2 MIPS: ingenic: Unconditionally enable clock of CPU #0)
Merging nds32/next (40e0dd851e7b nds32: Fix bogus reference to <asm/procinfo.h>)
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
Merging openrisc/for-next (1955d843efc3 openrisc/litex: Update defconfig)
Merging parisc-hd/for-next (a59d984c56c8 drivers: parisc: ccio-dma.c: Added tab instead of spaces)
Merging powerpc/next (57dbbe590f15 powerpc/pseries/iommu: Rename "direct window" to "dma window")
CONFLICT (content): Merge conflict in arch/powerpc/sysdev/xive/common.c
Merging soc-fsl/next (242b0b398ccd soc: fsl: enable acpi support in RCPM driver)
Merging risc-v/for-next (c24a19674258 riscv: add support for hugepage migration)
Merging s390/for-next (81912856e0fb s390/configs: enable CONFIG_KFENCE in debug_defconfig)
Merging sh/for-next (2882b7626f49 sh: kernel: traps: remove unused variable)
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 (adf9ae0d159d um: fix stub location calculation)
Merging xtensa/xtensa-for-next (7b7cec477fc3 xtensa: move core-y in arch/xtensa/Makefile to arch/xtensa/Kbuild)
Merging pidfd/for-next (f4dd02cd8631 Merge branch 'kernel.sys' into for-next)
Merging fscrypt/master (38ef66b05cfa fscrypt: document struct fscrypt_operations)
Merging fscache/fscache-next (20ec197bfa13 fscache: Use refcount_t for the cookie refcount instead of atomic_t)
Merging afs/afs-next (7af08140979a Revert "gcov: clang: fix clang-11+ build")
Merging btrfs/for-next (1efc6199e6b9 Merge branch 'for-next-current-v5.14-20210830' into for-next-20210830)
Merging ceph/master (a9e6ffbc5b73 ceph: fix possible null-pointer dereference in ceph_mdsmap_decode())
Merging cifs/for-next (3998f0b8bc49 cifs: Do not leak EDEADLK to dgetents64 for STATUS_USER_SESSION_DELETED)
Merging cifsd/cifsd-for-next (7d5d8d715689 ksmbd: fix __write_overflow warning in ndr_read_string)
Merging configfs/for-next (c42dd069be8d configfs: fix a race in configfs_lookup())
Merging ecryptfs/next (682a8e2b41ef Merge tag 'ecryptfs-5.13-rc1-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs)
Merging erofs/dev (1266b4a7ecb6 erofs: fix double free of 'copied')
Merging exfat/dev (50be9417e23a Merge tag 'io_uring-5.14-2021-07-09' of git://git.kernel.dk/linux-block)
Merging ext3/for_next (ed518dd035fa Pull udf xattr sanity checks.)
Merging ext4/dev (3e5533948c16 ext4: Improve scalability of ext4 orphan file handling)
Merging f2fs/dev (9605f75cf36e f2fs: should put a page beyond EOF when preparing a write)
CONFLICT (content): Merge conflict in fs/f2fs/file.c
Applying: fxup for "f2fs: Convert to using invalidate_lock"
Merging fsverity/fsverity (07c99001312c fs-verity: support reading signature with ioctl)
Merging fuse/for-next (a8c6f1876b08 fuse: remove unused arg in fuse_write_file_get())
Merging gfs2/for-next (08d736667185 gfs2: Remove redundant check from gfs2_glock_dq)
Merging jfs/jfs-next (5d299f44d765 jfs: Avoid field-overflowing memcpy())
Merging nfs/linux-next (2734d6c1b1a0 Linux 5.14-rc2)
Merging nfs-anna/linux-next (2a7a451a9084 NFSv4.1 add network transport when session trunking is detected)
Merging nfsd/nfsd-next (e22ce8eb631b Linux 5.14-rc7)
Merging cel/for-next (0bcc7ca40bd8 nfsd: fix crash on LOCKT on reexported NFSv3)
Merging ntfs3/master (d3624466b56d fs/ntfs3: Restyle comments to better align with kernel-doc)
Merging orangefs/for-next (0fdec1b3c9fb orangefs: fix orangefs df output.)
Merging overlayfs/overlayfs-next (332f606b32b6 ovl: enable RCU'd ->get_acl())
Applying: ntfs3: fix up for "vfs: add rcu argument to ->get_acl() callback"
Merging ubifs/next (a801fcfeef96 ubifs: Set/Clear I_LINKABLE under i_lock for whiteout inode)
Merging v9fs/9p-next (732b33d0dbf1 9p/xen: Fix end of loop tests for list_for_each_entry)
Merging xfs/for-next (f38a032b165d xfs: fix I_DONTCACHE)
Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check)
Merging iomap/iomap-for-next (03b8df8d43ec iomap: standardize tracepoint formatting and storage)
Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID)
Merging file-locks/locks-next (b91db6a0b52e Merge tag 'for-5.15/io_uring-vfs-2021-08-30' of git://git.kernel.dk/linux-block)
Merging vfs/for-next (2cfbffc62045 Merge branch 'work.init' into for-next)
Merging printk/for-next (c57343431170 Merge branch 'for-5.15-printk-index' into for-next)
Merging pci/next (5d7cf8d4793b Merge branch 'remotes/lorenzo/pci/tools')
CONFLICT (content): Merge conflict in MAINTAINERS
Merging pstore/for-next/pstore (c5d4fb2539ca pstore/blk: Use "%lu" to format unsigned long)
Merging hid/for-next (0c4e5ab97d2d Merge branch 'for-5.14/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (cc1dbdeb17dd Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i3c/i3c/next (e73f0f0ee754 Linux 5.14-rc1)
Merging dmi/dmi-for-next (3cb4d29a2633 MAINTAINERS: The DMI/SMBIOS tree has moved)
Merging hwmon-staging/hwmon-next (0e35f63f7f4e hwmon: add driver for Aquacomputer D5 Next)
Merging jc_docs/docs-next (630c8fa02f9a Documentation: Update details of The Linux Kernel Module Programming Guide)
Merging v4l-dvb/master (9c3a0f285248 Merge tag 'v5.14-rc4' into media_tree)
Merging v4l-dvb-next/master (d62cd4d277cc media: uvcvideo: Remove unused including <linux/version.h>)
Merging pm/linux-next (103d2fac60d0 Merge branches 'pm-opp' and 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (f0712ace7fe0 cpufreq: qcom-hw: Set dvfs_possible_from_any_cpu cpufreq driver flag)
Merging cpupower/cpupower (5499f2b80b56 tools: cpupower: fix typo in cpupower-idle-set(1) manpage)
Merging devfreq/devfreq-next (e73f0f0ee754 Linux 5.14-rc1)
Merging opp/opp/linux-next (94274f20f6bf dt-bindings: opp: Convert to DT schema)
Merging thermal/thermal/linux-next (da6deb655a58 thermal/drivers/qcom/spmi-adc-tm5: Don't abort probing if a sensor is not used)
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (aee742c9928a fs: dlm: fix return -EINTR on recovery stopped)
Merging swiotlb/linux-next (f3c4b1341e83 swiotlb: use depends on for DMA_RESTRICTED_POOL)
CONFLICT (content): Merge conflict in kernel/dma/direct.c
Merging rdma/for-next (6a217437f9f5 Merge branch 'sg_nents' into rdma.git for-next)
Merging net-next/master (9e9fb7655ed5 Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
CONFLICT (content): Merge conflict in drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
CONFLICT (modify/delete): drivers/staging/rtl8188eu/os_dep/os_intfs.c deleted in HEAD and modified in net-next/master. Version net-next/master of drivers/staging/rtl8188eu/os_dep/os_intfs.c left in tree.
CONFLICT (modify/delete): drivers/staging/rtl8188eu/os_dep/ioctl_linux.c deleted in HEAD and modified in net-next/master. Version net-next/master of drivers/staging/rtl8188eu/os_dep/ioctl_linux.c left in tree.
CONFLICT (modify/delete): drivers/staging/rtl8188eu/include/osdep_intf.h deleted in HEAD and modified in net-next/master. Version net-next/master of drivers/staging/rtl8188eu/include/osdep_intf.h left in tree.
CONFLICT (content): Merge conflict in drivers/staging/r8188eu/os_dep/rtw_android.c
CONFLICT (content): Merge conflict in drivers/staging/r8188eu/include/rtw_android.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnxt/bnxt.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnx2.c
CONFLICT (content): Merge conflict in MAINTAINERS
$ git rm -f drivers/staging/rtl8188eu/include/osdep_intf.h drivers/staging/rtl8188eu/os_dep/ioctl_linux.c drivers/staging/rtl8188eu/os_dep/os_intfs.c
Applying: NET_VENDOR_CIRRUS is not ready for COMPILE_TEST
Merging bpf-next/for-next (a16ef91aa61a net: pasemi: Remove usage of the deprecated "pci-dma-compat.h" API)
Merging ipsec-next/master (a16ef91aa61a net: pasemi: Remove usage of the deprecated "pci-dma-compat.h" API)
Merging mlx5-next/mlx5-next (598fe77df855 net/mlx5: Lag, Create shared FDB when in switchdev mode)
Merging netfilter-next/master (9dfa859da0f5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next)
Merging ipvs-next/master (7bc416f14716 netfilter: x_tables: handle xt_register_template() returning an error value)
Merging wireless-drivers-next/master (eaf2aaec0be4 Merge tag 'wireless-drivers-next-2021-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next)
Merging bluetooth/master (35191a0fe986 Bluetooth: btintel: Read boot address irrespective of controller mode)
Merging mac80211-next/master (464a57281f29 net/mlxbf_gige: Make use of devm_platform_ioremap_resourcexxx())
Merging mtd/mtd/next (ee28b42006c3 mtd_blkdevs: simplify the refcounting in blktrans_{open, release})
Merging nand/nand/next (6b430c7595e4 mtd: rawnand: cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()')
Merging spi-nor/spi-nor/next (2734d6c1b1a0 Linux 5.14-rc2)
Merging crypto/master (6ae51ffe5e76 crypto: sha512 - remove imaginary and mystifying clearing of variables)
Merging drm/drm-next (8f0284f190e6 Merge tag 'amd-drm-next-5.15-2021-08-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dp/dp_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_device_info.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_pci.c
CONFLICT (modify/delete): drivers/gpu/drm/i915/i915_globals.c deleted in drm/drm-next and modified in HEAD. Version HEAD of drivers/gpu/drm/i915/i915_globals.c left in tree.
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
CONFLICT (content): Merge conflict in drivers/firmware/Makefile
$ git rm -f drivers/gpu/drm/i915/i915_globals.c
Applying: drm/i915: use linux/stddef.h due to "isystem: trim/fixup stdarg.h and other headers"
Applying: drm/mediatek: merge fix for "Add AAL output size configuration"
Applying: drm/i915/ttm: fix up for "lib/scatterlist: Provide a dedicated function to support tableappend"
Merging drm-misc/for-linux-next (efcefc712729 drm/ttm: Fix ttm_bo_move_memcpy() for subclassed struct ttm_resource)
Merging amdgpu/drm-next (d0ff32e5b648 drm/radeon: Add HD-audio component notifier support (v2))
Merging drm-intel/for-linux-next (fb43ebc83e06 drm/i915/selftest: Fix use of err in igt_reset_{fail, nop}_engine())
Merging drm-tegra/drm/tegra/for-next (fed028939417 gpu: host1x: debug: Dump DMASTART and DMAEND register)
Merging drm-msm/msm-next (cb0927ab80d2 drm/msi/mdp4: populate priv->kms in mdp4_kms_init)
Merging imx-drm/imx-drm/next (0927a71fd0ed gpu: ipu-v3: image-convert: use swap())
Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function)
Merging regmap/for-next (ca5537c9be13 Merge remote-tracking branch 'regmap/for-5.15' into regmap-next)
Merging sound/for-next (a8729efbbb84 Merge tag 'asoc-v5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc/for-next (38b767300094 Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus)
Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer)
Merging input/next (247141f5286b dt-bindings: input: tsc2005: Convert to YAML schema)
Merging block/for-next (0fedff25ca5a Merge branch 'for-5.15/io_uring' into for-next)
Merging device-mapper/for-next (d3703ef33129 dm crypt: use in_hardirq() instead of deprecated in_irq())
Merging pcmcia/pcmcia-next (e39cdacf2f66 pcmcia: i82092: fix a null pointer dereference bug)
Merging mmc/next (a75c95616297 Merge branch 'fixes' into next)
Merging mfd/for-mfd-next (be722576fd63 dt-bindings: mfd: Add Broadcom CRU)
Merging backlight/for-backlight-next (79fad92f2e59 backlight: pwm_bl: Improve bootloader/kernel device handover)
Merging battery/for-next (c9398455b046 power: supply: core: Fix parsing of battery chemistry/technology)
Merging regulator/for-next (7aa6d700b089 Merge remote-tracking branch 'regulator/for-5.15' into regulator-next)
Merging security/next-testing (047843bdb316 Merge branch 'landlock_lsm_v34' into next-testing)
Merging apparmor/apparmor-next (d108370c644b apparmor: fix error check)
Merging integrity/next-integrity (cb181da16196 IMA: reject unknown hash algorithms in ima_get_hash_algo)
Applying: dm ima: fix for "ima: Add digest and digest_len params to the functions to measure a buffer"
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 (893c47d1964f selinux: return early for possible NULL audit buffers)
Merging smack/next (bfc3cac0c761 smack: mark 'smack_enabled' global variable as __initdata)
Merging tomoyo/master (7d2a07b76933 Linux 5.14)
Merging tpmdd/next (f985911b7bc7 crypto: public_key: fix overflow during implicit conversion)
Merging watchdog/master (41e73feb1024 dt-bindings: watchdog: Add compatible for Mediatek MT7986)
Merging iommu/next (d8768d7eb9c2 Merge branches 'apple/dart', 'arm/smmu', 'iommu/fixes', 'x86/amd', 'x86/vt-d' and 'core' into next)
Merging audit/next (67d69e9d1a6c audit: move put_tree() to avoid trim_trees refcount underflow and UAF)
Merging devicetree/for-next (b1e202503508 dt-bindings: display: remove zte,vou.txt binding doc)
CONFLICT (modify/delete): Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt deleted in devicetree/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt left in tree.
$ git rm -f Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
Applying: dt-bindings: arm: mediatek: mmsys: fixup for conversion to yaml
Merging mailbox/mailbox-for-next (e5c11ee31060 mailbox: qcom-apcs-ipc: Add compatible for MSM8953 SoC)
Merging spi/for-next (6e9c846aa0c5 Merge remote-tracking branch 'spi/for-5.15' into spi-next)
Merging tip/auto-latest (689db7cba0d8 Merge branch 'locking/debug')
Merging clockevents/timers/drivers/next (f196ae282070 dt-bindings: timer: Add ABIs for new Ingenic SoCs)
Merging edac/edac-for-next (cf4e6d52f583 EDAC/i10nm: Retrieve and print retry_rd_err_log registers)
Merging irqchip/irq/irqchip-next (6e3b473ee064 Merge branch irq/qcom-pdc-nowake-cleanup into irq/irqchip-next)
Merging ftrace/for-next (297e1dcdca3d selftests/ftrace: Add selftest for testing duplicate eprobes and kprobes)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging rcu/rcu/next (38babc43f45e rcutorture: Avoid problematic critical section nesting on PREEMPT_RT)
CONFLICT (content): Merge conflict in kernel/time/tick-internal.h
Merging kvm/next (43e540cc9f2c KVM: SVM: Add 5-level page table support for SVM)
Merging kvm-arm/next (419025b3b419 Merge branch kvm-arm64/misc-5.15 into kvmarm-master/next)
Merging kvm-ppc/kvm-ppc-next (72476aaa4691 KVM: PPC: Book3S HV: Fix host radix SLB optimisation with hash guests)
Merging kvms390/next (a3e03bc1368c KVM: s390: index kvm->arch.idle_mask by vcpu_idx)
Merging xen-tip/linux-next (1a0df28c0983 x86: xen: platform-pci-unplug: use pr_err() and pr_warn() instead of raw printk())
Merging percpu/for-next (a81a52b325ec Merge branch 'for-5.14-fixes' into for-next)
Merging workqueues/for-next (bdb0a6548d22 workqueue: Remove unused WORK_NO_COLOR)
Merging drivers-x86/for-next (0487d4fc42d7 platform/x86: dell-smbios-wmi: Add missing kfree in error-exit from run_smbios_call)
Merging chrome-platform/for-next (4665584888ad platform/chrome: cros_ec_trace: Fix format warnings)
Merging hsi/for-next (e73f0f0ee754 Linux 5.14-rc1)
Merging leds/for-next (239f32b4f161 leds: pca955x: Switch to i2c probe_new)
Merging ipmi/for-next (bf064c7bec3b char: ipmi: use DEVICE_ATTR helper macro)
Merging driver-core/driver-core-next (049d1693db78 MAINTAINERS: Add dri-devel for component.[hc])
CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c
Merging usb/usb-next (9c1587d99f93 usb: isp1760: otg control register access)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/sc7280.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/sc7280-idp.dts
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (a65ab973c166 USB: serial: replace symbolic permissions by octal permissions)
Merging usb-chipidea-next/for-usb-next (e5d6a7c6cfae usb: chipidea: host: fix port index underflow and UBSAN complains)
Merging tty/tty-next (2e5f3a69b6fc tty: serial: uartlite: Use read_poll_timeout for a polling loop)
Merging char-misc/char-misc-next (0dc3ad3f859d Revert "bus: mhi: Add inbound buffers allocation flag")
CONFLICT (content): Merge conflict in drivers/misc/Kconfig
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
Merging extcon/extcon-next (07de34f5ce1e extcon: max3355: Drop unused include)
Merging phy-next/next (152a810eae03 phy: qcom-qmp: Add support for SM6115 UFS phy)
Merging soundwire/next (2564a2d4418b soundwire: cadence: do not extend reset delay)
Merging thunderbolt/next (42716425ad7e thunderbolt: Fix port linking by checking all adapters)
Merging vfio/next (ea870730d83f Merge branches 'v5.15/vfio/spdx-license-cleanups', 'v5.15/vfio/dma-valid-waited-v3', 'v5.15/vfio/vfio-pci-core-v5' and 'v5.15/vfio/vfio-ap' into v5.15/vfio/next)
CONFLICT (content): Merge conflict in drivers/vfio/pci/vfio_pci.c
Applying: fixup for "vfio/pci: Rename vfio_pci.c to vfio_pci_core.c"
Merging staging/staging-next (4adb389e08c9 staging: vt6655: Remove filenames in files)
Merging iio/togreg (d484c21bacfa iio: adc: Add driver for Renesas RZ/G2L A/D converter)
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 (8bf5d31c4f06 interconnect: qcom: osm-l3: Use driver-specific naming)
Merging dmaengine/next (11a427be2c47 dmaengine: sh: fix some NULL dereferences)
Merging cgroup/for-next (96aff80dde1b Merge branch 'for-5.15' into for-next)
Merging scsi/for-next (27f681116fdf Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/st.c
Merging scsi-mkp/for-next (9b5ac8ab4e8b scsi: ufs: Fix ufshcd_request_sense_async() for Samsung KLUFG8RHDA-B2D1)
Merging vhost/linux-next (4a3a6d9fb65f vdpa/mlx5: fix feature negotiation across device reset)
CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h
CONFLICT (content): Merge conflict in drivers/virtio/virtio.c
Merging rpmsg/for-next (c93ca5f21d93 Merge branches 'hwspinlock-next', '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 (889a1b3f35db gpio: mpc8xxx: Use 'devm_gpiochip_add_data()' to simplify the code and avoid a leak)
Merging gpio-intel/for-next (5111c2b6b019 gpio: dwapb: Get rid of legacy platform data)
Merging pinctrl/for-next (04853352952b Merge tag 'samsung-pinctrl-5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel)
Merging pinctrl-intel/for-next (2f658f7a3953 pinctrl: tigerlake: Fix GPIO mapping for newer version of software)
Merging pinctrl-renesas/renesas-pinctrl (c4c4637eb57f pinctrl: renesas: Add RZ/G2L pin and gpio controller driver)
Merging pinctrl-samsung/for-next (cdd3d945dcec pinctrl: samsung: Add Exynos850 SoC specific data)
Merging pwm/for-next (7954f76161ea pwm: ab8500: Fix register offset calculation to not depend on probe order)
Merging userns/for-next (a3be01837fc9 Merge of ucount-fixes-for-5.14, siginfo-si_trapno-for-v5.15, and exit-cleanups-for-v5.15 for testing in linux-next)
Merging ktest/for-next (170f4869e662 ktest.pl: Fix the logic for truncating the size of the log file for email)
Merging kselftest/next (67d6d80d90fb selftests/cpufreq: Rename DEBUG_PI_LIST to DEBUG_PLIST)
Merging livepatching/for-next (cd2d68f2d6b2 Merge branch 'for-5.15/cpu-hotplug' into for-next)
Merging coresight/next (1efbcec2ef8c coresight: cti: Reduce scope for the variable “cs_fwnode” in cti_plat_create_connection())
Merging rtc/rtc-next (8158da6a33f2 dt-bindings: rtc: add Epson RX-8025 and RX-8035)
Merging nvdimm/libnvdimm-for-next (bdd3c50d83bf dax: remove bdev_dax_supported)
Applying: fixup for "dax: remove bdev_dax_supported"
Merging at24/at24/for-next (658ae44345c1 dt-bindings: at24: add ON Semi CAT24C04 and CAT24C05)
Merging ntb/ntb-next (28293b6c68cd ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data)
Merging seccomp/for-next/seccomp (b4d8a58f8dcf seccomp: Fix setting loaded filter count during TSYNC)
Merging kspp/for-next/kspp (3103f67eb440 Merge branch 'for-next/overflow' into for-next/kspp)
CONFLICT (content): Merge conflict in Makefile
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons)
Merging fsi/next (9ab1428dfe2c fsi/sbefifo: Fix reset timeout)
Merging slimbus/for-next (e5c578adcdd9 slimbus: ngd: reset dma setup during runtime pm)
Merging nvmem/for-next (80c3356bea4e nvmem: nintendo-otp: Add new driver for the Wii and Wii U OTP)
Merging xarray/main (2c7e57a02708 idr test suite: Improve reporting from idr_find_test_1)
Merging hyperv/hyperv-next (9d68cd9120e4 hv_utils: Set the maximum packet size for VSS driver to the length of the receive buffer)
Merging auxdisplay/auxdisplay (24ebc044c72e auxdisplay: Replace symbolic permissions with octal permissions)
Merging kgdb/kgdb/for-next (e868f0a3c4b9 kdb: Rename members of struct kdbtab_t)
Merging hmm/hmm (79fbd3e1241c RDMA: Use the sg_table directly and remove the opencoded version from umem)
Merging fpga/for-next (4f45f3404960 spi: spi-altera-dfl: support n5010 feature revision)
Merging kunit/test (e73f0f0ee754 Linux 5.14-rc1)
Merging cfi/cfi/next (ff1176468d36 Linux 5.14-rc3)
Merging kunit-next/kunit (acd8e8407b8f kunit: Print test statistics on failure)
Merging trivial/for-next (9ff9b0d392ea Merge tag 'net-next-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
Merging mhi/mhi-next (813272ed5238 Merge 5.14-rc5 into char-misc-next)
Merging memblock/for-next (e888fa7bb882 memblock: Check memory add/cap ordering)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
Merging rust/rust-next (5d3986cf8ed6 MAINTAINERS: Rust)
CONFLICT (content): Merge conflict in include/linux/kallsyms.h
CONFLICT (content): Merge conflict in Makefile
Applying: fixup for rust integration with Makefile.clang creation
Merging cxl/next (e13d206924f5 cxl/core: Replace devm_cxl_add_decoder() with non-devm version)
Merging folio/for-next (1a90e9dae32c mm/writeback: Add folio_write_one)
CONFLICT (content): Merge conflict in mm/util.c
CONFLICT (content): Merge conflict in mm/rmap.c
CONFLICT (content): Merge conflict in mm/filemap.c
Applying: x86: include acpi.h when using acpi functions
Merging akpm-current/current (6326eb4a3915 ipc: replace costly bailout check in sysvipc_find_ipc())
CONFLICT (content): Merge conflict in mm/page-writeback.c
CONFLICT (content): Merge conflict in mm/memcontrol.c
CONFLICT (content): Merge conflict in ipc/sem.c
CONFLICT (content): Merge conflict in include/linux/units.h
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in include/linux/memcontrol.h
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (9175653901de arch: remove compat_alloc_user_space)

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

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

* Re: linux-next: Tree for Sep 1 [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko]
  2021-09-01  8:17 linux-next: Tree for Sep 1 Stephen Rothwell
@ 2021-09-01 20:55 ` Randy Dunlap
  2021-09-02  2:35   ` Trevor Wu
  0 siblings, 1 reply; 40+ messages in thread
From: Randy Dunlap @ 2021-09-01 20:55 UTC (permalink / raw)
  To: Stephen Rothwell, Linux Next Mailing List
  Cc: Linux Kernel Mailing List, alsa-devel, Mark Brown, Liam Girdwood,
	Trevor Wu, Bicycle Tsai

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

On 9/1/21 1:17 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Please do not add any v5.16 related code to your linux-next included
> branches until after v5.15-rc1 has been released.
> 
> Changes since 20210831:
> 


on x86_64:

ERROR: modpost: "clkdev_add" [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko] undefined!
ERROR: modpost: "clkdev_drop" [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko] undefined!
ERROR: modpost: "clk_unregister_gate" [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko] undefined!
ERROR: modpost: "clk_register_gate" [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko] undefined!

Full randconfig file is attached.

-- 
~Randy
Reported-by: Randy Dunlap <rdunlap@infradead.org>


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

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

* Re: linux-next: Tree for Sep 1 [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko]
  2021-09-01 20:55 ` linux-next: Tree for Sep 1 [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko] Randy Dunlap
@ 2021-09-02  2:35   ` Trevor Wu
  2021-09-02  8:22     ` Geert Uytterhoeven
  0 siblings, 1 reply; 40+ messages in thread
From: Trevor Wu @ 2021-09-02  2:35 UTC (permalink / raw)
  To: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List
  Cc: Linux Kernel Mailing List, alsa-devel, Mark Brown, Liam Girdwood,
	Bicycle Tsai

On Wed, 2021-09-01 at 13:55 -0700, Randy Dunlap wrote:
> On 9/1/21 1:17 AM, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Please do not add any v5.16 related code to your linux-next
> > included
> > branches until after v5.15-rc1 has been released.
> > 
> > Changes since 20210831:
> > 
> 
> 
> on x86_64:
> 
> ERROR: modpost: "clkdev_add" [sound/soc/mediatek/mt8195/snd-soc-
> mt8195-afe.ko] undefined!
> ERROR: modpost: "clkdev_drop" [sound/soc/mediatek/mt8195/snd-soc-
> mt8195-afe.ko] undefined!
> ERROR: modpost: "clk_unregister_gate" [sound/soc/mediatek/mt8195/snd-
> soc-mt8195-afe.ko] undefined!
> ERROR: modpost: "clk_register_gate" [sound/soc/mediatek/mt8195/snd-
> soc-mt8195-afe.ko] undefined!
> 
> Full randconfig file is attached.
> 

Hi Randy,

The problem is caused by the dependency declaration, because it's not a
driver for x86_64.
The dependency declaration has been added in the following patch.


https://patchwork.kernel.org/project/alsa-devel/patch/7e628e359bde04ceb9ddd74a45931059b4a4623c.1630415860.git.geert+renesas@glider.be/

Thanks,
Trevor



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

* Re: linux-next: Tree for Sep 1 [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko]
  2021-09-02  2:35   ` Trevor Wu
@ 2021-09-02  8:22     ` Geert Uytterhoeven
  2021-09-02  8:50       ` Trevor Wu
  0 siblings, 1 reply; 40+ messages in thread
From: Geert Uytterhoeven @ 2021-09-02  8:22 UTC (permalink / raw)
  To: Trevor Wu
  Cc: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, ALSA Development Mailing List,
	Mark Brown, Liam Girdwood, Bicycle Tsai

Hi Trevor,

On Thu, Sep 2, 2021 at 4:37 AM Trevor Wu <trevor.wu@mediatek.com> wrote:
> On Wed, 2021-09-01 at 13:55 -0700, Randy Dunlap wrote:
> > On 9/1/21 1:17 AM, Stephen Rothwell wrote:
> > > Please do not add any v5.16 related code to your linux-next
> > > included
> > > branches until after v5.15-rc1 has been released.
> > >
> > > Changes since 20210831:
> > >
> >
> >
> > on x86_64:
> >
> > ERROR: modpost: "clkdev_add" [sound/soc/mediatek/mt8195/snd-soc-
> > mt8195-afe.ko] undefined!
> > ERROR: modpost: "clkdev_drop" [sound/soc/mediatek/mt8195/snd-soc-
> > mt8195-afe.ko] undefined!
> > ERROR: modpost: "clk_unregister_gate" [sound/soc/mediatek/mt8195/snd-
> > soc-mt8195-afe.ko] undefined!
> > ERROR: modpost: "clk_register_gate" [sound/soc/mediatek/mt8195/snd-
> > soc-mt8195-afe.ko] undefined!
> >
> > Full randconfig file is attached.
> >
>
> Hi Randy,
>
> The problem is caused by the dependency declaration, because it's not a
> driver for x86_64.
> The dependency declaration has been added in the following patch.
>
> https://patchwork.kernel.org/project/alsa-devel/patch/7e628e359bde04ceb9ddd74a45931059b4a4623c.1630415860.git.geert+renesas@glider.be/

That is not sufficient, if COMPILE_TEST is enabled.

Looks like it needs a dependency on COMMON_CLK, too.

Gr{oetje,eeting}s,

                        Geert

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

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

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

* Re: linux-next: Tree for Sep 1 [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko]
  2021-09-02  8:22     ` Geert Uytterhoeven
@ 2021-09-02  8:50       ` Trevor Wu
  2021-09-02  9:15         ` Chen-Yu Tsai
  0 siblings, 1 reply; 40+ messages in thread
From: Trevor Wu @ 2021-09-02  8:50 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Randy Dunlap, Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, ALSA Development Mailing List,
	Mark Brown, Liam Girdwood, Bicycle Tsai

On Thu, 2021-09-02 at 10:22 +0200, Geert Uytterhoeven wrote:
> Hi Trevor,
> 
> On Thu, Sep 2, 2021 at 4:37 AM Trevor Wu <trevor.wu@mediatek.com>
> wrote:
> > On Wed, 2021-09-01 at 13:55 -0700, Randy Dunlap wrote:
> > > On 9/1/21 1:17 AM, Stephen Rothwell wrote:
> > > > Please do not add any v5.16 related code to your linux-next
> > > > included
> > > > branches until after v5.15-rc1 has been released.
> > > > 
> > > > Changes since 20210831:
> > > > 
> > > 
> > > 
> > > on x86_64:
> > > 
> > > ERROR: modpost: "clkdev_add" [sound/soc/mediatek/mt8195/snd-soc-
> > > mt8195-afe.ko] undefined!
> > > ERROR: modpost: "clkdev_drop" [sound/soc/mediatek/mt8195/snd-soc-
> > > mt8195-afe.ko] undefined!
> > > ERROR: modpost: "clk_unregister_gate"
> > > [sound/soc/mediatek/mt8195/snd-
> > > soc-mt8195-afe.ko] undefined!
> > > ERROR: modpost: "clk_register_gate"
> > > [sound/soc/mediatek/mt8195/snd-
> > > soc-mt8195-afe.ko] undefined!
> > > 
> > > Full randconfig file is attached.
> > > 
> > 
> > Hi Randy,
> > 
> > The problem is caused by the dependency declaration, because it's
> > not a
> > driver for x86_64.
> > The dependency declaration has been added in the following patch.
> > 
> > 
https://urldefense.com/v3/__https://patchwork.kernel.org/project/alsa-devel/patch/7e628e359bde04ceb9ddd74a45931059b4a4623c.1630415860.git.geert*renesas@glider.be/__;Kw!!CTRNKA9wMg0ARbw!wMq130mAo-s45pP6ShQ1S8UIRuJLhwOnCbQNAQHIE2zvNhjAd67h1rlqkIDxJvC5_g$
> >  
> 
> That is not sufficient, if COMPILE_TEST is enabled.
> 
> Looks like it needs a dependency on COMMON_CLK, too.
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 

Hi Geert,

Because it's a ARM64 driver, ARM64 will select COMMON_CLK.
It seems that some dependency should be checked if COMPILE_TEST is
enabled and the driver is compiled on non-ARM64 environment.
We don't expect the driver can be used on non-ARM64 environment,may I
remove COMPILE_TEST to solve the problem?
If the driver only depends on ARCH_MEDIATEK, it must be compiled on
ARM64.

Thanks,
Trevor

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

* Re: linux-next: Tree for Sep 1 [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko]
  2021-09-02  8:50       ` Trevor Wu
@ 2021-09-02  9:15         ` Chen-Yu Tsai
  2021-09-03  7:05           ` Trevor Wu
  0 siblings, 1 reply; 40+ messages in thread
From: Chen-Yu Tsai @ 2021-09-02  9:15 UTC (permalink / raw)
  To: Trevor Wu
  Cc: Geert Uytterhoeven, Stephen Rothwell,
	ALSA Development Mailing List, Bicycle Tsai, Randy Dunlap,
	Linux Kernel Mailing List, Liam Girdwood, Mark Brown,
	Linux Next Mailing List

On Thu, Sep 2, 2021 at 4:52 PM Trevor Wu <trevor.wu@mediatek.com> wrote:
>
> On Thu, 2021-09-02 at 10:22 +0200, Geert Uytterhoeven wrote:
> > Hi Trevor,
> >
> > On Thu, Sep 2, 2021 at 4:37 AM Trevor Wu <trevor.wu@mediatek.com>
> > wrote:
> > > On Wed, 2021-09-01 at 13:55 -0700, Randy Dunlap wrote:
> > > > On 9/1/21 1:17 AM, Stephen Rothwell wrote:
> > > > > Please do not add any v5.16 related code to your linux-next
> > > > > included
> > > > > branches until after v5.15-rc1 has been released.
> > > > >
> > > > > Changes since 20210831:
> > > > >
> > > >
> > > >
> > > > on x86_64:
> > > >
> > > > ERROR: modpost: "clkdev_add" [sound/soc/mediatek/mt8195/snd-soc-
> > > > mt8195-afe.ko] undefined!
> > > > ERROR: modpost: "clkdev_drop" [sound/soc/mediatek/mt8195/snd-soc-
> > > > mt8195-afe.ko] undefined!
> > > > ERROR: modpost: "clk_unregister_gate"
> > > > [sound/soc/mediatek/mt8195/snd-
> > > > soc-mt8195-afe.ko] undefined!
> > > > ERROR: modpost: "clk_register_gate"
> > > > [sound/soc/mediatek/mt8195/snd-
> > > > soc-mt8195-afe.ko] undefined!
> > > >
> > > > Full randconfig file is attached.
> > > >
> > >
> > > Hi Randy,
> > >
> > > The problem is caused by the dependency declaration, because it's
> > > not a
> > > driver for x86_64.
> > > The dependency declaration has been added in the following patch.
> > >
> > >
> https://urldefense.com/v3/__https://patchwork.kernel.org/project/alsa-devel/patch/7e628e359bde04ceb9ddd74a45931059b4a4623c.1630415860.git.geert*renesas@glider.be/__;Kw!!CTRNKA9wMg0ARbw!wMq130mAo-s45pP6ShQ1S8UIRuJLhwOnCbQNAQHIE2zvNhjAd67h1rlqkIDxJvC5_g$
> > >
> >
> > That is not sufficient, if COMPILE_TEST is enabled.
> >
> > Looks like it needs a dependency on COMMON_CLK, too.
> >
> > Gr{oetje,eeting}s,
> >
> >                         Geert
> >
>
> Hi Geert,
>
> Because it's a ARM64 driver, ARM64 will select COMMON_CLK.
> It seems that some dependency should be checked if COMPILE_TEST is
> enabled and the driver is compiled on non-ARM64 environment.
> We don't expect the driver can be used on non-ARM64 environment,may I
> remove COMPILE_TEST to solve the problem?
> If the driver only depends on ARCH_MEDIATEK, it must be compiled on
> ARM64.

The whole point of COMPILE_TEST is that it gets compile-tested. It doesn't
have to actually run.

Since the driver is using parts of the common clk framework, it should
declare an explicit dependency, instead of implicitly depending on
other symbols to enable it.

ChenYu

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

* Re: linux-next: Tree for Sep 1 [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko]
  2021-09-02  9:15         ` Chen-Yu Tsai
@ 2021-09-03  7:05           ` Trevor Wu
  2021-09-03  7:17             ` Chen-Yu Tsai
  0 siblings, 1 reply; 40+ messages in thread
From: Trevor Wu @ 2021-09-03  7:05 UTC (permalink / raw)
  To: Chen-Yu Tsai
  Cc: Geert Uytterhoeven, Stephen Rothwell,
	ALSA Development Mailing List, Bicycle Tsai, Randy Dunlap,
	Linux Kernel Mailing List, Liam Girdwood, Mark Brown,
	Linux Next Mailing List

On Thu, 2021-09-02 at 17:15 +0800, Chen-Yu Tsai wrote:
> On Thu, Sep 2, 2021 at 4:52 PM Trevor Wu <trevor.wu@mediatek.com>
> wrote:
> > 
> > On Thu, 2021-09-02 at 10:22 +0200, Geert Uytterhoeven wrote:
> > > Hi Trevor,
> > > 
> > > On Thu, Sep 2, 2021 at 4:37 AM Trevor Wu <trevor.wu@mediatek.com>
> > > wrote:
> > > > On Wed, 2021-09-01 at 13:55 -0700, Randy Dunlap wrote:
> > > > > On 9/1/21 1:17 AM, Stephen Rothwell wrote:
> > > > > > Please do not add any v5.16 related code to your linux-next
> > > > > > included
> > > > > > branches until after v5.15-rc1 has been released.
> > > > > > 
> > > > > > Changes since 20210831:
> > > > > > 
> > > > > 
> > > > > 
> > > > > on x86_64:
> > > > > 
> > > > > ERROR: modpost: "clkdev_add" [sound/soc/mediatek/mt8195/snd-
> > > > > soc-
> > > > > mt8195-afe.ko] undefined!
> > > > > ERROR: modpost: "clkdev_drop" [sound/soc/mediatek/mt8195/snd-
> > > > > soc-
> > > > > mt8195-afe.ko] undefined!
> > > > > ERROR: modpost: "clk_unregister_gate"
> > > > > [sound/soc/mediatek/mt8195/snd-
> > > > > soc-mt8195-afe.ko] undefined!
> > > > > ERROR: modpost: "clk_register_gate"
> > > > > [sound/soc/mediatek/mt8195/snd-
> > > > > soc-mt8195-afe.ko] undefined!
> > > > > 
> > > > > Full randconfig file is attached.
> > > > > 
> > > > 
> > > > Hi Randy,
> > > > 
> > > > The problem is caused by the dependency declaration, because
> > > > it's
> > > > not a
> > > > driver for x86_64.
> > > > The dependency declaration has been added in the following
> > > > patch.
> > > > 
> > > > 
> > 
> > 
https://urldefense.com/v3/__https://patchwork.kernel.org/project/alsa-devel/patch/7e628e359bde04ceb9ddd74a45931059b4a4623c.1630415860.git.geert*renesas@glider.be/__;Kw!!CTRNKA9wMg0ARbw!wMq130mAo-s45pP6ShQ1S8UIRuJLhwOnCbQNAQHIE2zvNhjAd67h1rlqkIDxJvC5_g$
> > > > 
> > > 
> > > That is not sufficient, if COMPILE_TEST is enabled.
> > > 
> > > Looks like it needs a dependency on COMMON_CLK, too.
> > > 
> > > Gr{oetje,eeting}s,
> > > 
> > >                         Geert
> > > 
> > 
> > Hi Geert,
> > 
> > Because it's a ARM64 driver, ARM64 will select COMMON_CLK.
> > It seems that some dependency should be checked if COMPILE_TEST is
> > enabled and the driver is compiled on non-ARM64 environment.
> > We don't expect the driver can be used on non-ARM64 environment,may
> > I
> > remove COMPILE_TEST to solve the problem?
> > If the driver only depends on ARCH_MEDIATEK, it must be compiled on
> > ARM64.
> 
> The whole point of COMPILE_TEST is that it gets compile-tested. It
> doesn't
> have to actually run.
> 
> Since the driver is using parts of the common clk framework, it
> should
> declare an explicit dependency, instead of implicitly depending on
> other symbols to enable it.
> 
> ChenYu

Hi ChenYu,

Got it. I will send a patch for the problem.

Thanks,
Trevor

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

* Re: linux-next: Tree for Sep 1 [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko]
  2021-09-03  7:05           ` Trevor Wu
@ 2021-09-03  7:17             ` Chen-Yu Tsai
  0 siblings, 0 replies; 40+ messages in thread
From: Chen-Yu Tsai @ 2021-09-03  7:17 UTC (permalink / raw)
  To: Trevor Wu
  Cc: Geert Uytterhoeven, Stephen Rothwell,
	ALSA Development Mailing List, Bicycle Tsai, Randy Dunlap,
	Linux Kernel Mailing List, Liam Girdwood, Mark Brown,
	Linux Next Mailing List

On Fri, Sep 3, 2021 at 3:05 PM Trevor Wu <trevor.wu@mediatek.com> wrote:
>
> On Thu, 2021-09-02 at 17:15 +0800, Chen-Yu Tsai wrote:
> > On Thu, Sep 2, 2021 at 4:52 PM Trevor Wu <trevor.wu@mediatek.com>
> > wrote:
> > >
> > > On Thu, 2021-09-02 at 10:22 +0200, Geert Uytterhoeven wrote:
> > > > Hi Trevor,
> > > >
> > > > On Thu, Sep 2, 2021 at 4:37 AM Trevor Wu <trevor.wu@mediatek.com>
> > > > wrote:
> > > > > On Wed, 2021-09-01 at 13:55 -0700, Randy Dunlap wrote:
> > > > > > On 9/1/21 1:17 AM, Stephen Rothwell wrote:
> > > > > > > Please do not add any v5.16 related code to your linux-next
> > > > > > > included
> > > > > > > branches until after v5.15-rc1 has been released.
> > > > > > >
> > > > > > > Changes since 20210831:
> > > > > > >
> > > > > >
> > > > > >
> > > > > > on x86_64:
> > > > > >
> > > > > > ERROR: modpost: "clkdev_add" [sound/soc/mediatek/mt8195/snd-
> > > > > > soc-
> > > > > > mt8195-afe.ko] undefined!
> > > > > > ERROR: modpost: "clkdev_drop" [sound/soc/mediatek/mt8195/snd-
> > > > > > soc-
> > > > > > mt8195-afe.ko] undefined!
> > > > > > ERROR: modpost: "clk_unregister_gate"
> > > > > > [sound/soc/mediatek/mt8195/snd-
> > > > > > soc-mt8195-afe.ko] undefined!
> > > > > > ERROR: modpost: "clk_register_gate"
> > > > > > [sound/soc/mediatek/mt8195/snd-
> > > > > > soc-mt8195-afe.ko] undefined!
> > > > > >
> > > > > > Full randconfig file is attached.
> > > > > >
> > > > >
> > > > > Hi Randy,
> > > > >
> > > > > The problem is caused by the dependency declaration, because
> > > > > it's
> > > > > not a
> > > > > driver for x86_64.
> > > > > The dependency declaration has been added in the following
> > > > > patch.
> > > > >
> > > > >
> > >
> > >
> https://urldefense.com/v3/__https://patchwork.kernel.org/project/alsa-devel/patch/7e628e359bde04ceb9ddd74a45931059b4a4623c.1630415860.git.geert*renesas@glider.be/__;Kw!!CTRNKA9wMg0ARbw!wMq130mAo-s45pP6ShQ1S8UIRuJLhwOnCbQNAQHIE2zvNhjAd67h1rlqkIDxJvC5_g$
> > > > >
> > > >
> > > > That is not sufficient, if COMPILE_TEST is enabled.
> > > >
> > > > Looks like it needs a dependency on COMMON_CLK, too.
> > > >
> > > > Gr{oetje,eeting}s,
> > > >
> > > >                         Geert
> > > >
> > >
> > > Hi Geert,
> > >
> > > Because it's a ARM64 driver, ARM64 will select COMMON_CLK.
> > > It seems that some dependency should be checked if COMPILE_TEST is
> > > enabled and the driver is compiled on non-ARM64 environment.
> > > We don't expect the driver can be used on non-ARM64 environment,may
> > > I
> > > remove COMPILE_TEST to solve the problem?
> > > If the driver only depends on ARCH_MEDIATEK, it must be compiled on
> > > ARM64.
> >
> > The whole point of COMPILE_TEST is that it gets compile-tested. It
> > doesn't
> > have to actually run.
> >
> > Since the driver is using parts of the common clk framework, it
> > should
> > declare an explicit dependency, instead of implicitly depending on
> > other symbols to enable it.
> >
> > ChenYu
>
> Hi ChenYu,
>
> Got it. I will send a patch for the problem.

I believe the background for this is that the kernel gets tested the most
on x86, even for build tests. We want code to get tested more, especially
for API changes for which the authors most likely do not have hardware
to test all combinations.

ChenYu

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

* linux-next: Tree for Sep 1
@ 2022-09-01  7:18 Stephen Rothwell
  0 siblings, 0 replies; 40+ messages in thread
From: Stephen Rothwell @ 2022-09-01  7:18 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

News: there will be no linux-next releases tomorrow or on Monday.

Changes since 20220831:

New tree: hte-dp (will replace hte)

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

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

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

The security tree gained a conflict against Linus' tree.

The usb tree gained a conflict against the usb.current tree.

The scsi-mkp tree still had its build failure so I used the version from
next-20220823.

The mm tree gained a conflict against the block tree.

Non-merge commits (relative to Linus' tree): 4153
 6132 files changed, 271535 insertions(+), 83600 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 359 trees (counting Linus' and 98 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 (c5e4d5e99162 Merge tag 'fscache-fixes-20220831' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
Merging fixes/fixes (1c23f9e627a7 Linux 6.0-rc2)
Merging mm-hotfixes/mm-hotfixes-unstable (d3f7b994fe8b x86/mm: disable instrumentations of mm/pgprot.c)
Merging kbuild-current/fixes (c11efc57d4cc scripts/extract-ikconfig: add zstd compression support)
Merging arc-current/for-curr (952deecb065e arc: dts: Harmonize EHCI/OHCI DT nodes name)
Merging arm-current/fixes (25af7406df59 ARM: 9229/1: amba: Fix use-after-free in amba_read_periphid())
Merging arm64-fixes/for-next/fixes (714f3cbd70a4 arm64/sme: Don't flush SVE register state when handling SME traps)
Merging arm-soc-fixes/arm/fixes (251e5d715e4b ARM: ixp4xx: fix typos in comments)
Merging drivers-memory-fixes/fixes (c941e6305958 dt-bindings: memory-controllers: fsl,imx8m-ddrc: drop Leonard Crestez)
Merging tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes)
Merging m68k-current/for-linus (b508128bb0d1 m68k: defconfig: Update defconfigs for v5.19-rc1)
Merging powerpc-fixes/fixes (91926d8b7e71 powerpc/rtas: Fix RTAS MSR[HV] handling for Cell)
Merging s390-fixes/fixes (7c8d42fdf1a8 s390/hugetlb: fix prepare_hugepage_range() check for 2 GB hugepages)
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 (90fabae8a2c2 sch_cake: Return __NET_XMIT_STOLEN when consuming enqueued skb)
Merging bpf/master (8a7d61bdc2fa selftests/xsk: Add missing close() on netns fd)
Merging ipsec/master (26dbd66eab80 esp: choose the correct inner protocol for GSO on inter address family tunnels)
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 (6d0ef7241553 wifi: iwlegacy: 4965: corrected fix for potential off-by-one overflow in il4965_rs_fill_link_cmd())
Merging rdma-fixes/for-rc (27cfde795a96 RDMA/cma: Fix arguments order in net device validation)
Merging sound-current/for-linus (5f3d9e8161bb ALSA: usb-audio: Add quirk for LH Labs Geek Out HD Audio 1V5)
Merging sound-asoc-fixes/for-linus (b1cd3fd42db7 ASoC: fsl_aud2htx: Add error handler for pm_runtime_enable)
Merging regmap-fixes/for-linus (f5723cfc0193 regmap: spi: Reserve space for register address/padding)
Merging regulator-fixes/for-linus (475043fabe8c regulator: Fix qcom,spmi-regulator schema)
Merging spi-fixes/for-linus (9ee5b6d53b8c spi: cadence-quadspi: Disable irqs during indirect reads)
Merging pci-current/for-linus (0e1fa5155a36 MAINTAINERS: Add Mahesh J Salgaonkar as EEH maintainer)
Merging driver-core.current/driver-core-linus (a4f124908617 Revert "iommu/of: Delete usage of driver_deferred_probe_check_state()")
Merging tty.current/tty-linus (902e02ea9385 tty: n_gsm: avoid call of sleeping functions from atomic context)
Merging usb.current/usb-linus (58bfe7d8e310 Revert "usb: add quirks for Lenovo OneLink+ Dock")
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (41ca302a697b USB: serial: ch341: fix disabled rx timer on older devices)
Merging phy/fixes (0a6fc70d76bd phy: marvell: phy-mvebu-a3700-comphy: Remove broken reset support)
Merging staging.current/staging-linus (e230a4455ac3 staging: rtl8712: fix use after free bugs)
Merging iio-fixes/fixes-togreg (0096fc879358 iio: light: cm32181: make cm32181_pm_ops static)
Merging counter-fixes/fixes-togreg (568035b01cfb Linux 6.0-rc1)
Merging char-misc.current/char-misc-linus (5ef251b9b73f Merge tag 'mhi-fixes-for-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-linus)
Merging soundwire-fixes/fixes (c6e50787889c soundwire: qcom: remove duplicate reset control get)
Merging thunderbolt-fixes/fixes (93a3c0d4e8bf thunderbolt: Check router generation before connecting xHCI)
Merging input-current/for-linus (9c9c71168f79 Input: iforce - add support for Boeder Force Feedback Wheel)
Merging crypto-current/master (874b301985ef crypto: lib - remove unneeded selection of XOR_BLOCKS)
Merging vfio-fixes/for-linus (afe4e376ac5d vfio: Move IOMMU_CAP_CACHE_COHERENCY test to after we know we have a group)
Merging kselftest-fixes/fixes (bdbf0617bbc3 selftests/vm: fix inability to build any vm tests)
Merging modules-fixes/modules-linus (e69a66147d49 module: kallsyms: Ensure preemption in add_kallsyms() with PREEMPT_RT)
Merging dmaengine-fixes/fixes (568035b01cfb Linux 6.0-rc1)
Merging backlight-fixes/for-backlight-fixes (a38fd8748464 Linux 5.12-rc2)
Merging mtd-fixes/mtd/fixes (0fddf9ad06fd mtd: rawnand: gpmi: Set WAIT_FOR_READY timeout based on program/erase times)
Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources")
Merging v4l-dvb-fixes/fixes (150f7b11cb59 media: uvcvideo: Fix InterfaceProtocol for Quanta camera)
Merging reset-fixes/reset/fixes (51fd191422d9 reset: microchip-sparx5: issue a reset on startup)
Merging mips-fixes/mips-fixes (35508d242409 MIPS: loongson32: ls1c: Fix hang during startup)
Merging at91-fixes/at91-fixes (3d074b750d2b ARM: dts: at91: sama5d2_icp: don't keep vdd_other enabled all the time)
Merging omap-fixes/fixes (2eb502f496f7 ARM: dts: am33xx: Fix MMCHS0 dma properties)
Merging kvm-fixes/master (372d07084593 KVM: selftests: Fix ambiguous mov in KVM_ASM_SAFE())
Merging kvms390-fixes/master (ca922fecda6c KVM: s390: pci: Hook to access KVM lowlevel from VFIO)
Merging hwmon-fixes/hwmon (f233d2be38db hwmon: (gpio-fan) Fix array out of bounds access)
Merging nvdimm-fixes/libnvdimm-fixes (17d9c15c9b9e fsdax: Fix infinite loop in dax_iomap_rw())
Merging cxl-fixes/fixes (e35f5718903b cxl/mbox: Fix missing variable payload checks in cmd size validation)
Merging btrfs-fixes/next-fixes (af39011ec0c7 Merge branch 'misc-5.19' into next-fixes)
Merging vfs-fixes/fixes (3f61631d47f1 take care to handle NULL ->proc_lseek())
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 (343b62048ba4 platform/x86: thinkpad_acpi: Explicitly set to balanced mode on startup)
Merging samsung-krzk-fixes/fixes (568035b01cfb Linux 6.0-rc1)
Merging pinctrl-samsung-fixes/fixes (568035b01cfb Linux 6.0-rc1)
Merging devicetree-fixes/dt/linus (40bfe7a86d84 of/device: Fix up of_dma_configure_id() stub)
Merging dt-krzk-fixes/fixes (568035b01cfb Linux 6.0-rc1)
Merging scsi-fixes/fixes (785538bfdd68 scsi: sd: Revert "Rework asynchronous resume support")
Merging drm-fixes/drm-fixes (b90cb1053190 Linux 6.0-rc3)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (0211c2a0ea60 drm/i915: Skip wm/ddb readout for disabled pipes)
Merging mmc-fixes/fixes (63f1560930e4 mmc: core: Fix inconsistent sd3_bus_mode at UHS-I SD voltage switch failure)
Merging rtc-fixes/rtc-fixes (568035b01cfb Linux 6.0-rc1)
Merging gnss-fixes/gnss-linus (a111daf0c53a Linux 5.19-rc3)
Merging hyperv-fixes/hyperv-fixes (f15f39fabed2 tools: hv: Remove an extraneous "the")
Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18)
Merging risc-v-fixes/fixes (1709c70c31e0 Merge branch 'riscv-variable_fixes_without_kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux.git into fixes)
Merging risc-v-mc-fixes/dt-fixes (0dec364ffeb6 riscv: dts: microchip: use an mpfs specific l2 compatible)
Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range())
Merging fpga-fixes/fixes (568035b01cfb Linux 6.0-rc1)
Merging spdx/spdx-linus (568035b01cfb Linux 6.0-rc1)
Merging gpio-brgl-fixes/gpio/for-current (ee0175b3b442 gpio: realtek-otto: switch to 32-bit I/O)
Merging gpio-intel-fixes/fixes (b93a8b2c5161 gpio: dln2: make irq_chip immutable)
Merging pinctrl-intel-fixes/fixes (1c23f9e627a7 Linux 6.0-rc2)
Merging erofs-fixes/fixes (8b1ac84dcf2c Documentation/ABI: sysfs-fs-erofs: Fix Sphinx errors)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (41a55567b9e3 module: kunit: Load .kunit_test_suites section when CONFIG_KUNIT=m)
Merging ubifs-fixes/fixes (c3c07fc25f37 ubi: fastmap: Return error code if memory allocation fails in add_aeb())
Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions)
Merging cel-fixes/for-rc (6930bcbfb6ce lockd: detect and reject lock arguments that overflow)
Merging irqchip-fixes/irq/irqchip-fixes (c3e88d91e409 irqchip/stm32-exti: Remove check on always false condition)
Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number)
Merging broadcom-fixes/fixes (b6fa04765857 Merge branch 'drivers/fixes' into fixes)
Merging perf-current/perf/urgent (b90cb1053190 Linux 6.0-rc3)
Merging efi-fixes/urgent (1a3887924a7e efi: libstub: Disable struct randomization)
Merging zstd-fixes/zstd-linus (88a309465b3f lib: zstd: clean up double word in comment.)
Merging battery-fixes/fixes (568035b01cfb Linux 6.0-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (a3f7c10a269d dma-buf/dma-resv: check if the new fence is really later)
Merging kbuild/for-next (144cec848740 nios2: move core-y in arch/nios2/Makefile to arch/nios2/Kbuild)
Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
Merging perf/perf/core (6c3bd8d3e01d perf smt: Tidy header guard add SPDX)
$ git reset --hard HEAD^
Merging next-20220830 version of perf
Merging compiler-attributes/compiler-attributes (7c00621dcaee compiler_types: mark __compiletime_assert failure as __noreturn)
Merging dma-mapping/for-next (5c850d31880e swiotlb: fix passing local variable to debugfs_create_ulong())
Merging asm-generic/master (82dc270146a8 Merge branch 'asm-generic-fixes' into asm-generic)
Merging arc/for-next (f2906aa86338 Linux 5.19-rc1)
Merging arm/for-next (5d6dd664478f Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (b90cb1053190 Linux 6.0-rc3)
Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING)
Merging arm-soc/for-next (2c77db2b9086 Merge branch 'arm/fixes' into for-next)
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (d735ce6cafa3 Merge branch 'v6.1/dt64' into for-next)
Merging aspeed/for-next (7bc156fbb726 ARM: config: aspeed_g5: Enable PECI)
Merging at91/at91-next (9ff1e8494af5 Merge branch 'at91-dt' into at91-next)
Merging broadcom/next (122de0c73256 Merge branch 'maintainers/next' into next)
Merging drivers-memory/for-next (f492ddd4aaad Merge branch 'for-v6.1/mediatek' into for-next)
Merging imx-mxs/for-next (a554a9e72736 Merge branch 'imx/dt64' into for-next)
Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next)
Merging mediatek/for-next (63c8a3297683 Merge branch 'v6.0-next/soc' into for-next)
Merging mvebu/for-next (bc50bfd4f018 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (ad2fe4582c48 Merge branches 'omap-for-v5.20/omap1', 'omap-for-v5.20/ti-sysc' and 'omap-for-v5.20/soc' into for-next)
Merging qcom/for-next (f96be249839f Merge branches 'arm64-defconfig-for-6.1', 'arm64-for-6.1', 'clk-for-6.1', 'defconfig-for-6.1', 'drivers-for-6.1', 'dts-for-6.1' and 'arm64-fixes-for-6.0' into for-next)
Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema)
Merging renesas/next (d561df8d9be0 Merge branches 'renesas-arm-dt-for-v6.1' and 'renesas-dt-bindings-for-v6.1' into renesas-next)
Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage")
Merging rockchip/for-next (583fa77c68b4 Merge branch 'v6.1-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (9990f043d543 Merge branch 'next/dt64' into for-next)
Merging scmi/for-linux-next (2cdcbfae5be5 Merge tag 'scmi-fixes-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
Merging stm32/stm32-next (0c8d51cb3762 ARM: dts: stm32: Create separate pinmux for qspi cs pin in stm32mp15-pinctrl.dtsi)
Merging sunxi/sunxi/for-next (3930624c3936 clk: sunxi-ng: d1: Limit PLL rates to stable ranges)
Merging tee/next (db30e53bf897 Merge branch 'tee_cleanup_for_v5.19' into next)
Merging tegra/for-next (393c6c3a6152 Merge branch for-5.20/arm64/defconfig into for-next)
Merging ti/ti-next (b73656582943 dt-bindings: arm: ti: k3: Sort the SoC definitions alphabetically)
Merging xilinx/for-next (0413dd4d95da ARM: dts: zynq: add QSPI controller node)
Merging clk/clk-next (99233aa0121f Merge branch 'clk-mtk' into clk-next)
Merging clk-imx/for-next (c196175acdd3 clk: imx: clk-fracn-gppll: Add more freq config for video pll)
Merging clk-renesas/renesas-clk (644814c1070d clk: renesas: r8a779f0: Add MSIOF clocks)
Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
Merging csky/linux-next (45fef4c4b9c9 csky: abiv1: Fixup compile error)
Merging loongarch/loongarch-next (568035b01cfb Linux 6.0-rc1)
Merging m68k/for-next (1afdc013672b m68k: Move from strlcpy with unused retval to strscpy)
Merging m68knommu/for-next (7728140c8971 m68knommu: fix non-mmu classic 68000 legacy timer tick selection)
Merging microblaze/next (568035b01cfb Linux 6.0-rc1)
Merging mips/mips-next (568035b01cfb Linux 6.0-rc1)
Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn)
Merging openrisc/for-next (52e0ea900202 openrisc: io: Define iounmap argument as volatile)
Merging parisc-hd/for-next (b3b4f321a9ca parisc: ccio-dma: Add missing iounmap in error path in ccio_probe())
Merging powerpc/next (fd20b60aea6a powerpc/82xx: remove spidev node from mgcoge)
Merging soc-fsl/next (4b0986a3613c Linux 5.18)
Merging risc-v/for-next (82c75dca6f95 riscv: enable CD-ROM file systems in defconfig)
Merging risc-v-mc/dt-for-next (7eac0081a8e9 riscv: dts: microchip: add qspi compatible fallback)
Merging s390/for-next (c4680f34b418 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/linux-next (af3e16101cee um: include sys/types.h for size_t)
Merging xtensa/xtensa-for-next (0847d167d0f9 xtensa: enable ARCH_HAS_GCOV_PROFILE_ALL)
Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl' into for-next)
Merging vfs-idmapping/for-next (6344e66970c6 xattr: constify value argument in vfs_setxattr())
Merging fscrypt/master (deb4c809d7e8 fscrypt: work on block_devices instead of request_queues)
Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
Merging afs/afs-next (26291c54e111 Linux 5.17-rc2)
Merging btrfs/for-next (1e6d4089902a Merge branch 'for-next-next-v6.0-20220830' into for-next-20220830)
Merging ceph/master (a8af0d682ae0 libceph: clean up ceph_osdc_start_request prototype)
Merging cifs/for-next (27893dfc1285 cifs: fix small mempool leak in SMB2_negotiate())
Merging configfs/for-next (84ec758fb2da configfs: fix a race in configfs_{,un}register_subsystem())
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 (0d53d2e882f9 erofs: avoid the potentially wrong m_plen for big pcluster)
Merging exfat/dev (bb2bfc5e0772 exfat: fix overflow for large capacity partition)
Merging ext3/for_next (5b02b6900c8d Pull fsnotify typo fix.)
Merging ext4/dev (d95efb14c0b8 ext4: add ioctls to get/set the ext4 superblock uuid)
Merging f2fs/dev (4404215ceecd f2fs: use COMPRESS_MAPPING to get compress cache mapping)
Merging fsverity/fsverity (8377e8a24bba fs-verity: use kmap_local_page() instead of kmap())
Merging fuse/for-next (247861c325c2 fuse: retire block-device-based superblock on force unmount)
Merging gfs2/for-next (204c0300c4e9 gfs2: Switch from strlcpy to strscpy)
Merging jfs/jfs-next (e471e5942c00 fs/jfs: Remove dead code)
Merging ksmbd/ksmbd-for-next (8c9073fa857c ksmbd: constify struct path)
Merging nfs/linux-next (ed06fce0b034 SUNRPC: RPC level errors should set task->tk_rpc_status)
Merging nfs-anna/linux-next (4f40a5b55446 NFSv4: Add an fattr allocation to _nfs4_discover_trunking())
Merging nfsd/for-next (bcaa9f42a0d5 NFSD: remove redundant variable status)
Merging ntfs3/master (3b06a2755758 Merge tag 'ntfs3_for_6.0' of https://github.com/Paragon-Software-Group/linux-ntfs3)
Merging orangefs/for-next (40a74870b2d1 orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc())
Merging overlayfs/overlayfs-next (4f1196288dfb ovl: fix spelling mistakes)
Merging ubifs/next (8c03a1c21d72 ubi: ubi_create_volume: Fix use-after-free when volume creation failed)
Merging v9fs/9p-next (aa7aeee16948 net/9p: Initialize the iounit field during fid creation)
Merging xfs/for-next (031d166f968e xfs: fix inode reservation space for removing transaction)
Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag)
Merging iomap/iomap-for-next (478af190cb6c iomap: remove iomap_writepage)
Merging djw-vfs/vfs-for-next (49df34221804 fs: fix an infinite loop in iomap_fiemap)
Merging file-locks/locks-next (072e51356cd5 Merge tag 'nfs-for-5.20-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
Merging vfs/for-next (0a97e98ab197 Merge branches 'work.path' and 'work.file_inode' into for-next)
Merging printk/for-next (c0a684057235 Merge branch 'for-6.1/trivial' into for-next)
Merging pci/next (68fca83a3783 Merge branch 'remotes/lorenzo/pci/qcom')
Merging pstore/for-next/pstore (2c09d1443b9b pstore/zone: cleanup "rcnt" type)
Merging hid/for-next (1f21e5bfbac7 Merge branch 'for-6.0/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (e847867330ea Merge branch 'i2c/for-mergewindow' into i2c/for-next)
Merging i3c/i3c/next (568035b01cfb Linux 6.0-rc1)
Merging dmi/dmi-for-next (d2139dfca361 firmware: dmi: Use the proper accessor for the version field)
Merging hwmon-staging/hwmon-next (9e544d72f31a docs: hwmon: add emc2305.rst to docs)
Applying: hwmon: (emc2305) fix up for "i2c: Make remove callback return void"
Merging jc_docs/docs-next (7ebeef22dcc2 Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (568035b01cfb Linux 6.0-rc1)
Merging v4l-dvb-next/master (fbb6c848dd89 media: destage Hantro VPU driver)
Merging pm/linux-next (41607487f81c Merge branch 'thermal-core' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (3359d52755e5 cpufreq: bmips-cpufreq: Use module_init and add module_exit)
Merging cpupower/cpupower (568035b01cfb Linux 6.0-rc1)
Merging devfreq/devfreq-next (68831c5f94cb PM / devfreq: mtk-cci: Handle sram regulator probe deferral)
Merging opp/opp/linux-next (c7e31e36d8a2 dt-bindings: opp: Add missing (unevaluated|additional)Properties on child nodes)
Merging thermal/thermal/linux-next (06f360551217 Revert "mlxsw: core: Add the hottest thermal zone detection")
Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API)
Merging dlm/next (56171e0db23a fs: dlm: const void resource name parameter)
Merging rdma/for-next (bfb3bde95479 RDMA/hns: Remove redundant member doorbell_qpn of struct hns_roce_qp)
Merging net-next/master (7305b78ae45f r8152: allow userland to disable multicast)
CONFLICT (content): Merge conflict in tools/testing/selftests/net/.gitignore
Merging bpf-next/for-next (c9ae8c966f05 Merge branch 'fixes for concurrent htab updates')
CONFLICT (content): Merge conflict in net/core/filter.c
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/DENYLIST.s390x
Merging ipsec-next/master (2c2493b9da91 xfrm: lwtunnel: add lwtunnel support for xfrm interfaces in collect_md mode)
Merging mlx5-next/mlx5-next (b0bb369ee451 net/mlx5: fs, allow flow table creation with a UID)
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 (177978b29426 Bluetooth: btusb: mediatek: fix WMT failure during runtime suspend)
Merging wireless-next/for-next (8d40a13bc35d Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging mtd/mtd/next (7ec4cdb32173 mtd: core: check partition before dereference)
Merging nand/nand/next (e16eceea863b mtd: rawnand: arasan: Fix clock rate in NV-DDR)
Merging spi-nor/spi-nor/next (f8cd9f632f44 mtd: spi-nor: fix spi_nor_spimem_setup_op() call in spi_nor_erase_{sector,chip}())
Merging crypto/master (a9a98d49da52 crypto: Kconfig - simplify compression/RNG entries)
Merging drm/drm-next (2c2d7a67defa Merge tag 'drm-intel-gt-next-2022-08-24' of git://anongit.freedesktop.org/drm/drm-intel into drm-next)
Merging drm-misc/for-linux-next (e6545831a17b MAINTAINERS: Add myself as a reviewer for panel-edp.c)
CONFLICT (content): Merge conflict in drivers/gpu/drm/tiny/simpledrm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_hdmi.c
Merging amdgpu/drm-next (a462e4b9a6a8 drm/amd/display: fix documentation for amdgpu_dm_update_freesync_caps())
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
Merging drm-intel/for-linux-next (a5810f551d0a drm/i915: Allow more varied alternate fixed modes for panels)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/icl_dsi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_backlight.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bios.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_bw.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/vlv_dsi.c
Merging drm-tegra/for-next (135f4c551d51 drm/tegra: vic: Use devm_platform_ioremap_resource())
Merging drm-msm/msm-next (1c23f9e627a7 Linux 6.0-rc2)
Merging drm-msm-lumag/msm-next-lumag (7fc1bfe18f16 Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi' and 'msm-next-lumag-hdmi' 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 (332f847212e4 drm/etnaviv: reap idle mapping if it doesn't match the softpin address)
Merging fbdev/for-next (1c23f9e627a7 Linux 6.0-rc2)
Merging regmap/for-next (1bfa8e736383 Merge remote-tracking branch 'regmap/for-6.1' into regmap-next)
Merging sound/for-next (999b95a72d90 ALSA: hda/hdmi: Replace zero-length array with DECLARE_FLEX_ARRAY() helper)
Merging sound-asoc/for-next (7c6c54c8af47 Merge remote-tracking branch 'asoc/for-6.1' into asoc-next)
Merging modules/modules-next (554694ba120b module: Replace kmap() with kmap_local_page())
Merging input/next (ed3d5bd20dcd Input: rt5120 - add power key support)
Merging block/for-next (3009394a00cc Merge branch 'for-6.1/io_uring' into for-next)
Merging device-mapper/for-next (c8e2f5c3682d dm verity: enable WQ_HIGHPRI on verify_wq)
Merging libata/for-next (e9892dce44f2 ata: pata_macio: Remove unneeded word in comments)
Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt)
Merging mmc/next (ca93b1faebab mmc: meson-gx: add SDIO interrupt support)
Merging mfd/for-mfd-next (3d021aaca7c7 dt-bindings: mfd: mt8195: Add bindings for MediaTek SCPSYS)
CONFLICT (modify/delete): drivers/mfd/intel_soc_pmic_core.c deleted in mfd/for-mfd-next and modified in HEAD.  Version HEAD of drivers/mfd/intel_soc_pmic_core.c left in tree.
$ git rm -f drivers/mfd/intel_soc_pmic_core.c
Applying: mfd: fix up for "i2c: Make remove callback return void"
Merging backlight/for-backlight-next (fe201f6fa4cf MAINTAINERS: Use Lee Jones' kernel.org address for Backlight submissions)
Merging battery/for-next (568035b01cfb Linux 6.0-rc1)
Merging regulator/for-next (c2b819c4bbe4 Merge remote-tracking branch 'regulator/for-6.1' into regulator-next)
Merging security/next (abec3d015fdf userfaultfd: open userfaultfds with O_RDONLY)
CONFLICT (content): Merge conflict in security/selinux/include/classmap.h
Merging apparmor/apparmor-next (79eb2711c919 apparmor: correct config reference to intended one)
Merging integrity/next-integrity (88b61b130334 Merge remote-tracking branch 'linux-integrity/kexec-keyrings' into next-integrity)
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 (6354324d8a3e selinux: declare read-only parameters const)
Merging smack/next (b50503990d88 smack: Remove the redundant lsm_inode_alloc)
Merging tomoyo/master (05fe531eb3f1 kernel/hung_task: show backtrace of tasks with locks held)
Merging tpmdd/next (863ed94c589f tpm: Add check for Failure mode for TPM2 modules)
Merging watchdog/master (b90cb1053190 Linux 6.0-rc3)
Merging iommu/next (c10100a416c1 Merge branches 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging audit/next (501e4bb102ee audit: use time_after to compare time)
Merging devicetree/for-next (a536208da6f7 dt-bindings: crypto: ti,sa2ul: drop dma-coherent property)
Merging dt-krzk/for-next (a70369e1b7f6 ARM: dts: sunplus: sp7021: drop incorrect spi-max-frequency)
Merging mailbox/mailbox-for-next (8a8dc2b9596e mailbox: imx: clear pending interrupts)
Merging spi/for-next (1adcde45713c Merge remote-tracking branch 'spi/for-6.1' into spi-next)
Merging tip/master (f9c08c27f196 Merge branch into tip/master: 'x86/timers')
Merging clockevents/timers/drivers/next (c19e18637d89 clocksource/drivers/sun4i: Remove unnecessary (void*) conversions)
Merging edac/edac-for-next (35636db93725 Merge edac-misc into for-next)
Merging irqchip/irq/irqchip-next (2bd1753e8c43 Merge branch irq/misc-5.20 into irq/irqchip-next)
Merging ftrace/for-next (07a451dae367 Merge branch 'trace/for-next-core' into trace/for-next)
Merging rcu/rcu/next (97a2c50e702a rcutorture: Verify NUM_ACTIVE_RCU_POLL_OLDSTATE)
Merging kvm/next (372d07084593 KVM: selftests: Fix ambiguous mov in KVM_ASM_SAFE())
Merging kvm-arm/next (0982c8d859f8 Merge branch kvm-arm64/nvhe-stacktrace into kvmarm-master/next)
Merging kvms390/next (f5ecfee94493 KVM: s390: resetting the Topology-Change-Report)
Merging xen-tip/linux-next (c5deb27895e0 xen/privcmd: fix error exit of privcmd_ioctl_dm_op())
Merging percpu/for-next (a111daf0c53a Linux 5.19-rc3)
Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync())
Merging drivers-x86/for-next (c35c7b980597 platform/x86: msi-laptop: Add msi_scm_disable_hw_fn_handling() helper)
Merging chrome-platform/for-next (8a07b45fd3c2 platform/chrome: fix memory corruption in ioctl)
Merging hsi/for-next (551e325bbd3f HSI: omap_ssi_port: Fix dma_map_sg error check)
Merging leds/for-next (568035b01cfb Linux 6.0-rc1)
Merging ipmi/for-next (4aebcc9059d8 dt-binding: ipmi: add fallback to npcm845 compatible)
Merging driver-core/driver-core-next (1c23f9e627a7 Linux 6.0-rc2)
Merging usb/usb-next (8f36b3b4e1b5 usbip: add USBIP_URB_* URB transfer flags)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/gadget.c
Merging thunderbolt/next (32249fd8c8cc thunderbolt: Add support for Intel Meteor Lake)
Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial/usb-next (b90cb1053190 Linux 6.0-rc3)
Merging tty/tty-next (cac8f7194111 serial: tegra: Remove custom frame size calculation)
Merging char-misc/char-misc-next (568035b01cfb Linux 6.0-rc1)
Merging coresight/next (0a98181f8050 coresight: Make new csdev_access offsets unsigned)
Merging fpga/for-next (e167b2c3a0e6 dt-bindings: fpga: microchip,mpf-spi-fpga-mgr: use spi-peripheral-props.yaml)
Merging icc/icc-next (aff72c797ff0 Merge branch 'icc-ignore-return-val' into icc-next)
Merging iio/togreg (f5ffeca5086f iio: light: ltrf216a: Add raw attribute)
Merging phy-next/next (c8c5d5e89ac5 phy: qcom-qmp-usb: drop pipe clock lane suffix)
Merging soundwire/next (1f2dcf3a154a soundwire: intel: set dev_num_ida_min)
Merging extcon/extcon-next (822a6200734c extcon: usbc-tusb320: Add USB TYPE-C support)
Merging gnss/gnss-next (c0c725d7350e gnss: replace ida_simple API)
Merging vfio/next (0f3e72b5c8cf vfio: Move vfio.c to vfio_main.c)
Merging staging/staging-next (6d29e08007c5 staging: vt6655: Rename function MACvSetShortRetryLimit)
CONFLICT (content): Merge conflict in drivers/staging/r8188eu/os_dep/os_intfs.c
Merging mux/for-next (0fcfb00b28c0 Linux 5.16-rc4)
Merging dmaengine/next (568035b01cfb Linux 6.0-rc1)
Merging cgroup/for-next (5214a36f9afe Merge branch 'for-6.1' into for-next)
Merging scsi/for-next (785538bfdd68 scsi: sd: Revert "Rework asynchronous resume support")
Merging scsi-mkp/for-next (8750aa54da43 scsi: megaraid_sas: Use struct_size() in code related to struct MR_PD_CFG_SEQ_NUM_SYNC)
$ git reset --hard HEAD^
Merging next-20220823 version of scsi-mkp
Merging vhost/linux-next (8f113a4ad40d virtio: drop vp_legacy_set_queue_size)
Merging rpmsg/for-next (729c16326b7f remoteproc: imx_dsp_rproc: fix argument 2 of rproc_mem_entry_init)
Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1)
Merging gpio-brgl/gpio/for-next (0e056f414e5b dt-bindings: gpio: stmpe: Remove node name requirement)
Merging gpio-intel/for-next (9c3c24f08289 gpiolib: acpi: Add a quirk for Asus UM325UAZ)
Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4)
Merging pinctrl/for-next (98f0c2fc1fa3 Merge branch 'devel' into for-next)
Merging pinctrl-intel/for-next (1c23f9e627a7 Linux 6.0-rc2)
Merging pinctrl-renesas/renesas-pinctrl (96355be8f0a2 dt-bindings: pinctrl: renesas: Document RZ/Five SoC)
Merging pinctrl-samsung/for-next (9d9292576810 dt-bindings: pinctrl: samsung: deprecate header with register constants)
Merging pwm/for-next (8933d30c5f46 pwm: lpc18xx: Fix period handling)
Merging userns/for-next (a0b88362d2c7 Merge of ucount-rlimits-cleanups-for-v5.19, interrupting_kthread_stop-for-v5.20, signal-for-v5.20, and retire_mq_sysctls-for-v5.19 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 (997fdfc6b9c0 Documentation: amd-pstate: Add unit test introduction)
Merging livepatching/for-next (df44b1ee72f4 Merge branch 'for-5.20/selftests-fixes' into for-next)
Merging rtc/rtc-next (509451ac03eb rtc: gamecube: Always reset HW_SRNPROT after read)
Merging nvdimm/libnvdimm-for-next (53fc59511fc4 nvdimm/namespace: drop unneeded temporary variable in size_store())
Merging at24/at24/for-next (568035b01cfb Linux 6.0-rc1)
Merging ntb/ntb-next (7e6bd8246967 net: ethernet: move from strlcpy with unused retval to strscpy)
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 (04823dd2af87 fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe)
Merging slimbus/for-next (568035b01cfb Linux 6.0-rc1)
Merging nvmem/for-next (b7531401aadf nvmem: sort config symbols alphabetically)
Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
Merging hyperv/hyperv-next (d180e0a1be6c Drivers: hv: Create debugfs file with hyper-v balloon usage information)
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 (568035b01cfb Linux 6.0-rc1)
Merging kunit/test (568035b01cfb Linux 6.0-rc1)
Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
Merging kunit-next/kunit (568035b01cfb Linux 6.0-rc1)
Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
Merging mhi/mhi-next (acc5495bf764 bus: mhi: host: Fix up null pointer access in mhi_irq_handler)
Merging memblock/for-next (dcd45ad2ad78 memblock tests: add tests for memblock_trim_memory)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging counters/counters (e71ba9452f0b Linux 5.11-rc2)
Merging cxl/next (1cd8a2537eb0 cxl/hdm: Fix skip allocations vs multiple pmem allocations)
Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller)
Merging zstd/zstd-next (88a309465b3f lib: zstd: clean up double word in comment.)
Merging efi/next (bb45d2db8492 Merge tag 'efi-loongarch-for-v6.1' into efi/next)
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
Merging slab/for-next (68704dd63c5e Merge branch 'slab/for-6.1/slub_validation_locking' into slab/for-next)
Merging random/master (4e23eeebb2e5 Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux)
Merging landlock/next (e1cdfbfade70 Merge branch 'landlock-next-truncate' into landlock-next)
Merging rust/rust-next (07a3263c2554 init/Kconfig: Specify the interpreter for rust_is_available.sh)
CONFLICT (content): Merge conflict in Makefile
Merging sysctl/sysctl-next (374a723c7448 kernel/sysctl.c: Remove trailing white space)
Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages)
Merging execve/for-next/execve (1c23f9e627a7 Linux 6.0-rc2)
Merging bitmap/bitmap-for-next (5d7fef0804b0 lib/cpumask_kunit: add tests file to MAINTAINERS)
Merging hte/hte/for-next (85ff37e302ef gpiolib: cdev: Fix kernel doc for struct line)
Merging hte-dp/for-next (568035b01cfb Linux 6.0-rc1)
Merging kspp/for-next/kspp (0f094d89b354 overflow: Allow mixed type arguments)
Merging kspp-gustavo/for-next/kspp (568035b01cfb Linux 6.0-rc1)
Merging mm-stable/mm-stable (ec6624452e36 Merge branch 'linus')
Merging mm-nonmm-stable/mm-nonmm-stable (ec6624452e36 Merge branch 'linus')
Merging mm/mm-everything (671befb18901 Merge branch 'mm-nonmm-unstable' into mm-everything)
CONFLICT (content): Merge conflict in block/blk-map.c
CONFLICT (content): Merge conflict in mm/memory-failure.c
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in mm/vmscan.c

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

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

* linux-next: Tree for Sep 1
@ 2017-09-01  6:39 Stephen Rothwell
  0 siblings, 0 replies; 40+ messages in thread
From: Stephen Rothwell @ 2017-09-01  6:39 UTC (permalink / raw)
  To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List

Hi all,

Changes since 20170831:

The nfsd tree lost its build failure.

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

The rpmsg tree lost its build failure.

Non-merge commits (relative to Linus' tree): 10840
 10399 files changed, 549534 insertions(+), 194715 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
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.

Below is a summary of the state of the merge.

I am currently merging 268 trees (counting Linus' and 41 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 (42ff72cf2702 Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm)
Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry)
Merging kbuild-current/fixes (64236e315955 kbuild: update comments of Makefile.asm-generic)
Merging arc-current/for-curr (e025fedff2fb ARC: [plat-hsdk] initial port for HSDK board)
Merging arm-current/fixes (746a272e4414 ARM: 8692/1: mm: abort uaccess retries upon fatal signal)
Merging m68k-current/for-linus (204a2be30a7a m68k: Remove ptrace_signal_deliver)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (1a92a80ad386 powerpc/mm: Ensure cpumask update is ordered)
Merging sparc/master (6470812e2226 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (f581a0dd744f wl1251: add a missing spin_lock_init())
Merging ipsec/master (931e79d7a7dd xfrm_user: fix info leak in build_aevent())
Merging netfilter/master (f63ae01d890c Merge tag 'wireless-drivers-for-davem-2017-08-25' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers)
Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set)
Merging wireless-drivers/master (10a54d8196d1 iwlwifi: pcie: move rx workqueue initialization to iwl_trans_pcie_alloc())
Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES)
Merging sound-current/for-linus (83b033bd33a8 Merge tag 'asoc-fix-v4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (8e1101d25164 PCI/MSI: Don't warn when irq_create_affinity_masks() returns NULL)
Merging driver-core.current/driver-core-linus (ef954844c7ac Linux 4.13-rc5)
Merging tty.current/tty-linus (ef954844c7ac Linux 4.13-rc5)
Merging usb.current/usb-linus (ef954844c7ac Linux 4.13-rc5)
Merging usb-gadget-fixes/fixes (b7d44c36a6f6 usb: renesas_usbhs: gadget: fix unused-but-set-variable warning)
Merging usb-serial-fixes/usb-linus (fd1b8668af59 USB: serial: option: add D-Link DWM-222 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 (5771a8c08880 Linux v4.13-rc1)
Merging staging.current/staging-linus (cc4a41fe5541 Linux 4.13-rc7)
Merging char-misc.current/char-misc-linus (cc4a41fe5541 Linux 4.13-rc7)
Merging input-current/for-linus (3f9db52dc87b Input: synaptics - fix device info appearing different on reconnect)
Merging crypto-current/master (445a582738de crypto: algif_skcipher - only call put_page on referenced and used pages)
Merging ide/master (b671e1703394 PNP: ide: constify pnp_device_id)
Merging vfio-fixes/for-linus (796b755066dd vfio/pci: Fix handling of RC integrated endpoint PCIe capability size)
Merging kselftest-fixes/fixes (622b2fbe625b selftests: timers: freq-step: fix compile error)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check)
Merging spi-nor-fixes/spi-nor/fixes (5771a8c08880 Linux v4.13-rc1)
Merging mfd-fixes/for-mfd-fixes (0f0fc5c09005 Revert "mfd: da9061: Fix to remove BBAT_CONT register from chip model")
Merging v4l-dvb-fixes/fixes (42b884edd6fa media: Revert "[media] v4l: async: make v4l2 coexist with devicetree nodes in a dt overlay")
Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded)
Merging drm-intel-fixes/for-linux-next-fixes (cc4a41fe5541 Linux 4.13-rc7)
Merging drm-misc-fixes/for-linux-next-fixes (79964dbaf662 drm/bridge/sii8620: Fix memory corruption)
Merging kbuild/for-next (64236e315955 kbuild: update comments of Makefile.asm-generic)
Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API)
Merging dma-mapping/for-next (2fd523c57e52 dma-mapping: remove dma_alloc_noncoherent and dma_free_noncoherent)
Merging asm-generic/master (a351e9b9fc24 Linux 4.11)
Merging arc/for-next (cc4a41fe5541 Linux 4.13-rc7)
Merging arm/for-next (67715a8964fc Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (e884f80cf2a7 arm64: perf: add support for Cortex-A35)
Merging arm-soc/for-next (7d55654e45a9 ARM: SoC: Document merges)
Merging actions/for-next (253d192bc4aa Merge branch 'v4.14/dt' into next)
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (b951316e2f33 Merge branch 'v4.14/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (0eead81e7847 Merge branches 'dt-for-v4.14' and 'defconfig-for-v4.14' into for-next)
Merging at91/at91-next (01c1fe77824e Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (e83e7335d059 Merge branch anholt/bcm2835-defconfig-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (b90b6c45ff6b Merge branch 'zte/dt64' into for-next)
Merging keystone/next (f922ce7bbcf5 Merge branch 'for_4.14/keystone_dts' into next)
Merging mvebu/for-next (b9d2ea8a7107 Merge branch 'mvebu/dt' into mvebu/for-next)
Merging omap/for-next (a70cb93b6c2f Merge branch 'omap-for-v4.14/dt-v3' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging reset/reset/next (ac0c735ac3dd reset: uniphier: add analog amplifiers reset control)
Merging qcom/for-next (b212aba8f7bf Merge tag 'qcom-drivers-for-4.14' into final-for-sure-4.14)
Merging realtek/for-next (932a3d80019d Merge branch 'v4.14/dt64' into next)
Merging renesas/next (e6bf13206283 Merge branches 'arm64-dt-for-v4.14', 'dt-bindings-for-v4.14' and 'dt-for-v4.14' into next)
Merging rockchip/for-next (23b856f7af3c Merge branch 'v4.14-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging samsung-krzk/for-next (e6f2efc1a7da Merge branch 'next/soc' into for-next)
Merging sunxi/sunxi/for-next (a5cedb2ecb7f Merge branch 'sunxi/clk-for-4.14' into sunxi/for-next)
Merging tegra/for-next (b4aed883ebbe Merge branch for-4.14/arm/defconfig into for-next)
Merging arm64/for-next/core (d1be5c99a034 arm64: cleanup {COMPAT_,}SET_PERSONALITY() macro)
CONFLICT (content): Merge conflict in arch/arm64/kernel/fpsimd.c
Merging clk/clk-next (69a6beab0852 clk: msm8996-gcc: add missing smmu clks)
CONFLICT (content): Merge conflict in MAINTAINERS
Merging clk-samsung/for-next (599cebea93e6 clk: samsung: exynos542x: Enable clock rate propagation up to the EPLL)
Merging c6x/for-linux-next (636d42117800 c6x: Convert to using %pOF instead of full_name)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (558d5ad276c9 m68k/mac: Avoid soft-lockup warning after mach_power_off)
Merging m68knommu/for-next (8a1943492bd6 m68knommu: remove dead code)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
Merging microblaze/next (14ef905bb2ee microblaze: Fix MSR flags when returning from exception)
Merging mips/mips-for-linux-next (c775dffa004e Merge branches '4.13-fixes' and '4.14-features' into mips-for-linux-next)
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
Merging openrisc/for-next (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options)
Merging parisc-hd/for-next (fd46cd55fbc5 printk-formats.txt: Add examples for %pF and %pS usage)
Merging powerpc/next (197267d03560 cxl: Fix driver use count)
Merging fsl/next (a4e89ffb5923 powerpc/e6500: Update machine check for L1D cache err)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (fa41ba0d08de s390/mm: avoid empty zero pages for KVM guests to avoid postcopy hangs)
Merging sparc-next/master (5bd0ea9107dc sparc64: vcc: make ktermios const)
Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses)
Merging tile/master (637f23abca87 tile: array underflow in setup_maxnodemem())
Merging uml/linux-next (2fb44600fe78 um: Fix check for _xstate for older hosts)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild
Merging xtensa/xtensa-for-next (271335b9726e Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool)
Merging befs/for-next (5771a8c08880 Linux v4.13-rc1)
Merging btrfs/next (5226fcac7841 squashfs: Add zstd support)
Merging btrfs-kdave/for-next (d112b114021d Merge branch 'for-next-next-v4.14-20170822' into for-next-20170822)
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
CONFLICT (content): Merge conflict in fs/btrfs/compression.h
Merging ceph/master (dd2bc473482e ceph: fix readpage from fscache)
Merging cifs/for-next (6e3c1529c39e CIFS: remove endian related sparse warning)
Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero())
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (9b8d51f53833 Merge dnotify cleanup from branch 'for_next_testing' into for_next.)
Merging ext4/dev (42d4a99b09cb ext4: fix fault handling when mounted with -o dax,ro)
Merging f2fs/dev (774e1b78a0f9 f2fs: trigger fdatasync for non-atomic_write file)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (9183976ef1c8 fuse: set mapping error in writepage_locked when it fails)
Merging jfs/jfs-next (f070e5ac9bc7 jfs: preserve i_mode if __jfs_set_acl() fails)
Merging nfs/linux-next (7af7a5963c40 Merge branch 'bugfixes')
Merging nfsd/nfsd-next (7075a867ce57 svcrdma: Clean up svc_rdma_build_read_chunk())
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
Merging overlayfs/overlayfs-next (4edb83bb1041 ovl: constant d_ino for non-merge dirs)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (a6664433d383 ubifs: Set double hash cookie also for RENAME_EXCHANGE)
Merging xfs/for-next (570baff74745 xfs: fix unused variable warning in xfs_buf_item_unlock())
Merging file-locks/locks-next (3953704fde7e locks: restore a warn for leaked locks on close)
Merging wberr/wberr-next (6d4b51241394 ecryptfs: convert to file_write_and_wait in ->fsync)
Merging vfs/for-next (66bf97967726 annotate RWF_... flags)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (077a1cc06f72 printk: Clean up do_syslog() error handling)
Merging pci/next (03e3e6914f44 Merge branch 'pci/virtualization' into next)
CONFLICT (content): Merge conflict in drivers/pci/probe.c
Merging pstore/for-next/pstore (c71b02e4d207 Revert "pstore: Honor dmesg_restrict sysctl on dmesg dumps")
Merging hid/for-next (abbc4db7a3a0 Merge branch 'for-4.14/upstream' into for-next)
Merging i2c/i2c/for-next (2f1db5e1f86f 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 (f996c4155d0d dmi: Mark all struct dmi_system_id instances const)
Merging hwmon-staging/hwmon-next (610526527a13 hwmon: (pmbus) Add support for Texas Instruments tps53679 device)
Merging jc_docs/docs-next (86c0f046a8b0 Documentation/sphinx: fix kernel-doc decode for non-utf-8 locale)
Merging v4l-dvb/master (fce4b371fe5c media: serial_ir: fix tx timing calculation on 32-bit)
CONFLICT (content): Merge conflict in arch/arm/configs/imx_v6_v7_defconfig
Merging v4l-dvb-next/master (474dfccf3685 media: svg: avoid too long lines)
Merging fbdev/fbdev-for-next (aa55457d26ec omapfb: constify omap_video_timings structures)
Merging pm/linux-next (7f8122a4e8c8 Merge branch 'acpi-apei' into linux-next)
CONFLICT (content): Merge conflict in drivers/acpi/sbs.c
CONFLICT (content): Merge conflict in drivers/acpi/blacklist.c
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (e1ffd591fe88 Merge branches 'thermal-core', 'thermal-intel', 'thermal-soc' and 'const-thermal-zone-structure' into next)
Merging thermal-soc/next (aa647852c32a Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (1c2428537241 dlm: use sock_create_lite inside tcp_accept_from_sock)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (e12f1a5952c9 Merge branch 'mlxsw-Add-IPv6-host-dpipe-table')
CONFLICT (content): Merge conflict in net/ipv6/ip6_fib.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/marvell/mvpp2.c
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3328.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3328-evb.dts
Merging ipsec-next/master (8598112d04af xfrm: Fix return value check of copy_sec_ctx.)
Merging netfilter-next/master (1aff64715edb netfilter: rt: account for tcp header size too)
Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock)
Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.)
Merging wireless-drivers-next/master (eb464d4a8d09 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (dbbccdc4ced0 Bluetooth: Add option for disabling legacy ioctl interfaces)
Merging mac80211-next/master (3dc02251f43f Merge branch 'skb-accessor-cleanups')
Merging rdma/for-next (c50c98d38291 Merge branch 'k.o/net-next-base' into k.o/for-next-merged-2)
Merging gfs2/for-next (309e8cda596f gfs2: preserve i_mode if __gfs2_set_acl() fails)
Merging mtd/master (be3e83e3471c mtd: nand: atmel: Relax tADL_min constraint)
Merging l2-mtd/master (5ffa70b2a38b Merge tag 'v4.13-rc7' into mtd/next)
Merging nand/nand/next (2d2a2b8c080a mtd: nand: complain loudly when chip->bits_per_cell is not correctly initialized)
Merging spi-nor/spi-nor/next (18f7ce2f4495 mtd: spi-nor: add support for Microchip sst26vf064b QSPI memory)
Merging crypto/master (2d45a7e89833 crypto: af_alg - get_page upon reassignment to TX SGL)
Merging drm/drm-next (7846b12fe0b5 Merge branch 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-plane.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (fa3722f64966 drm/i915: Ignore duplicate VMA stored within the per-object handle LUT)
Merging drm-tegra/drm/tegra/for-next (65d5d30ccebd drm/tegra: trace: Fix path to include)
Merging drm-misc/for-linux-next (f44d85389e17 drm: rename u32 in __u32 in uapi)
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 (0502a625c2ee drm/msm: fix error path cleanup)
Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables)
Merging mali-dp/for-upstream/mali-dp (e46477b8f23c drm: mali-dp: Restore commit_tail behaviour to the runtime_pm friendly version.)
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 (9303519985ed drm/imx: parallel-display: use correct connector enum)
Merging etnaviv/etnaviv/next (65375b873cb5 drm/etnaviv: switch GEM allocations to __GFP_RETRY_MAYFAIL)
Merging kconfig/for-next (6f7da290413b Linux 4.12)
Merging regmap/for-next (1874021ec3a8 Merge remote-tracking branches 'regmap/topic/const' and 'regmap/topic/namespace' into regmap-next)
Merging sound/for-next (39cdc62b1b4e ALSA: ctxfi: Remove null check before kfree)
Merging sound-asoc/for-next (b66e8b427ea5 Merge remote-tracking branches 'asoc/topic/wm8524', 'asoc/topic/wm8804' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (0bf8bf50eddc module: Remove const attribute from alias for MODULE_DEVICE_TABLE)
Merging input/next (08d6ac9ee5fe Input: byd - make array seq static, reduces object code size)
Merging block/for-next (d6b4e4f33d89 Merge branch 'for-4.14/block-postmerge' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (2298b6212f1c dm ioctl: constify ioctl lookup table)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (795c633f6093 mmc: meson-gx: fix __ffsdi2 undefined on arm32)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (675dc2ccc27c raid5-ppl: Recovery support for multiple partial parity logs)
CONFLICT (content): Merge conflict in drivers/md/raid5-ppl.c
Merging mfd/for-mfd-next (f7e889c747eb mfd: Add ROHM BD9571MWV-M PMIC DT bindings)
Merging backlight/for-backlight-next (2606706e4d7b backlight: gpio_backlight: Delete pdata inversion)
Merging battery/for-next (b388f21faf96 power: supply: bq27xxx: enable writing capacity values for bq27500)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (97c76efeff8f Merge remote-tracking branches 'regulator/topic/pwm', 'regulator/topic/qcom', 'regulator/topic/rc5t619' and 'regulator/topic/stm32-vref' into regulator-next)
Merging security/next (b6fd397b9008 apparmor: fix build failure on sparc caused by undeclared, signals)
Merging integrity/next (ed301d2614d2 ima: define "fs_unsafe" builtin policy)
Merging keys/keys-next (8ab2a6905b28 KEYS: Add documentation for asymmetric keyring restrictions)
Merging selinux/next (0c3014f22dec selinux: constify nf_hook_ops)
Merging tpmdd/next (05e79b68dfac tpm: migrate pubek_show to struct tpm_buf)
Merging watchdog/master (c013b65ad8a1 watchdog: introduce watchdog_worker_should_ping helper)
Merging iommu/next (6541c53edab5 Merge branches 'arm/exynos', 'arm/renesas', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/tegra', 'arm/qcom', 'arm/smmu', 'ppc/pamu', 'x86/vt-d', 'x86/amd', 's390' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (417fb50d5516 vfio: platform: constify amba_id)
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
Merging audit/next (4070ad3e8ffa audit: update the function comments)
Merging devicetree/for-next (55e18b183351 virt: Convert to using %pOF instead of full_name)
Merging mailbox/mailbox-for-next (1da92afbbfcd mailbox: bcm-flexrm-mailbox: Use txdone_ack instead of txdone_poll)
Merging spi/for-next (8273871c2979 Merge remote-tracking branches 'spi/topic/stm32', 'spi/topic/sunxi', 'spi/topic/tegra', 'spi/topic/tools' and 'spi/topic/xlp' into spi-next)
CONFLICT (content): Merge conflict in drivers/spi/spi.c
Merging tip/auto-latest (9fed96b1b075 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in tools/Makefile
CONFLICT (content): Merge conflict in kernel/sched/fair.c
CONFLICT (content): Merge conflict in drivers/video/fbdev/core/fbmem.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/cavium/liquidio/lio_main.c
CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu_types.h
CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu_proto.h
CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu_init.c
CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu.c
CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/arm64-stub.c
Applying: liquidio: fix for merge with "smp: Avoid using two cache lines for struct call_single_data"
Merging clockevents/clockevents/next (2287d8664fe7 timers: Make the cpu base lock raw)
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 (398443471f16 EDAC, mce_amd: Get rid of local var in amd_filter_mce())
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (a7e52ad7ed82 ring-buffer: Have ring_buffer_alloc_read_page() return error on offline CPU)
Merging rcu/rcu/next (fb93c0bd1a3b torture: Provide TMPDIR environment variable to specify tmpdir)
CONFLICT (content): Merge conflict in arch/x86/mm/tlb.c
Merging kvm/linux-next (712b12d72451 kvm: nVMX: Validate the virtual-APIC address on nested VM-entry)
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h
Merging kvm-arm/next (012834a6cb74 KVM: arm/arm64: vgic: constify seq_operations and file_operations)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (43f6b0cfb2e4 KVM: PPC: Book3S HV: Fix memory leak in kvm_vm_ioctl_get_htab_fd)
Merging kvms390/next (c95c895303ed KVM: s390: vsie: cleanup mcck reinjection)
Merging xen-tip/linux-next (d785d9ec7894 xen/mmu: set MMU_NORMAL_PT_UPDATE in remap_area_mfn_pte_fn)
Merging percpu/for-next (5e81ee3e6a79 percpu: update header to contain bitmap allocator explanation.)
Merging workqueues/for-next (f7db01f6cbac Merge branch 'for-4.14' into for-next)
Merging drivers-x86/for-next (00ebbeb39b70 platform/x86: dell-wmi: Update dell_wmi_check_descriptor_buffer() to new model)
CONFLICT (content): Merge conflict in drivers/platform/x86/dell-wmi.c
Merging chrome-platform/for-next (69237e85ece7 platform/chrome: cros_ec: register shutdown function for debugfs)
Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions)
Merging leds/for-next (1591caf2d5ea leds: pca955x: check for I2C errors)
Merging ipmi/for-next (7605d9cda4cc IPMI: make ipmi_poweroff_handler const)
Merging driver-core/driver-core-next (7521621e600a Do not disable driver and bus shutdown hook when class shutdown hook is set.)
Merging usb/usb-next (3a161913990e usbip: vhci-hcd: make vhci_hc_driver const)
Merging usb-gadget/next (0852659ef071 usb: gadget: f_ncm/u_ether: Move 'SKB reserve' quirk setup to u_ether)
Merging usb-serial/usb-next (b5fdde28d4b7 USB: serial: option: simplify 3 D-Link device entries)
Merging usb-chipidea-next/ci-for-usb-next (dfebb5f43a78 usb: chipidea: Add support for Tegra20/30/114/124)
Merging phy-next/next (d9c51f4c53ae phy: brcm-sata: fix a timeout test in init)
Merging tty/tty-next (3840ed9548f7 tty: goldfish: Implement support for kernel 'earlycon' parameter)
CONFLICT (content): Merge conflict in drivers/tty/serial/mux.c
CONFLICT (content): Merge conflict in drivers/tty/serial/8250/8250_gsc.c
Merging char-misc/char-misc-next (a97db8818c7e drivers: w1: add hwmon temp support for w1_therm)
Merging extcon/extcon-next (4243c408f740 extcon: max77693: Allow MHL attach notifier)
Merging staging/staging-next (a470ad21f980 staging: r8822be: Simplify deinit_priv())
CONFLICT (content): Merge conflict in tools/Makefile
Merging mux/for-next (aae4e7a8bc44 Linux 4.13-rc4)
Merging slave-dma/next (87f6b650718e Merge branch 'topic/altera' into next)
Merging cgroup/for-next (9c3bace4684b Merge branch 'for-4.13-fixes' into for-next)
Merging scsi/for-next (404ce00c072c Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/staging/unisys/visorhba/visorhba_main.c
Applying: Revert "scsi: qlogicpti: move bus reset to host reset"
Merging scsi-mkp/for-next (a45a1f361418 scsi: scsi-mq: Always unprepare before requeuing a request)
CONFLICT (content): Merge conflict in include/scsi/scsi_cmnd.h
Merging target-updates/for-next (04229774f692 tcmu: Oops in unmap_thread_fn())
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1)
Merging libata/for-next (1a82b6650f30 Merge branch 'for-4.13-fixes' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (ba74b6f7fcc0 virtio_pci: fix cpu affinity support)
Merging rpmsg/for-next (0a604075dcb7 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
CONFLICT (content): Merge conflict in drivers/soc/qcom/Kconfig
Merging gpio/for-next (2b40aada2e0c Merge branch 'devel' into for-next)
Merging pinctrl/for-next (e480b745386e pinctrl: intel: Add Intel Lewisburg GPIO support)
Merging pinctrl-samsung/for-next (bbed85f45b2b pinctrl: samsung: Remove unneeded local variable initialization)
Merging pwm/for-next (7755daf5e7e8 Merge branch 'for-4.14/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (64a76d0d64be signal: Fix sending signals with siginfo)
CONFLICT (content): Merge conflict in arch/mips/kernel/traps.c
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (72e5c740f633 random: reorder READ_ONCE() in get_random_uXX)
Merging aio/master (4c1d69950da4 fs: aio: fix the increment of aio-nr and counting against aio-max-nr)
Merging kselftest/next (4fecd0c8de50 selftest: Enhance kselftest_harness.h with a step mechanism)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (26d8d1e9bb48 Merge branch 'for-4.12/upstream-fixes' into for-next)
Merging coresight/next (817ee52788a5 coresight: Extend the PIDR mask to cover relevant bits in PIDR2)
Merging rtc/rtc-next (17ecd246414b rtc: sun6i: Add support for the external oscillator gate)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (bbb3be170ac2 device-dax: fix sysfs duplicate warnings)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging kspp/for-next/kspp (cb624a11ecd5 Merge branch 'for-next/secureexec' into for-next/kspp)
Merging akpm-current/current (abad2765eaef ipc: optimize semget/shmget/msgget for lots of keys)
CONFLICT (content): Merge conflict in arch/parisc/include/uapi/asm/mman.h
Applying: zram-mm-vs-block
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/media/cec/cec-adap.c: fix build with gcc-4.4.4
Applying: fscache: fix fscache_objlist_show format processing
Applying: IB/mlx4: fix sprintf format warning
Applying: iopoll: avoid -Wint-in-bool-context warning
Applying: select: use get/put_timespec64
Applying: io_getevents: use timespec64 to represent timeouts
Applying: sparc64: NG4 memset 32 bits overflow
Applying: mm: treewide: remove GFP_TEMPORARY allocation flag
Applying: treewide-remove-gfp_temporary-allocation-flag-fix
Applying: treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes
Applying: drm/i915: fix up for mm: treewide: remove GFP_TEMPORARY allocation flag
Applying: arm64: stacktrace: avoid listing stacktrace functions in stacktrace
Applying: mm, page_owner: skip unnecessary stack_trace entries
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (f28c76f4c58d lib/crc-ccitt: add CCITT-FALSE CRC16 variant)

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

* linux-next: Tree for Sep 1
@ 2015-09-01  8:21 Stephen Rothwell
  0 siblings, 0 replies; 40+ messages in thread
From: Stephen Rothwell @ 2015-09-01  8:21 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

Please do not add material for v4.4 until after v4.3-rc1 is out.

Changes since 20150831:

I used the h8300 tree from next-20150828 since the current tree has been
rebased onto something very old :-(

The tty tree still had its build failure for which I reverted part of
a commit.

The rcu tree gained a build failure so I used the version from
next-20150831.

The gpio tree lost its build failure.

Non-merge commits (relative to Linus' tree): 10832
 9662 files changed, 584754 insertions(+), 253421 deletions(-)

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

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

You can see which trees have been included by looking in the Next/Trees
file in the source.  There are also quilt-import.log and merge.log
files in the Next directory.  Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig for x86_64,
a multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), it is also built with powerpc allnoconfig
(32 and 64 bit), ppc44x_defconfig 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 225 trees (counting Linus' and 33 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 (64291f7db5bd Linux 4.2)
Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
Merging arm-current/fixes (3939f3345050 ARM: 8418/1: add boot image dependencies to not generate invalid images)
Merging m68k-current/for-linus (1ecb40643a9a m68k/bootinfo: Use kmemdup rather than duplicating its implementation)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (4d9aac397a5d powerpc/PCI: Disable MSI/MSI-X interrupts at PCI probe time in OF case)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave)
Merging net/master (f892a84cc890 net/smsc911x: Fix deferred probe for interrupt)
Merging ipsec/master (158cd4af8ded packet: missing dev_put() in packet_do_bind())
Merging sound-current/for-linus (08ceab9d8758 Merge tag 'asoc-v4.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (45ea2a5fed6d PCI: Don't use 64-bit bus addresses on PA-RISC)
Merging wireless-drivers/master (741e3b9902d1 rtlwifi: rtl8723be: Add module parameter for MSI interrupts)
Merging driver-core.current/driver-core-linus (cbfe8fa6cd67 Linux 4.2-rc4)
Merging tty.current/tty-linus (cbfe8fa6cd67 Linux 4.2-rc4)
Merging usb.current/usb-linus (f7644cbfcdf0 Linux 4.2-rc6)
Merging usb-gadget-fixes/fixes (c93e64e91248 usb: udc: core: add device_del() call to error pathway)
Merging usb-serial-fixes/usb-linus (d071a3cdd2e1 USB: qcserial: add HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module)
Merging staging.current/staging-linus (f7644cbfcdf0 Linux 4.2-rc6)
Merging char-misc.current/char-misc-linus (f7644cbfcdf0 Linux 4.2-rc6)
Merging input-current/for-linus (e51e38494a8e Input: synaptics - fix handling of disabling gesture mode)
Merging crypto-current/master (bf433416e675 crypto: algif_aead - fix for multiple operations on AF_ALG sockets)
Merging ide/master (d681f1166919 ide: remove deprecated use of pci api)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue)
Merging kselftest-fixes/fixes (fee50f3c8427 selftests/futex: Fix futex_cmp_requeue_pi() error handling)
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 (fb9caeedafe6 mfd: Remove MFD_CROS_EC_SPI depends on OF)
Merging drm-intel-fixes/for-linux-next-fixes (c13dcf9f2d6f Linux 4.2-rc8)
Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic)
Merging arc/for-next (3d5926599a6b ARCv2: entry: Fix reserved handler)
Merging arm/for-next (0986c811d54f Merge branch 'drm-dwhdmi-devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/include/asm/Kbuild
Merging arm-perf/for-next/perf (fa8ad7889d83 arm: perf: factor arm_pmu core out to drivers)
Merging arm-soc/for-next (38af586237cf arm-soc: document merges)
CONFLICT (modify/delete): drivers/cpufreq/exynos-cpufreq.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/cpufreq/exynos-cpufreq.c left in tree.
CONFLICT (modify/delete): arch/arm/kernel/psci.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of arch/arm/kernel/psci.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/configs/imx_v6_v7_defconfig
$ git rm -f arch/arm/kernel/psci.c drivers/cpufreq/exynos-cpufreq.c
Applying: ARM: fix for PSCI code movement
Merging at91/at91-next (253ebd4df402 Merge branch 'at91-4.3-defconfig' into at91-next)
CONFLICT (content): Merge conflict in arch/arm/mach-at91/sama5.c
CONFLICT (content): Merge conflict in arch/arm/configs/at91_dt_defconfig
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging berlin/berlin/for-next (d770e558e219 Linux 4.2-rc1)
Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M)
Merging imx-mxs/for-next (c746ef1b64e9 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2l.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2hk.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/k2e.dtsi
Merging mvebu/for-next (adfc8c76d84a Merge branch 'mvebu/config' into mvebu/for-next)
Merging omap/for-next (b2a882022a1e Merge branch 'omap-for-v4.3/dt-v2' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging qcom/qcom/for-next (4f4cd70a7f65 arm: dt: Add scm support for MSM8974)
Merging renesas/next (53d5bd1b09d2 Merge branch 'heads/sh-drivers-for-v4.3' into next)
Merging rockchip/for-next (ed0450118b2f Merge branch 'v4.3-armsoc/soc' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (112129267f1a Merge branch 'v4.3-next/dt64-samsung' into for-next)
Merging samsung-krzk/for-next (002528669469 Merge branch 'defconfig-for-next' into for-next)
Merging sunxi/sunxi/for-next (9d73c13a139c Merge branches 'sunxi/dt-for-4.3' and 'sunxi/defconfig-for-4.3' into sunxi/for-next)
Merging tegra/for-next (bea5a17a8beb Merge branch for-4.3/defconfig into for-next)
Merging arm64/for-next/core (674c242c9323 arm64: flush FP/SIMD state correctly after execve())
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (960a2741d5fd c67: irq: Use __handle_domain_irq())
Merging cris/for-next (1e4d6e13d050 cris: don't use module_init for non-modular core eeprom.c code)
CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
Merging h8300/h8300-next (99bcfda85f66 Revert "asm-generic: {get,put}_user ptr argument evaluate only 1 time")
Merging hexagon/linux-next (15978bfde3bb hexagon/time: Migrate to new 'set-state' interface)
Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next)
Merging m68k/for-next (1ecb40643a9a m68k/bootinfo: Use kmemdup rather than duplicating its implementation)
Merging m68knommu/for-next (50e48bd06731 m68k/coldfire: use PFN_DOWN macro)
Merging metag/for-next (3fe6942f0486 Documentation/features/vm: Meta2 is capable of THP)
Merging microblaze/next (bb88ba0946dd elf-em.h: move EM_MICROBLAZE to the common header)
Merging mips/mips-for-linux-next (016c3edb9815 Merge branch '4.2-fixes' into mips-for-linux-next)
Merging nios2/for-next (81c9517e7ab4 nios2/time: Migrate to new 'set-state' interface)
Merging parisc-hd/for-next (0c0f80b3f908 parisc: Define ioremap_uc and ioremap_wc)
Merging powerpc/next (390fd5929f52 cxl: Set up and enable PSL Timebase)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (4524cd093fa8 powerpc/t1023rdb/dts: set ifc nand chip select from 2 to 1)
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging s390/features (e4ec73510812 s390/jump_label: Use %*ph to print small buffers)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (8d03bc56cc27 tile: correct some typos in opcode type names)
CONFLICT (content): Merge conflict in include/uapi/linux/elf-em.h
Merging uml/linux-next (bdbac7d0e2b3 um: Fix kernel mode fault condition)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing)
CONFLICT (content): Merge conflict in arch/xtensa/include/asm/atomic.h
Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled)
Merging ceph/master (64c1797a9371 libceph: Remove spurious kunmap() of the zero page)
Merging cifs/for-next (5fb4e288a025 cifs: Fix use-after-free on mid_q_entry)
Merging ecryptfs/next (0dad87fcb732 eCryptfs: Delete a check before the function call "key_put")
Merging ext3/for_next (9181f8bf5abf udf: Don't modify filesystem for read-only mounts)
Merging ext4/dev (bdfe0cbd746a Revert "ext4: remove block_device_ejected")
Merging f2fs/dev (54d718564289 f2fs: avoid accessing NULL pointer in f2fs_drop_largest_extent)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry)
Merging gfs2/for-next (ea79f0ec7a38 GFS2: Make ht_parms static)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (2d89a1d3c9ff NFSv4.1/pNFS: Don't request a minimal read layout beyond the end of file)
Merging nfsd/nfsd-next (244f5497362b nfsd: don't hold i_mutex over userspace upcalls)
Merging orangefs/for-next (600896a3b8b0 Orangefs: Swap order of include files)
Merging overlayfs/overlayfs-next (cdb672795876 ovl: lookup whiteouts outside iterate_dir())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (b5ac1fb2717e 9p: fix return code of read() when count is 0)
Merging ubifs/linux-next (071a1f837f72 UGIFS: fix a typo in comment of ubifs_budget_req)
Merging xfs/for-next (70b33a7466ba Merge branch 'xfs-misc-fixes-for-4.3-3' into for-next)
Merging file-locks/linux-next (ee296d7c5709 locks: inline posix_lock_file_wait and flock_lock_file_wait)
Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root)
Merging pci/next (9ca678d1dff6 Merge branches 'pci/enumeration' and 'pci/misc' into next)
CONFLICT (content): Merge conflict in drivers/pci/host/pcie-iproc.c
CONFLICT (content): Merge conflict in drivers/pci/host/Kconfig
Merging hid/for-next (c5a0db1eed32 Merge branch 'for-4.3/wacom' into for-next)
Merging i2c/i2c/for-next (31bb26d67b48 Merge branch 'i2c/for-4.3' into i2c/for-next)
Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define)
Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging hwmon-staging/hwmon-next (1ed32160dba6 hwmon: (fam15h_power) Add ratio of Tsample to the PTSC period)
Merging v4l-dvb/master (cb72d295ed59 Merge branch 'patchwork' into to_next)
Merging kbuild/for-next (3161460642b5 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (82908d67958c Merge branch 'for-4.2-fixes' into for-next)
Merging pm/linux-next (9ea77b2f6313 Merge branches 'pm-cpufreq' and 'pm-opp' into linux-next)
Merging idle/next (aba5686671dc Merge branch 'cpuidle' into release)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (6ce87b2a60f1 Merge branches 'for-rc' and 'release' of .git into next)
Merging thermal-soc/next (1afb9c539dae thermal/cpu_cooling: update policy limits if clipped_freq < policy->max)
Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
Merging dlm/next (b3a5bbfd780d dlm: print error from kernel_sendpage)
Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function)
Merging slave-dma/next (f53d906c6323 Merge branch 'for-linus' into next)
CONFLICT (content): Merge conflict in drivers/dma/Makefile
CONFLICT (content): Merge conflict in drivers/dma/Kconfig
Merging net-next/master (6ea3c9d5b042 mpls: fix mpls_net_init memory leak)
Merging ipsec-next/master (e69948a0a530 net: Document xfrm4_gc_thresh and xfrm6_gc_thresh)
Merging wireless-drivers-next/master (0ba3ac03c1f3 Merge ath-next from ath.git)
Merging bluetooth/master (7c426e359570 Bluetooth: hci_qca: Fix a few tab vs spaces issues)
Merging rdma/for-next (153b7306b7c6 Merge branch 'hfi1-v4' into to-be-rebased/for-4.3)
CONFLICT (content): Merge conflict in net/core/dev.c
Applying: net: merge change upper notifier changes
Merging mtd/master (5f867db63473 mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict)
Merging l2-mtd/master (718e38b4d960 mtd: mtd_oobtest: Fix the address offset with vary_offset case)
Merging crypto/master (bf433416e675 crypto: algif_aead - fix for multiple operations on AF_ALG sockets)
Merging drm/drm-next (879a37d00f18 Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
Merging drm-panel/drm/panel/for-next (a33ee95f8f45 drm/bridge: Put Kconfig entries in a separate menu)
Merging drm-intel/for-linux-next (d8e19f99d348 drm/i915/skl: Adding DDI_E power well domain)
Merging drm-tegra/drm/tegra/for-next (459cc2c6800b drm/tegra: sor: Add HDMI support)
Merging drm-misc/topic/drm-misc (6b976cc293b9 dtrm/edid: Allow comma separated edid binaries. (v3))
Merging drm-exynos/exynos-drm/for-next (1b647a166f07 Merge tag 'dmaengine-fix-4.2-rc8' of git://git.infradead.org/users/vkoul/slave-dma)
Merging drm-msm/msm-next (d248b61f6114 drm/msm/dsi: Introduce DSI configuration module)
Merging sound/for-next (08ceab9d8758 Merge tag 'asoc-v4.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc/for-next (c10c685b073b Merge remote-tracking branch 'asoc/topic/mtk' into asoc-next)
Merging modules/modules-next (5cfb203a304d modpost: abort if a module symbol is too long)
Merging input/next (d6f5aef298b5 Input: max8997_haptic - fix module alias)
Merging block/for-next (721cb0165e64 Merge branch 'for-4.3/drivers' into for-next)
CONFLICT (content): Merge conflict in fs/fs-writeback.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/scrub.c
CONFLICT (content): Merge conflict in fs/btrfs/raid56.c
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
CONFLICT (content): Merge conflict in drivers/md/dm.c
CONFLICT (content): Merge conflict in crypto/ccm.c
CONFLICT (content): Merge conflict in block/bounce.c
Applying: block: lustre: temporary fix for bio_endio API change
Merging device-mapper/for-next (dc9cee5db50a dm cache: small cleanups related to deferred prison cell cleanup)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (71f8a4b81d04 mmc: core: fix race condition in mmc_wait_data_done)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (c3cce6cda162 md/raid5: ensure device failure recorded before write request returns.)
CONFLICT (content): Merge conflict in drivers/md/raid5.c
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid0.c
Merging mfd/for-mfd-next (5a688c455066 mfd: jz4740-adc: Init mask cache in generic IRQ chip)
CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
Merging backlight/for-backlight-next (13d20b3b618a backlight: tosa: Export I2C module alias information)
Merging battery/master (b68c3161430a bq2415x_charger: Allow to load and use driver even if notify device is not registered yet)
Merging omap_dss2/for-next (b06ece93cf96 video: fbdev: s3c-fb: Constify platform_device_id)
Merging regulator/for-next (f5164b883349 Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next)
Merging security/next (3f1d44ae6401 Documentation/Changes: Now need OpenSSL devel packages for module signing)
CONFLICT (content): Merge conflict in security/yama/yama_lsm.c
Merging integrity/next (24fd03c87695 ima: update builtin policies)
Merging selinux/next (fda4d578ed0a selinux: explicitly declare the role "base_r")
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (330de3d85671 Watchdog: Fix parent of watchdog_devices)
Merging iommu/next (4ad79562577a Merge branches 'arm/omap', 'arm/msm', 'arm/smmu', 'arm/tegra', 'x86/vt-d', 'x86/amd', 'ppc/pamu' and 'core' into next)
Merging dwmw2-iommu/master (5dbaf90a6780 iommu/vt-d: Add initial shell of SVM support)
Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer)
Merging jc_docs/docs-next (ce14c5831364 Documentation, add kernel-parameters.txt entry for dis_ucode_ldr)
Merging trivial/for-next (e5f6450c3f40 MAINTAINERS: update my e-mail address)
CONFLICT (modify/delete): drivers/regulator/max77843.c deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of drivers/regulator/max77843.c left in tree.
CONFLICT (content): Merge conflict in drivers/media/v4l2-core/videobuf2-memops.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
$ git rm -f drivers/regulator/max77843.c
Merging audit/next (15ce414b82b0 fixup: audit: implement audit by executable)
CONFLICT (content): Merge conflict in kernel/audit.c
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (126b16e2ad98 Docs: dt: add generic MSI bindings)
Merging mailbox/mailbox-for-next (86e488adaab7 mailbox: arm_mhu: reduce txpoll_period from 10ms to 1 ms)
Merging spi/for-next (d63e96800175 Merge tag 'spi-v4.3' into spi-next)
Merging tip/auto-latest (1e2d24a48445 Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in arch/s390/lib/uaccess.c
CONFLICT (content): Merge conflict in arch/mips/include/asm/switch_to.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/barrier.h
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7779.c
CONFLICT (modify/delete): arch/arm/mach-shmobile/intc-sh73a0.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/arm/mach-shmobile/intc-sh73a0.c left in tree.
$ git rm -f arch/arm/mach-shmobile/intc-sh73a0.c
Merging clockevents/clockevents/next (2b5cf544934f cris/time: Migrate to new 'set-state' interface)
Merging edac/linux_next (fa2ce64f85be sb_edac: support for Broadwell -EP and -EX)
Merging edac-amd/for-next (99e1dfb7d209 EDAC, mce_amd: Don't emit 'CE' for Deferred error)
Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (9f61668073a8 tracing: Allow triggers to filter for CPU ids and process names)
Merging rcu/rcu/next (f72a338a4833 rcu: Change _wait_rcu_gp() to work around GCC bug 67055)
$ git reset --hard HEAD^
Merging next-20150831 version of rcu
Merging kvm/linux-next (4d283ec908e6 x86/kvm: Rename VMX's segment access rights defines)
Merging kvm-arm/next (054167b3d551 arm: KVM: keep arm vfp/simd exit handling consistent with arm64)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
CONFLICT (content): Merge conflict in arch/powerpc/kvm/book3s_hv.c
Merging kvms390/next (152b28392a8d KVM: s390: Fix assumption that kvm_set_irq_routing is always run successfully)
Merging xen-tip/linux-next (50672d663eb7 xen: avoid another early crash of memory limited dom0)
CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c
Merging percpu/for-next (292c24a073ee percpu: clean up of schunk->map[] assignment in pcpu_setup_first_chunk)
Merging workqueues/for-next (355c06633e23 workqueue: fix some docbook warnings)
Merging drivers-x86/for-next (2508a45a924d surface pro 3: Add support driver for Surface Pro 3 buttons)
Merging chrome-platform/for-next (1d95e6f10fd8 platform/chrome: cros_ec: Fix possible leak in led_rgb_store())
Merging regmap/for-next (b64946359021 Merge remote-tracking branches 'regmap/topic/lockdep' and 'regmap/topic/seq-delay' into regmap-next)
Applying: mfd: Fixup clients of multi_reg_write/register_patch
Merging hsi/for-next (d770e558e219 Linux 4.2-rc1)
Merging leds/for-next (4d59ed85451b leds: Export OF module alias information in missing drivers)
Merging ipmi/for-next (43ad3e6dcf35 ipmi:ssif: Add a module parm to specify that SMBus alerts don't work)
Merging driver-core/driver-core-next (71db87ba5700 bus: subsys: update return type of ->remove_dev() to void)
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
Merging tty/tty-next (c868cbb7e5c6 serial: imx: save and restore context in the suspend path)
Applying: serial: imx: partial revert of "introduce serial_imx_enable_wakeup()"
Merging usb/usb-next (44840dec6127 USB: qcserial: add HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module)
Merging usb-gadget/next (2f3cc24f07b8 usb: musb: gadget: fix build break by adding missing 'break')
Merging usb-serial/usb-next (26c78daade0f USB: io_ti: Add heartbeat to keep idle EP/416 ports from disconnecting)
Merging staging/staging-next (415bcb5c6eff staging/lustre/o2iblnd: remove references to ib_reg_phsy_mr())
CONFLICT (modify/delete): drivers/staging/ozwpan/ozproto.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/ozwpan/ozproto.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
$ git rm -f drivers/staging/ozwpan/ozproto.c
Applying: staging/lustre: fix for bio_endio() API change
Merging char-misc/char-misc-next (672cfeeb93e5 Merge tag 'extcon-next-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-testing)
CONFLICT (content): Merge conflict in drivers/misc/ti-st/st_kim.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mshyperv.c
Applying: Drivers: hv: vmbus: fix for the removal of rdtscll()
Merging extcon/extcon-next (ac22a1d3386e extcon: palmas: Fix build break due to devm_gpiod_get_optional API change)
Merging kdbus/kdbus (a36324913ff2 kdbus: selftests: add more name registry tests)
Merging cgroup/for-next (eacb1e7d4bfa Merge branch 'for-4.3' into for-next)
Merging scsi/for-next (26a1d1ceda0a Merge branch 'misc' into for-next)
Merging target-updates/for-next (140373b074ba target/qla2xxx: Honor max_data_sg_nents I/O transfer limit)
CONFLICT (content): Merge conflict in include/scsi/scsi_eh.h
CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c
CONFLICT (content): Merge conflict in drivers/ata/libata-scsi.c
Merging target-merge/for-next-merge (db9e2f795915 mpt3sas: Refcount fw_events and fix unsafe list usage)
Merging pinctrl/for-next (1ab36387ea4f pinctrl: at91: fix null pointer dereference)
Merging vhost/linux-next (0c63b715912b PCI/MSI: Make pci_msi_shutdown(), pci_msix_shutdown() static)
Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (01e2dae99177 Revert "gpio: extraxfs: fix returnvar.cocci warnings")
Applying: tc358743: fix for devm_gpiod_get API change
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (01ec8472009c pwm-pca9685: Support changing the output frequency)
Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging userns/for-next (4b75de861505 fs: Set the size of empty dirs to 0.)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (ba3001157733 clk: s5pv210: add missing call to samsung_clk_of_add_provider())
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c
CONFLICT (content): Merge conflict in drivers/clk/ti/Makefile
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (9fae100cbd10 selftests: breakpoints: fix installing error on the architecture except x86)
Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic)
Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next)
Merging coresight/next (8503d45d4f27 Coresight: ETMv4: Prevent TRCRSCTLR0&1 from being accessed)
Merging rtc/rtc-next (a591008582b8 rtc: Fix module autoload for OF platform drivers)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/am437x-gp-evm.dts
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (004f1afbe199 libnvdimm, pmem: direct map legacy pmem by default)
CONFLICT (content): Merge conflict in mm/Kconfig
CONFLICT (content): Merge conflict in drivers/acpi/nfit.c
Merging akpm-current/current (0931fbddc5f2 lib: scatterlist: add sg splitting function)
CONFLICT (content): Merge conflict in mm/early_ioremap.c
CONFLICT (content): Merge conflict in mm/Makefile
CONFLICT (content): Merge conflict in mm/Kconfig
CONFLICT (content): Merge conflict in kernel/cgroup.c
CONFLICT (content): Merge conflict in include/linux/kexec.h
CONFLICT (modify/delete): fs/ext3/super.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of fs/ext3/super.c left in tree.
CONFLICT (content): Merge conflict in drivers/video/console/Kconfig
CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl
$ git rm -f fs/ext3/super.c
Applying: userfaultfd: selftest: update userfaultfd x86 32bit syscall number
$ git checkout -b akpm remotes/origin/akpm/master
Applying: namei: fix warning while make xmldocs caused by namei.c
Applying: fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void
Applying: fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix
Applying: fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix-fix
Applying: mm: mark most vm_operations_struct const
Applying: mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff()
Applying: mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix
Applying: mm-mpx-add-vm_flags_t-vm_flags-arg-to-do_mmap_pgoff-fix-checkpatch-fixes
Applying: mm: make sure all file VMAs have ->vm_ops set
Applying: mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd()
Applying: mm, madvise: use vma_is_anonymous() to check for anon VMA
Applying: sys_membarrier(): system-wide memory barrier (generic, x86)
Applying: selftests: add membarrier syscall test
Applying: selftests: enhance membarrier syscall test
Applying: dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent}
Applying: dma-mapping: consolidate dma_{alloc,free}_noncoherent
Applying: dma-mapping: cosolidate dma_mapping_error
Applying: dma-mapping: consolidate dma_supported
Applying: dma-mapping: consolidate dma_set_mask
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Merging akpm/master (87b33cad29db drivers/w1/w1_int.c: call put_device if device_register fails)

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

* Re: linux-next: Tree for Sep 1
  2014-09-02 15:00     ` Christoph Lameter
                         ` (3 preceding siblings ...)
  2014-09-14  5:40       ` Jason Cooper
@ 2014-09-19  3:52       ` Tejun Heo
  4 siblings, 0 replies; 40+ messages in thread
From: Tejun Heo @ 2014-09-19  3:52 UTC (permalink / raw)
  To: Christoph Lameter
  Cc: Bartlomiej Zolnierkiewicz, Mark Brown, linux-next, linux-kernel,
	nicolas.pitre, Russell King, Kyungmin Park

On Tue, Sep 02, 2014 at 10:00:07AM -0500, Christoph Lameter wrote:
> On Tue, 2 Sep 2014, Christoph Lameter wrote:
> 
> > Oww.. This is double indirection deal there. A percpu offset pointing to
> > a pointer?
> >
> > Generally the following is true (definition from
> > include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
> >
> > #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
> 
> I think what the issue is that we dropped the fetch of the percpu offset
> in the patch. Instead we are using the address of the variable that
> contains the offset. Does this patch fix it?
> 
> 
> Subject: irqchip: Properly fetch the per cpu offset
> 
> The raw_cpu_read() conversion dropped the fetch of the offset
> from base->percpu_base in gic_get_percpu_base.
> 
> Signed-off-by: Christoph Lameter <cl@linux.com>

Applied to percpu/for-3.18-consistent-ops.

Thanks.

-- 
tejun

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

* Re: linux-next: Tree for Sep 1
  2014-09-14  5:40       ` Jason Cooper
@ 2014-09-18 12:51         ` Bartlomiej Zolnierkiewicz
  0 siblings, 0 replies; 40+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-09-18 12:51 UTC (permalink / raw)
  To: Tejun Heo
  Cc: Jason Cooper, Christoph Lameter, Mark Brown, linux-next,
	linux-kernel, nicolas.pitre, Russell King, Kyungmin Park


Tejun,

Could you please merge Christoph's patch to your percpu tree
(the patch is attached below for your convenience, it is a fixup
for "irqchips: Replace __this_cpu_ptr uses" patch present in
for-3.18-consistent-ops and for-next branches)?

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

On Sunday, September 14, 2014 01:40:55 AM Jason Cooper wrote:
> Christoph,
> 
> On Tue, Sep 02, 2014 at 10:00:07AM -0500, Christoph Lameter wrote:
> > On Tue, 2 Sep 2014, Christoph Lameter wrote:
> > 
> > > Oww.. This is double indirection deal there. A percpu offset pointing to
> > > a pointer?
> > >
> > > Generally the following is true (definition from
> > > include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
> > >
> > > #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
> > 
> > I think what the issue is that we dropped the fetch of the percpu offset
> > in the patch. Instead we are using the address of the variable that
> > contains the offset. Does this patch fix it?
> > 
> > 
> > Subject: irqchip: Properly fetch the per cpu offset
> > 
> > The raw_cpu_read() conversion dropped the fetch of the offset
> > from base->percpu_base in gic_get_percpu_base.
> > 
> > Signed-off-by: Christoph Lameter <cl@linux.com>
> 
> Acked-by: Jason Cooper <jason@lakedaemon.net>
> 
> thx,
> 
> Jason.

From: Christoph Lameter <cl@linux.com>
Subject: [PATCH] irqchip: Properly fetch the per cpu offset

The raw_cpu_read() conversion dropped the fetch of the offset
from base->percpu_base in gic_get_percpu_base.

b.zolnierkie:
This fixes kernel panic on ARM Exynos4 SoCs (i.e. ODROID U3
board).

Signed-off-by: Christoph Lameter <cl@linux.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Reported-and-tested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---

Index: linux/drivers/irqchip/irq-gic.c
===================================================================
--- linux.orig/drivers/irqchip/irq-gic.c
+++ linux/drivers/irqchip/irq-gic.c
@@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
 #ifdef CONFIG_GIC_NON_BANKED
 static void __iomem *gic_get_percpu_base(union gic_base *base)
 {
-	return raw_cpu_read(base->percpu_base);
+	return raw_cpu_read(*base->percpu_base);
 }

 static void __iomem *gic_get_common_base(union gic_base *base)




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

* Re: linux-next: Tree for Sep 1
  2014-09-02 15:00     ` Christoph Lameter
                         ` (2 preceding siblings ...)
  2014-09-05 19:27       ` Nicolas Pitre
@ 2014-09-14  5:40       ` Jason Cooper
  2014-09-18 12:51         ` Bartlomiej Zolnierkiewicz
  2014-09-19  3:52       ` Tejun Heo
  4 siblings, 1 reply; 40+ messages in thread
From: Jason Cooper @ 2014-09-14  5:40 UTC (permalink / raw)
  To: Christoph Lameter
  Cc: Bartlomiej Zolnierkiewicz, Mark Brown, linux-next, linux-kernel,
	nicolas.pitre, Russell King, Tejun Heo, Kyungmin Park

Christoph,

On Tue, Sep 02, 2014 at 10:00:07AM -0500, Christoph Lameter wrote:
> On Tue, 2 Sep 2014, Christoph Lameter wrote:
> 
> > Oww.. This is double indirection deal there. A percpu offset pointing to
> > a pointer?
> >
> > Generally the following is true (definition from
> > include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
> >
> > #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
> 
> I think what the issue is that we dropped the fetch of the percpu offset
> in the patch. Instead we are using the address of the variable that
> contains the offset. Does this patch fix it?
> 
> 
> Subject: irqchip: Properly fetch the per cpu offset
> 
> The raw_cpu_read() conversion dropped the fetch of the offset
> from base->percpu_base in gic_get_percpu_base.
> 
> Signed-off-by: Christoph Lameter <cl@linux.com>

Acked-by: Jason Cooper <jason@lakedaemon.net>

thx,

Jason.

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

* Re: linux-next: Tree for Sep 1
  2014-09-11 11:01             ` Bartlomiej Zolnierkiewicz
@ 2014-09-11 11:17               ` Marc Zyngier
  0 siblings, 0 replies; 40+ messages in thread
From: Marc Zyngier @ 2014-09-11 11:17 UTC (permalink / raw)
  To: Bartlomiej Zolnierkiewicz
  Cc: Russell King - ARM Linux, Nicolas Pitre, Kukjin Kim,
	Christoph Lameter, Mark Brown, linux-next, linux-kernel,
	Tejun Heo, Kyungmin Park

Hi Bartlomiej,

On 11/09/14 12:01, Bartlomiej Zolnierkiewicz wrote:
> 
> Hi,
> 
> On Wednesday, September 10, 2014 07:11:10 PM Marc Zyngier wrote:
>> Hi Russell,
>>
>> On 10/09/14 18:41, Russell King - ARM Linux wrote:
>>> On Fri, Sep 05, 2014 at 03:27:51PM -0400, Nicolas Pitre wrote:
>>>> On Tue, 2 Sep 2014, Christoph Lameter wrote:
>>>>
>>>>> On Tue, 2 Sep 2014, Christoph Lameter wrote:
>>>>>
>>>>>> Oww.. This is double indirection deal there. A percpu offset pointing to
>>>>>> a pointer?
>>>>>>
>>>>>> Generally the following is true (definition from
>>>>>> include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
>>>>>>
>>>>>> #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
>>>>>
>>>>> I think what the issue is that we dropped the fetch of the percpu offset
>>>>> in the patch. Instead we are using the address of the variable that
>>>>> contains the offset. Does this patch fix it?
>>>>>
>>>>>
>>>>> Subject: irqchip: Properly fetch the per cpu offset
>>>>>
>>>>> The raw_cpu_read() conversion dropped the fetch of the offset
>>>>> from base->percpu_base in gic_get_percpu_base.
>>>>>
>>>>> Signed-off-by: Christoph Lameter <cl@linux.com>
>>>>>
>>>>> Index: linux/drivers/irqchip/irq-gic.c
>>>>> ===================================================================
>>>>> --- linux.orig/drivers/irqchip/irq-gic.c
>>>>> +++ linux/drivers/irqchip/irq-gic.c
>>>>> @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
>>>>>  #ifdef CONFIG_GIC_NON_BANKED
>>>>>  static void __iomem *gic_get_percpu_base(union gic_base *base)
>>>>>  {
>>>>> -	return raw_cpu_read(base->percpu_base);
>>>>> +	return raw_cpu_read(*base->percpu_base);
>>>>
>>>> Isn't the pointer dereference supposed to be performed _outside_ the per 
>>>> CPU accessor?
>>>
>>> I think this is correct.
>>>
>>> Let's start from the depths of raw_cpu_read(), where the pointer is
>>> verified to be the correct type:
>>>
>>> #define __verify_pcpu_ptr(ptr)                                          \
>>> do {                                                                    \
>>>         const void __percpu *__vpp_verify = (typeof((ptr) + 0))NULL;    \
>>>         (void)__vpp_verify;                                             \
>>> } while (0)
>>>
>>> So, "ptr" should be of type "const void __percpu *" (note the __percpu
>>> annotation there, which makes it sparse-checkable.)
>>>
>>> The next level up is this:
>>>
>>> #define __pcpu_size_call_return(stem, variable)                         \
>>> ({                                                                      \
>>>         typeof(variable) pscr_ret__;                                    \
>>>         __verify_pcpu_ptr(&(variable));                                 \
>>>
>>> So, we pass the address of the variable to the verification function.
>>> That makes it a void-typed variable - "const void __percpu".
>>>
>>> #define raw_cpu_read(pcp)   __pcpu_size_call_return(raw_cpu_read_, pcp)
>>>
>>> So this also makes "pcp" a "const void __percpu".
>>>
>>> Now, what type is base->percpu_base?
>>>
>>>         void __percpu * __iomem *percpu_base;
>>>
>>> The thing we want to be per-cpu is a "void __iomem *" pointer.  However,
>>> we have a pointer to the per-cpu instance.  That's the "void __percpu *"
>>> bit.
>>>
>>> So, for this to match the requirements for raw_cpu_read(), we need to
>>> do one dereference to end up with "void __percpu".
>>>
>>> Hence, to me, the patch looks correct.
>>>
>>> Whether it works or not is a /completely/ different matter.  As has been
>>> pointed out, the only place this code gets used is on a very small number
>>> of platforms, which I don't have, and that gives me zero way to test it.
>>> If it's Exynos which is affected by this, we need to call on Samsung to
>>> test this patch.
>>>
>>> Now, this code was introduced by Marc Zyngier in order to support Exynos,
>>> probably the result of another patch on the mailing list from Samsung.
>>> (I've added Marc and another Samsung guy to the Cc list.)  Whatever,
>>> *someone* needs to verify this but it needs to be done with the affected
>>> hardware.  Whether Marc can, or whether it has to be someone from Samsung,
>>> I don't care which.
>>
>> Thanks for looping me in. I indeed introduced this as an alternative to
>> an utterly broken patch that was submitted at the time.
>>
>> As far as I can tell, and by reading your analysis, this patch looks
>> perfectly sensible.
>>
>> Now, I have long given up on trying to run *anything* on a Samsung
>> platform other than my Chromebook - the various maintainers don't seem
>> to care at all. I may be able to revive an Origen board though (I think
>> I have one collecting the proverbial dust in a cupboard), assuming I can
>> locate a bootloader for it.
> 
> Well, I'm not a maintainer but I try keep linux-next working on at least:
> 
> Origen (Exynos4210)
> Origen Quad (Exynos4412)
> ODROID U3 (Exynos4412)
> Trats2 (Exynos4412)
> Arndale (Exynos5250)
> 
> If you have problems booting linux-next on any of the above boards please
> let me know.

My first problem is getting mainline u-boot to work on the Origen (the
4210 flavour). I compiled "something", but how you get that to run is a
mystery. If I can get that to work, then I'll try to move on to the
kernel...

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny...


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

* Re: linux-next: Tree for Sep 1
  2014-09-10 18:11           ` Marc Zyngier
@ 2014-09-11 11:01             ` Bartlomiej Zolnierkiewicz
  2014-09-11 11:17               ` Marc Zyngier
  0 siblings, 1 reply; 40+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-09-11 11:01 UTC (permalink / raw)
  To: Marc Zyngier
  Cc: Russell King - ARM Linux, Nicolas Pitre, Kukjin Kim,
	Christoph Lameter, Mark Brown, linux-next, linux-kernel,
	Tejun Heo, Kyungmin Park


Hi,

On Wednesday, September 10, 2014 07:11:10 PM Marc Zyngier wrote:
> Hi Russell,
> 
> On 10/09/14 18:41, Russell King - ARM Linux wrote:
> > On Fri, Sep 05, 2014 at 03:27:51PM -0400, Nicolas Pitre wrote:
> >> On Tue, 2 Sep 2014, Christoph Lameter wrote:
> >>
> >>> On Tue, 2 Sep 2014, Christoph Lameter wrote:
> >>>
> >>>> Oww.. This is double indirection deal there. A percpu offset pointing to
> >>>> a pointer?
> >>>>
> >>>> Generally the following is true (definition from
> >>>> include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
> >>>>
> >>>> #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
> >>>
> >>> I think what the issue is that we dropped the fetch of the percpu offset
> >>> in the patch. Instead we are using the address of the variable that
> >>> contains the offset. Does this patch fix it?
> >>>
> >>>
> >>> Subject: irqchip: Properly fetch the per cpu offset
> >>>
> >>> The raw_cpu_read() conversion dropped the fetch of the offset
> >>> from base->percpu_base in gic_get_percpu_base.
> >>>
> >>> Signed-off-by: Christoph Lameter <cl@linux.com>
> >>>
> >>> Index: linux/drivers/irqchip/irq-gic.c
> >>> ===================================================================
> >>> --- linux.orig/drivers/irqchip/irq-gic.c
> >>> +++ linux/drivers/irqchip/irq-gic.c
> >>> @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
> >>>  #ifdef CONFIG_GIC_NON_BANKED
> >>>  static void __iomem *gic_get_percpu_base(union gic_base *base)
> >>>  {
> >>> -	return raw_cpu_read(base->percpu_base);
> >>> +	return raw_cpu_read(*base->percpu_base);
> >>
> >> Isn't the pointer dereference supposed to be performed _outside_ the per 
> >> CPU accessor?
> > 
> > I think this is correct.
> > 
> > Let's start from the depths of raw_cpu_read(), where the pointer is
> > verified to be the correct type:
> > 
> > #define __verify_pcpu_ptr(ptr)                                          \
> > do {                                                                    \
> >         const void __percpu *__vpp_verify = (typeof((ptr) + 0))NULL;    \
> >         (void)__vpp_verify;                                             \
> > } while (0)
> > 
> > So, "ptr" should be of type "const void __percpu *" (note the __percpu
> > annotation there, which makes it sparse-checkable.)
> > 
> > The next level up is this:
> > 
> > #define __pcpu_size_call_return(stem, variable)                         \
> > ({                                                                      \
> >         typeof(variable) pscr_ret__;                                    \
> >         __verify_pcpu_ptr(&(variable));                                 \
> > 
> > So, we pass the address of the variable to the verification function.
> > That makes it a void-typed variable - "const void __percpu".
> > 
> > #define raw_cpu_read(pcp)   __pcpu_size_call_return(raw_cpu_read_, pcp)
> > 
> > So this also makes "pcp" a "const void __percpu".
> > 
> > Now, what type is base->percpu_base?
> > 
> >         void __percpu * __iomem *percpu_base;
> > 
> > The thing we want to be per-cpu is a "void __iomem *" pointer.  However,
> > we have a pointer to the per-cpu instance.  That's the "void __percpu *"
> > bit.
> > 
> > So, for this to match the requirements for raw_cpu_read(), we need to
> > do one dereference to end up with "void __percpu".
> > 
> > Hence, to me, the patch looks correct.
> > 
> > Whether it works or not is a /completely/ different matter.  As has been
> > pointed out, the only place this code gets used is on a very small number
> > of platforms, which I don't have, and that gives me zero way to test it.
> > If it's Exynos which is affected by this, we need to call on Samsung to
> > test this patch.
> > 
> > Now, this code was introduced by Marc Zyngier in order to support Exynos,
> > probably the result of another patch on the mailing list from Samsung.
> > (I've added Marc and another Samsung guy to the Cc list.)  Whatever,
> > *someone* needs to verify this but it needs to be done with the affected
> > hardware.  Whether Marc can, or whether it has to be someone from Samsung,
> > I don't care which.
> 
> Thanks for looping me in. I indeed introduced this as an alternative to
> an utterly broken patch that was submitted at the time.
> 
> As far as I can tell, and by reading your analysis, this patch looks
> perfectly sensible.
> 
> Now, I have long given up on trying to run *anything* on a Samsung
> platform other than my Chromebook - the various maintainers don't seem
> to care at all. I may be able to revive an Origen board though (I think
> I have one collecting the proverbial dust in a cupboard), assuming I can
> locate a bootloader for it.

Well, I'm not a maintainer but I try keep linux-next working on at least:

Origen (Exynos4210)
Origen Quad (Exynos4412)
ODROID U3 (Exynos4412)
Trats2 (Exynos4412)
Arndale (Exynos5250)

If you have problems booting linux-next on any of the above boards please
let me know.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics


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

* Re: linux-next: Tree for Sep 1
  2014-09-10 17:59           ` Nicolas Pitre
@ 2014-09-11 10:24             ` Bartlomiej Zolnierkiewicz
  0 siblings, 0 replies; 40+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-09-11 10:24 UTC (permalink / raw)
  To: Nicolas Pitre
  Cc: Russell King - ARM Linux, Kukjin Kim, Marc Zyngier,
	Christoph Lameter, Mark Brown, linux-next, linux-kernel,
	Tejun Heo, Kyungmin Park


Hi,

On Wednesday, September 10, 2014 01:59:47 PM Nicolas Pitre wrote:
> On Wed, 10 Sep 2014, Russell King - ARM Linux wrote:
> 
> > On Fri, Sep 05, 2014 at 03:27:51PM -0400, Nicolas Pitre wrote:
> > > On Tue, 2 Sep 2014, Christoph Lameter wrote:
> > > 
> > > > On Tue, 2 Sep 2014, Christoph Lameter wrote:
> > > > 
> > > > > Oww.. This is double indirection deal there. A percpu offset pointing to
> > > > > a pointer?
> > > > >
> > > > > Generally the following is true (definition from
> > > > > include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
> > > > >
> > > > > #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
> > > > 
> > > > I think what the issue is that we dropped the fetch of the percpu offset
> > > > in the patch. Instead we are using the address of the variable that
> > > > contains the offset. Does this patch fix it?
> > > > 
> > > > 
> > > > Subject: irqchip: Properly fetch the per cpu offset
> > > > 
> > > > The raw_cpu_read() conversion dropped the fetch of the offset
> > > > from base->percpu_base in gic_get_percpu_base.
> > > > 
> > > > Signed-off-by: Christoph Lameter <cl@linux.com>
> > > > 
> > > > Index: linux/drivers/irqchip/irq-gic.c
> > > > ===================================================================
> > > > --- linux.orig/drivers/irqchip/irq-gic.c
> > > > +++ linux/drivers/irqchip/irq-gic.c
> > > > @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
> > > >  #ifdef CONFIG_GIC_NON_BANKED
> > > >  static void __iomem *gic_get_percpu_base(union gic_base *base)
> > > >  {
> > > > -	return raw_cpu_read(base->percpu_base);
> > > > +	return raw_cpu_read(*base->percpu_base);
> > > 
> > > Isn't the pointer dereference supposed to be performed _outside_ the per 
> > > CPU accessor?
> > 
> > I think this is correct.
> > 
> > Let's start from the depths of raw_cpu_read(), where the pointer is
> > verified to be the correct type:
> > 
> > #define __verify_pcpu_ptr(ptr)                                          \
> > do {                                                                    \
> >         const void __percpu *__vpp_verify = (typeof((ptr) + 0))NULL;    \
> >         (void)__vpp_verify;                                             \
> > } while (0)
> > 
> > So, "ptr" should be of type "const void __percpu *" (note the __percpu
> > annotation there, which makes it sparse-checkable.)
> > 
> > The next level up is this:
> > 
> > #define __pcpu_size_call_return(stem, variable)                         \
> > ({                                                                      \
> >         typeof(variable) pscr_ret__;                                    \
> >         __verify_pcpu_ptr(&(variable));                                 \
> > 
> > So, we pass the address of the variable to the verification function.
> > That makes it a void-typed variable - "const void __percpu".
> > 
> > #define raw_cpu_read(pcp)   __pcpu_size_call_return(raw_cpu_read_, pcp)
> > 
> > So this also makes "pcp" a "const void __percpu".
> > 
> > Now, what type is base->percpu_base?
> > 
> >         void __percpu * __iomem *percpu_base;
> > 
> > The thing we want to be per-cpu is a "void __iomem *" pointer.  However,
> > we have a pointer to the per-cpu instance.  That's the "void __percpu *"
> > bit.
> > 
> > So, for this to match the requirements for raw_cpu_read(), we need to
> > do one dereference to end up with "void __percpu".
> > 
> > Hence, to me, the patch looks correct.
> 
> Good, I now agree.  If needed:
> 
> Acked-by: Nicolas Pitre <nico@linaro.org>
> 
> > Whether it works or not is a /completely/ different matter.  As has been
> > pointed out, the only place this code gets used is on a very small number
> > of platforms, which I don't have, and that gives me zero way to test it.
> > If it's Exynos which is affected by this, we need to call on Samsung to
> > test this patch.
> 
> AFAICS it was tested already and confirmed working.

Yes, it was tested on ODROID U3 board (ARM Exynos4412 SoC based):

https://lkml.org/lkml/2014/9/3/552

FWIW:

Tested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

> > Now, this code was introduced by Marc Zyngier in order to support Exynos,
> > probably the result of another patch on the mailing list from Samsung.
> > (I've added Marc and another Samsung guy to the Cc list.)  Whatever,
> > *someone* needs to verify this but it needs to be done with the affected
> > hardware.  Whether Marc can, or whether it has to be someone from Samsung,
> > I don't care which.
> > 
> > /Or/ we deem the code unmaintained, broken, and untestable, and we start
> > considering ripping it out of the mainline kernel on the basis that no
> > one cares about it anymore.
> 
> The problem was reported by someone who tested linux-next on the 
> affected platform, so it must still be used.

Yes, the issue was reported by me originally together with a proposed fix
(different than the final one done by Christoph):

https://lkml.org/lkml/2014/9/2/261

FWIW:

Reported-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics


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

* Re: linux-next: Tree for Sep 1
  2014-09-10 17:41         ` Russell King - ARM Linux
  2014-09-10 17:59           ` Nicolas Pitre
@ 2014-09-10 18:11           ` Marc Zyngier
  2014-09-11 11:01             ` Bartlomiej Zolnierkiewicz
  1 sibling, 1 reply; 40+ messages in thread
From: Marc Zyngier @ 2014-09-10 18:11 UTC (permalink / raw)
  To: Russell King - ARM Linux
  Cc: Nicolas Pitre, Kukjin Kim, Christoph Lameter,
	Bartlomiej Zolnierkiewicz, Mark Brown, linux-next, linux-kernel,
	Tejun Heo, Kyungmin Park

Hi Russell,

On 10/09/14 18:41, Russell King - ARM Linux wrote:
> On Fri, Sep 05, 2014 at 03:27:51PM -0400, Nicolas Pitre wrote:
>> On Tue, 2 Sep 2014, Christoph Lameter wrote:
>>
>>> On Tue, 2 Sep 2014, Christoph Lameter wrote:
>>>
>>>> Oww.. This is double indirection deal there. A percpu offset pointing to
>>>> a pointer?
>>>>
>>>> Generally the following is true (definition from
>>>> include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
>>>>
>>>> #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
>>>
>>> I think what the issue is that we dropped the fetch of the percpu offset
>>> in the patch. Instead we are using the address of the variable that
>>> contains the offset. Does this patch fix it?
>>>
>>>
>>> Subject: irqchip: Properly fetch the per cpu offset
>>>
>>> The raw_cpu_read() conversion dropped the fetch of the offset
>>> from base->percpu_base in gic_get_percpu_base.
>>>
>>> Signed-off-by: Christoph Lameter <cl@linux.com>
>>>
>>> Index: linux/drivers/irqchip/irq-gic.c
>>> ===================================================================
>>> --- linux.orig/drivers/irqchip/irq-gic.c
>>> +++ linux/drivers/irqchip/irq-gic.c
>>> @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
>>>  #ifdef CONFIG_GIC_NON_BANKED
>>>  static void __iomem *gic_get_percpu_base(union gic_base *base)
>>>  {
>>> -	return raw_cpu_read(base->percpu_base);
>>> +	return raw_cpu_read(*base->percpu_base);
>>
>> Isn't the pointer dereference supposed to be performed _outside_ the per 
>> CPU accessor?
> 
> I think this is correct.
> 
> Let's start from the depths of raw_cpu_read(), where the pointer is
> verified to be the correct type:
> 
> #define __verify_pcpu_ptr(ptr)                                          \
> do {                                                                    \
>         const void __percpu *__vpp_verify = (typeof((ptr) + 0))NULL;    \
>         (void)__vpp_verify;                                             \
> } while (0)
> 
> So, "ptr" should be of type "const void __percpu *" (note the __percpu
> annotation there, which makes it sparse-checkable.)
> 
> The next level up is this:
> 
> #define __pcpu_size_call_return(stem, variable)                         \
> ({                                                                      \
>         typeof(variable) pscr_ret__;                                    \
>         __verify_pcpu_ptr(&(variable));                                 \
> 
> So, we pass the address of the variable to the verification function.
> That makes it a void-typed variable - "const void __percpu".
> 
> #define raw_cpu_read(pcp)   __pcpu_size_call_return(raw_cpu_read_, pcp)
> 
> So this also makes "pcp" a "const void __percpu".
> 
> Now, what type is base->percpu_base?
> 
>         void __percpu * __iomem *percpu_base;
> 
> The thing we want to be per-cpu is a "void __iomem *" pointer.  However,
> we have a pointer to the per-cpu instance.  That's the "void __percpu *"
> bit.
> 
> So, for this to match the requirements for raw_cpu_read(), we need to
> do one dereference to end up with "void __percpu".
> 
> Hence, to me, the patch looks correct.
> 
> Whether it works or not is a /completely/ different matter.  As has been
> pointed out, the only place this code gets used is on a very small number
> of platforms, which I don't have, and that gives me zero way to test it.
> If it's Exynos which is affected by this, we need to call on Samsung to
> test this patch.
> 
> Now, this code was introduced by Marc Zyngier in order to support Exynos,
> probably the result of another patch on the mailing list from Samsung.
> (I've added Marc and another Samsung guy to the Cc list.)  Whatever,
> *someone* needs to verify this but it needs to be done with the affected
> hardware.  Whether Marc can, or whether it has to be someone from Samsung,
> I don't care which.

Thanks for looping me in. I indeed introduced this as an alternative to
an utterly broken patch that was submitted at the time.

As far as I can tell, and by reading your analysis, this patch looks
perfectly sensible.

Now, I have long given up on trying to run *anything* on a Samsung
platform other than my Chromebook - the various maintainers don't seem
to care at all. I may be able to revive an Origen board though (I think
I have one collecting the proverbial dust in a cupboard), assuming I can
locate a bootloader for it.

> /Or/ we deem the code unmaintained, broken, and untestable, and we start
> considering ripping it out of the mainline kernel on the basis that no
> one cares about it anymore.

That's an alternative. I personally wouldn't shed a tear.

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny...


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

* Re: linux-next: Tree for Sep 1
  2014-09-10 17:41         ` Russell King - ARM Linux
@ 2014-09-10 17:59           ` Nicolas Pitre
  2014-09-11 10:24             ` Bartlomiej Zolnierkiewicz
  2014-09-10 18:11           ` Marc Zyngier
  1 sibling, 1 reply; 40+ messages in thread
From: Nicolas Pitre @ 2014-09-10 17:59 UTC (permalink / raw)
  To: Russell King - ARM Linux
  Cc: Kukjin Kim, Marc Zyngier, Christoph Lameter,
	Bartlomiej Zolnierkiewicz, Mark Brown, linux-next, linux-kernel,
	Tejun Heo, Kyungmin Park

On Wed, 10 Sep 2014, Russell King - ARM Linux wrote:

> On Fri, Sep 05, 2014 at 03:27:51PM -0400, Nicolas Pitre wrote:
> > On Tue, 2 Sep 2014, Christoph Lameter wrote:
> > 
> > > On Tue, 2 Sep 2014, Christoph Lameter wrote:
> > > 
> > > > Oww.. This is double indirection deal there. A percpu offset pointing to
> > > > a pointer?
> > > >
> > > > Generally the following is true (definition from
> > > > include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
> > > >
> > > > #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
> > > 
> > > I think what the issue is that we dropped the fetch of the percpu offset
> > > in the patch. Instead we are using the address of the variable that
> > > contains the offset. Does this patch fix it?
> > > 
> > > 
> > > Subject: irqchip: Properly fetch the per cpu offset
> > > 
> > > The raw_cpu_read() conversion dropped the fetch of the offset
> > > from base->percpu_base in gic_get_percpu_base.
> > > 
> > > Signed-off-by: Christoph Lameter <cl@linux.com>
> > > 
> > > Index: linux/drivers/irqchip/irq-gic.c
> > > ===================================================================
> > > --- linux.orig/drivers/irqchip/irq-gic.c
> > > +++ linux/drivers/irqchip/irq-gic.c
> > > @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
> > >  #ifdef CONFIG_GIC_NON_BANKED
> > >  static void __iomem *gic_get_percpu_base(union gic_base *base)
> > >  {
> > > -	return raw_cpu_read(base->percpu_base);
> > > +	return raw_cpu_read(*base->percpu_base);
> > 
> > Isn't the pointer dereference supposed to be performed _outside_ the per 
> > CPU accessor?
> 
> I think this is correct.
> 
> Let's start from the depths of raw_cpu_read(), where the pointer is
> verified to be the correct type:
> 
> #define __verify_pcpu_ptr(ptr)                                          \
> do {                                                                    \
>         const void __percpu *__vpp_verify = (typeof((ptr) + 0))NULL;    \
>         (void)__vpp_verify;                                             \
> } while (0)
> 
> So, "ptr" should be of type "const void __percpu *" (note the __percpu
> annotation there, which makes it sparse-checkable.)
> 
> The next level up is this:
> 
> #define __pcpu_size_call_return(stem, variable)                         \
> ({                                                                      \
>         typeof(variable) pscr_ret__;                                    \
>         __verify_pcpu_ptr(&(variable));                                 \
> 
> So, we pass the address of the variable to the verification function.
> That makes it a void-typed variable - "const void __percpu".
> 
> #define raw_cpu_read(pcp)   __pcpu_size_call_return(raw_cpu_read_, pcp)
> 
> So this also makes "pcp" a "const void __percpu".
> 
> Now, what type is base->percpu_base?
> 
>         void __percpu * __iomem *percpu_base;
> 
> The thing we want to be per-cpu is a "void __iomem *" pointer.  However,
> we have a pointer to the per-cpu instance.  That's the "void __percpu *"
> bit.
> 
> So, for this to match the requirements for raw_cpu_read(), we need to
> do one dereference to end up with "void __percpu".
> 
> Hence, to me, the patch looks correct.

Good, I now agree.  If needed:

Acked-by: Nicolas Pitre <nico@linaro.org>

> Whether it works or not is a /completely/ different matter.  As has been
> pointed out, the only place this code gets used is on a very small number
> of platforms, which I don't have, and that gives me zero way to test it.
> If it's Exynos which is affected by this, we need to call on Samsung to
> test this patch.

AFAICS it was tested already and confirmed working.

> Now, this code was introduced by Marc Zyngier in order to support Exynos,
> probably the result of another patch on the mailing list from Samsung.
> (I've added Marc and another Samsung guy to the Cc list.)  Whatever,
> *someone* needs to verify this but it needs to be done with the affected
> hardware.  Whether Marc can, or whether it has to be someone from Samsung,
> I don't care which.
> 
> /Or/ we deem the code unmaintained, broken, and untestable, and we start
> considering ripping it out of the mainline kernel on the basis that no
> one cares about it anymore.

The problem was reported by someone who tested linux-next on the 
affected platform, so it must still be used.


Nicolas

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

* Re: linux-next: Tree for Sep 1
  2014-09-05 19:27       ` Nicolas Pitre
  2014-09-08 14:15         ` Christoph Lameter
@ 2014-09-10 17:41         ` Russell King - ARM Linux
  2014-09-10 17:59           ` Nicolas Pitre
  2014-09-10 18:11           ` Marc Zyngier
  1 sibling, 2 replies; 40+ messages in thread
From: Russell King - ARM Linux @ 2014-09-10 17:41 UTC (permalink / raw)
  To: Nicolas Pitre, Kukjin Kim, Marc Zyngier
  Cc: Christoph Lameter, Bartlomiej Zolnierkiewicz, Mark Brown,
	linux-next, linux-kernel, Tejun Heo, Kyungmin Park

On Fri, Sep 05, 2014 at 03:27:51PM -0400, Nicolas Pitre wrote:
> On Tue, 2 Sep 2014, Christoph Lameter wrote:
> 
> > On Tue, 2 Sep 2014, Christoph Lameter wrote:
> > 
> > > Oww.. This is double indirection deal there. A percpu offset pointing to
> > > a pointer?
> > >
> > > Generally the following is true (definition from
> > > include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
> > >
> > > #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
> > 
> > I think what the issue is that we dropped the fetch of the percpu offset
> > in the patch. Instead we are using the address of the variable that
> > contains the offset. Does this patch fix it?
> > 
> > 
> > Subject: irqchip: Properly fetch the per cpu offset
> > 
> > The raw_cpu_read() conversion dropped the fetch of the offset
> > from base->percpu_base in gic_get_percpu_base.
> > 
> > Signed-off-by: Christoph Lameter <cl@linux.com>
> > 
> > Index: linux/drivers/irqchip/irq-gic.c
> > ===================================================================
> > --- linux.orig/drivers/irqchip/irq-gic.c
> > +++ linux/drivers/irqchip/irq-gic.c
> > @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
> >  #ifdef CONFIG_GIC_NON_BANKED
> >  static void __iomem *gic_get_percpu_base(union gic_base *base)
> >  {
> > -	return raw_cpu_read(base->percpu_base);
> > +	return raw_cpu_read(*base->percpu_base);
> 
> Isn't the pointer dereference supposed to be performed _outside_ the per 
> CPU accessor?

I think this is correct.

Let's start from the depths of raw_cpu_read(), where the pointer is
verified to be the correct type:

#define __verify_pcpu_ptr(ptr)                                          \
do {                                                                    \
        const void __percpu *__vpp_verify = (typeof((ptr) + 0))NULL;    \
        (void)__vpp_verify;                                             \
} while (0)

So, "ptr" should be of type "const void __percpu *" (note the __percpu
annotation there, which makes it sparse-checkable.)

The next level up is this:

#define __pcpu_size_call_return(stem, variable)                         \
({                                                                      \
        typeof(variable) pscr_ret__;                                    \
        __verify_pcpu_ptr(&(variable));                                 \

So, we pass the address of the variable to the verification function.
That makes it a void-typed variable - "const void __percpu".

#define raw_cpu_read(pcp)   __pcpu_size_call_return(raw_cpu_read_, pcp)

So this also makes "pcp" a "const void __percpu".

Now, what type is base->percpu_base?

        void __percpu * __iomem *percpu_base;

The thing we want to be per-cpu is a "void __iomem *" pointer.  However,
we have a pointer to the per-cpu instance.  That's the "void __percpu *"
bit.

So, for this to match the requirements for raw_cpu_read(), we need to
do one dereference to end up with "void __percpu".

Hence, to me, the patch looks correct.

Whether it works or not is a /completely/ different matter.  As has been
pointed out, the only place this code gets used is on a very small number
of platforms, which I don't have, and that gives me zero way to test it.
If it's Exynos which is affected by this, we need to call on Samsung to
test this patch.

Now, this code was introduced by Marc Zyngier in order to support Exynos,
probably the result of another patch on the mailing list from Samsung.
(I've added Marc and another Samsung guy to the Cc list.)  Whatever,
*someone* needs to verify this but it needs to be done with the affected
hardware.  Whether Marc can, or whether it has to be someone from Samsung,
I don't care which.

/Or/ we deem the code unmaintained, broken, and untestable, and we start
considering ripping it out of the mainline kernel on the basis that no
one cares about it anymore.

-- 
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.

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

* Re: linux-next: Tree for Sep 1
  2014-09-10 16:18               ` Nicolas Pitre
@ 2014-09-10 16:21                 ` Christoph Lameter
  0 siblings, 0 replies; 40+ messages in thread
From: Christoph Lameter @ 2014-09-10 16:21 UTC (permalink / raw)
  To: Nicolas Pitre
  Cc: Jason Cooper, Thomas Gleixner, Tejun Heo,
	Bartlomiej Zolnierkiewicz, Mark Brown, linux-next, linux-kernel,
	Russell King, Kyungmin Park

On Wed, 10 Sep 2014, Nicolas Pitre wrote:

> And I did ask for a clarification on the proposed fix which produced no
> answer so far.

What clarification is needed?


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

* Re: linux-next: Tree for Sep 1
  2014-09-10 15:04             ` Jason Cooper
  2014-09-10 16:18               ` Nicolas Pitre
@ 2014-09-10 16:19               ` Christoph Lameter
  1 sibling, 0 replies; 40+ messages in thread
From: Christoph Lameter @ 2014-09-10 16:19 UTC (permalink / raw)
  To: Jason Cooper
  Cc: Thomas Gleixner, Tejun Heo, Bartlomiej Zolnierkiewicz,
	Mark Brown, linux-next, linux-kernel, nicolas.pitre,
	Russell King, Kyungmin Park

On Wed, 10 Sep 2014, Jason Cooper wrote:

>
> Thanks Chris.  I'm a bit behind on irqchip stuff, so I may have missed
> something here...  Did we get Cc'd on the original patch that caused the
> regression?  I'm fairly certain I haven't seen it to Ack it.

This is a trivial fix to the original patch in linux-next that introduced
a bug by dropping one level of indirection.


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

* Re: linux-next: Tree for Sep 1
  2014-09-10 15:04             ` Jason Cooper
@ 2014-09-10 16:18               ` Nicolas Pitre
  2014-09-10 16:21                 ` Christoph Lameter
  2014-09-10 16:19               ` Christoph Lameter
  1 sibling, 1 reply; 40+ messages in thread
From: Nicolas Pitre @ 2014-09-10 16:18 UTC (permalink / raw)
  To: Jason Cooper
  Cc: Christoph Lameter, Thomas Gleixner, Tejun Heo,
	Bartlomiej Zolnierkiewicz, Mark Brown, linux-next, linux-kernel,
	Russell King, Kyungmin Park

On Wed, 10 Sep 2014, Jason Cooper wrote:

> Christoph,
> 
> On Wed, Sep 10, 2014 at 09:15:30AM -0500, Christoph Lameter wrote:
> > On Tue, 9 Sep 2014, Tejun Heo wrote:
> > > On Fri, Sep 05, 2014 at 02:11:23AM +0900, Tejun Heo wrote:
> > > > On Tue, Sep 02, 2014 at 10:00:07AM -0500, Christoph Lameter wrote:
> > > > > Subject: irqchip: Properly fetch the per cpu offset
> > > > >
> > > > > The raw_cpu_read() conversion dropped the fetch of the offset
> > > > > from base->percpu_base in gic_get_percpu_base.
> > > > >
> > > > > Signed-off-by: Christoph Lameter <cl@linux.com>
> > > > >
> > > > > Index: linux/drivers/irqchip/irq-gic.c
> > > > > ===================================================================
> > > > > --- linux.orig/drivers/irqchip/irq-gic.c
> > > > > +++ linux/drivers/irqchip/irq-gic.c
> > > > > @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
> > > > >  #ifdef CONFIG_GIC_NON_BANKED
> > > > >  static void __iomem *gic_get_percpu_base(union gic_base *base)
> > > > >  {
> > > > > -	return raw_cpu_read(base->percpu_base);
> > > > > +	return raw_cpu_read(*base->percpu_base);
> > > >
> > > > I suppose this should go through percpu/for-3.18-consistent-ops?  Can
> > > > we please cc irq folks and get acks?
> > >
> > > Christoph, please drive this forward.
> > 
> > CCing IRQ subsystem and IRQCHIP drivers maintainers.
> 
> Thanks Chris.  I'm a bit behind on irqchip stuff, so I may have missed
> something here...  Did we get Cc'd on the original patch that caused the
> regression?  I'm fairly certain I haven't seen it to Ack it.
> 
> It wouldn't be an issue worth mentioning if it were a vendor-specific
> driver, however, the gic is used by damn near every major ARM SoC.

In fact the problematic code lives in a code path that very few 
platform use i.e. CONFIG_GIC_NON_BANKED set by CONFIG_ARCH_EXYNOS4.

And I did ask for a clarification on the proposed fix which produced no 
answer so far.


Nicolas

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

* Re: linux-next: Tree for Sep 1
  2014-09-10 14:15           ` Christoph Lameter
@ 2014-09-10 15:04             ` Jason Cooper
  2014-09-10 16:18               ` Nicolas Pitre
  2014-09-10 16:19               ` Christoph Lameter
  0 siblings, 2 replies; 40+ messages in thread
From: Jason Cooper @ 2014-09-10 15:04 UTC (permalink / raw)
  To: Christoph Lameter
  Cc: Thomas Gleixner, Tejun Heo, Bartlomiej Zolnierkiewicz,
	Mark Brown, linux-next, linux-kernel, nicolas.pitre,
	Russell King, Kyungmin Park

Christoph,

On Wed, Sep 10, 2014 at 09:15:30AM -0500, Christoph Lameter wrote:
> On Tue, 9 Sep 2014, Tejun Heo wrote:
> > On Fri, Sep 05, 2014 at 02:11:23AM +0900, Tejun Heo wrote:
> > > On Tue, Sep 02, 2014 at 10:00:07AM -0500, Christoph Lameter wrote:
> > > > Subject: irqchip: Properly fetch the per cpu offset
> > > >
> > > > The raw_cpu_read() conversion dropped the fetch of the offset
> > > > from base->percpu_base in gic_get_percpu_base.
> > > >
> > > > Signed-off-by: Christoph Lameter <cl@linux.com>
> > > >
> > > > Index: linux/drivers/irqchip/irq-gic.c
> > > > ===================================================================
> > > > --- linux.orig/drivers/irqchip/irq-gic.c
> > > > +++ linux/drivers/irqchip/irq-gic.c
> > > > @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
> > > >  #ifdef CONFIG_GIC_NON_BANKED
> > > >  static void __iomem *gic_get_percpu_base(union gic_base *base)
> > > >  {
> > > > -	return raw_cpu_read(base->percpu_base);
> > > > +	return raw_cpu_read(*base->percpu_base);
> > >
> > > I suppose this should go through percpu/for-3.18-consistent-ops?  Can
> > > we please cc irq folks and get acks?
> >
> > Christoph, please drive this forward.
> 
> CCing IRQ subsystem and IRQCHIP drivers maintainers.

Thanks Chris.  I'm a bit behind on irqchip stuff, so I may have missed
something here...  Did we get Cc'd on the original patch that caused the
regression?  I'm fairly certain I haven't seen it to Ack it.

It wouldn't be an issue worth mentioning if it were a vendor-specific
driver, however, the gic is used by damn near every major ARM SoC.
Tejun (I think) was kind enough to post the links to the email
thread for the original patch, so I'll try to get to this soon-ish.

thx,

Jason.

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

* Re: linux-next: Tree for Sep 1
  2014-09-09  0:37         ` Tejun Heo
@ 2014-09-10 14:15           ` Christoph Lameter
  2014-09-10 15:04             ` Jason Cooper
  0 siblings, 1 reply; 40+ messages in thread
From: Christoph Lameter @ 2014-09-10 14:15 UTC (permalink / raw)
  To: Thomas Gleixner, Jason Cooper
  Cc: Tejun Heo, Bartlomiej Zolnierkiewicz, Mark Brown, linux-next,
	linux-kernel, nicolas.pitre, Russell King, Kyungmin Park

On Tue, 9 Sep 2014, Tejun Heo wrote:

> On Fri, Sep 05, 2014 at 02:11:23AM +0900, Tejun Heo wrote:
> > On Tue, Sep 02, 2014 at 10:00:07AM -0500, Christoph Lameter wrote:
> > > Subject: irqchip: Properly fetch the per cpu offset
> > >
> > > The raw_cpu_read() conversion dropped the fetch of the offset
> > > from base->percpu_base in gic_get_percpu_base.
> > >
> > > Signed-off-by: Christoph Lameter <cl@linux.com>
> > >
> > > Index: linux/drivers/irqchip/irq-gic.c
> > > ===================================================================
> > > --- linux.orig/drivers/irqchip/irq-gic.c
> > > +++ linux/drivers/irqchip/irq-gic.c
> > > @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
> > >  #ifdef CONFIG_GIC_NON_BANKED
> > >  static void __iomem *gic_get_percpu_base(union gic_base *base)
> > >  {
> > > -	return raw_cpu_read(base->percpu_base);
> > > +	return raw_cpu_read(*base->percpu_base);
> >
> > I suppose this should go through percpu/for-3.18-consistent-ops?  Can
> > we please cc irq folks and get acks?
>
> Christoph, please drive this forward.

CCing IRQ subsystem and IRQCHIP drivers maintainers.


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

* Re: linux-next: Tree for Sep 1
  2014-09-04 17:11       ` Tejun Heo
  2014-09-04 17:59         ` Christoph Lameter
  2014-09-05 11:31         ` Jason Cooper
@ 2014-09-09  0:37         ` Tejun Heo
  2014-09-10 14:15           ` Christoph Lameter
  2 siblings, 1 reply; 40+ messages in thread
From: Tejun Heo @ 2014-09-09  0:37 UTC (permalink / raw)
  To: Christoph Lameter
  Cc: Bartlomiej Zolnierkiewicz, Mark Brown, linux-next, linux-kernel,
	nicolas.pitre, Russell King, Kyungmin Park

On Fri, Sep 05, 2014 at 02:11:23AM +0900, Tejun Heo wrote:
> On Tue, Sep 02, 2014 at 10:00:07AM -0500, Christoph Lameter wrote:
> > Subject: irqchip: Properly fetch the per cpu offset
> > 
> > The raw_cpu_read() conversion dropped the fetch of the offset
> > from base->percpu_base in gic_get_percpu_base.
> > 
> > Signed-off-by: Christoph Lameter <cl@linux.com>
> > 
> > Index: linux/drivers/irqchip/irq-gic.c
> > ===================================================================
> > --- linux.orig/drivers/irqchip/irq-gic.c
> > +++ linux/drivers/irqchip/irq-gic.c
> > @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
> >  #ifdef CONFIG_GIC_NON_BANKED
> >  static void __iomem *gic_get_percpu_base(union gic_base *base)
> >  {
> > -	return raw_cpu_read(base->percpu_base);
> > +	return raw_cpu_read(*base->percpu_base);
> 
> I suppose this should go through percpu/for-3.18-consistent-ops?  Can
> we please cc irq folks and get acks?

Christoph, please drive this forward.

Thanks.

-- 
tejun

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

* Re: linux-next: Tree for Sep 1
  2014-09-05 19:27       ` Nicolas Pitre
@ 2014-09-08 14:15         ` Christoph Lameter
  2014-09-10 17:41         ` Russell King - ARM Linux
  1 sibling, 0 replies; 40+ messages in thread
From: Christoph Lameter @ 2014-09-08 14:15 UTC (permalink / raw)
  To: Nicolas Pitre
  Cc: Bartlomiej Zolnierkiewicz, Mark Brown, linux-next, linux-kernel,
	Russell King, Tejun Heo, Kyungmin Park

On Fri, 5 Sep 2014, Nicolas Pitre wrote:

> > -	return raw_cpu_read(base->percpu_base);
> > +	return raw_cpu_read(*base->percpu_base);
>
> Isn't the pointer dereference supposed to be performed _outside_ the per
> CPU accessor?

It looks like percpu_base is a regular pointer to an offset. This is the
correct way to refer to get the offset and load the value that the offset
points to.


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

* Re: linux-next: Tree for Sep 1
  2014-09-05 11:31         ` Jason Cooper
@ 2014-09-05 23:48           ` Tejun Heo
  0 siblings, 0 replies; 40+ messages in thread
From: Tejun Heo @ 2014-09-05 23:48 UTC (permalink / raw)
  To: Jason Cooper
  Cc: Thomas Gleixner, Christoph Lameter, Bartlomiej Zolnierkiewicz,
	Mark Brown, linux-next, linux-kernel, nicolas.pitre,
	Russell King, Kyungmin Park

On Fri, Sep 05, 2014 at 07:31:14AM -0400, Jason Cooper wrote:
> Tejun, Christoph,
> 
> On Fri, Sep 05, 2014 at 02:11:23AM +0900, Tejun Heo wrote:
> > On Tue, Sep 02, 2014 at 10:00:07AM -0500, Christoph Lameter wrote:
> > > Subject: irqchip: Properly fetch the per cpu offset
> > > 
> > > The raw_cpu_read() conversion dropped the fetch of the offset
> > > from base->percpu_base in gic_get_percpu_base.
> > > 
> > > Signed-off-by: Christoph Lameter <cl@linux.com>
> > > 
> > > Index: linux/drivers/irqchip/irq-gic.c
> > > ===================================================================
> > > --- linux.orig/drivers/irqchip/irq-gic.c
> > > +++ linux/drivers/irqchip/irq-gic.c
> > > @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
> > >  #ifdef CONFIG_GIC_NON_BANKED
> > >  static void __iomem *gic_get_percpu_base(union gic_base *base)
> > >  {
> > > -	return raw_cpu_read(base->percpu_base);
> > > +	return raw_cpu_read(*base->percpu_base);
> > 
> > I suppose this should go through percpu/for-3.18-consistent-ops?  Can
> > we please cc irq folks and get acks?
> 
> Could Thomas and I get a pointer to the original patch and thread that
> caused the error?

http://thread.gmane.org/gmane.linux.kernel/1769201/focus=1769204
http://thread.gmane.org/gmane.linux.kernel.next/32601/focus=32606

Thanks.

-- 
tejun

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

* Re: linux-next: Tree for Sep 1
  2014-09-02 15:00     ` Christoph Lameter
  2014-09-03 16:09       ` Bartlomiej Zolnierkiewicz
  2014-09-04 17:11       ` Tejun Heo
@ 2014-09-05 19:27       ` Nicolas Pitre
  2014-09-08 14:15         ` Christoph Lameter
  2014-09-10 17:41         ` Russell King - ARM Linux
  2014-09-14  5:40       ` Jason Cooper
  2014-09-19  3:52       ` Tejun Heo
  4 siblings, 2 replies; 40+ messages in thread
From: Nicolas Pitre @ 2014-09-05 19:27 UTC (permalink / raw)
  To: Christoph Lameter
  Cc: Bartlomiej Zolnierkiewicz, Mark Brown, linux-next, linux-kernel,
	Russell King, Tejun Heo, Kyungmin Park

On Tue, 2 Sep 2014, Christoph Lameter wrote:

> On Tue, 2 Sep 2014, Christoph Lameter wrote:
> 
> > Oww.. This is double indirection deal there. A percpu offset pointing to
> > a pointer?
> >
> > Generally the following is true (definition from
> > include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
> >
> > #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
> 
> I think what the issue is that we dropped the fetch of the percpu offset
> in the patch. Instead we are using the address of the variable that
> contains the offset. Does this patch fix it?
> 
> 
> Subject: irqchip: Properly fetch the per cpu offset
> 
> The raw_cpu_read() conversion dropped the fetch of the offset
> from base->percpu_base in gic_get_percpu_base.
> 
> Signed-off-by: Christoph Lameter <cl@linux.com>
> 
> Index: linux/drivers/irqchip/irq-gic.c
> ===================================================================
> --- linux.orig/drivers/irqchip/irq-gic.c
> +++ linux/drivers/irqchip/irq-gic.c
> @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
>  #ifdef CONFIG_GIC_NON_BANKED
>  static void __iomem *gic_get_percpu_base(union gic_base *base)
>  {
> -	return raw_cpu_read(base->percpu_base);
> +	return raw_cpu_read(*base->percpu_base);

Isn't the pointer dereference supposed to be performed _outside_ the per 
CPU accessor?


Nicolas

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

* Re: linux-next: Tree for Sep 1
  2014-09-04 17:59         ` Christoph Lameter
@ 2014-09-05 18:17           ` Russell King - ARM Linux
  0 siblings, 0 replies; 40+ messages in thread
From: Russell King - ARM Linux @ 2014-09-05 18:17 UTC (permalink / raw)
  To: Christoph Lameter
  Cc: Tejun Heo, Bartlomiej Zolnierkiewicz, Mark Brown, linux-next,
	linux-kernel, nicolas.pitre, Kyungmin Park

On Thu, Sep 04, 2014 at 12:59:39PM -0500, Christoph Lameter wrote:
> On Fri, 5 Sep 2014, Tejun Heo wrote:
> 
> > I suppose this should go through percpu/for-3.18-consistent-ops?  Can
> > we please cc irq folks and get acks?
> 
> Russell and Nicolas were cced. This is arm specific.

Sorry, but I don't have much to do with ARM IRQ stuff anymore -
everything that gets moved out of arch/arm has responsibility
automatically transferred to someone else without any referral to
me.

Hence, it's up to the genirq/irqchip maintainers now.

-- 
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.

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

* Re: linux-next: Tree for Sep 1
  2014-09-04 17:11       ` Tejun Heo
  2014-09-04 17:59         ` Christoph Lameter
@ 2014-09-05 11:31         ` Jason Cooper
  2014-09-05 23:48           ` Tejun Heo
  2014-09-09  0:37         ` Tejun Heo
  2 siblings, 1 reply; 40+ messages in thread
From: Jason Cooper @ 2014-09-05 11:31 UTC (permalink / raw)
  To: Tejun Heo, Thomas Gleixner
  Cc: Christoph Lameter, Bartlomiej Zolnierkiewicz, Mark Brown,
	linux-next, linux-kernel, nicolas.pitre, Russell King,
	Kyungmin Park

Tejun, Christoph,

On Fri, Sep 05, 2014 at 02:11:23AM +0900, Tejun Heo wrote:
> On Tue, Sep 02, 2014 at 10:00:07AM -0500, Christoph Lameter wrote:
> > Subject: irqchip: Properly fetch the per cpu offset
> > 
> > The raw_cpu_read() conversion dropped the fetch of the offset
> > from base->percpu_base in gic_get_percpu_base.
> > 
> > Signed-off-by: Christoph Lameter <cl@linux.com>
> > 
> > Index: linux/drivers/irqchip/irq-gic.c
> > ===================================================================
> > --- linux.orig/drivers/irqchip/irq-gic.c
> > +++ linux/drivers/irqchip/irq-gic.c
> > @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
> >  #ifdef CONFIG_GIC_NON_BANKED
> >  static void __iomem *gic_get_percpu_base(union gic_base *base)
> >  {
> > -	return raw_cpu_read(base->percpu_base);
> > +	return raw_cpu_read(*base->percpu_base);
> 
> I suppose this should go through percpu/for-3.18-consistent-ops?  Can
> we please cc irq folks and get acks?

Could Thomas and I get a pointer to the original patch and thread that
caused the error?

thx,

Jason.

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

* Re: linux-next: Tree for Sep 1
  2014-09-04 17:11       ` Tejun Heo
@ 2014-09-04 17:59         ` Christoph Lameter
  2014-09-05 18:17           ` Russell King - ARM Linux
  2014-09-05 11:31         ` Jason Cooper
  2014-09-09  0:37         ` Tejun Heo
  2 siblings, 1 reply; 40+ messages in thread
From: Christoph Lameter @ 2014-09-04 17:59 UTC (permalink / raw)
  To: Tejun Heo
  Cc: Bartlomiej Zolnierkiewicz, Mark Brown, linux-next, linux-kernel,
	nicolas.pitre, Russell King, Kyungmin Park

On Fri, 5 Sep 2014, Tejun Heo wrote:

> I suppose this should go through percpu/for-3.18-consistent-ops?  Can
> we please cc irq folks and get acks?

Russell and Nicolas were cced. This is arm specific.



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

* Re: linux-next: Tree for Sep 1
  2014-09-02 15:00     ` Christoph Lameter
  2014-09-03 16:09       ` Bartlomiej Zolnierkiewicz
@ 2014-09-04 17:11       ` Tejun Heo
  2014-09-04 17:59         ` Christoph Lameter
                           ` (2 more replies)
  2014-09-05 19:27       ` Nicolas Pitre
                         ` (2 subsequent siblings)
  4 siblings, 3 replies; 40+ messages in thread
From: Tejun Heo @ 2014-09-04 17:11 UTC (permalink / raw)
  To: Christoph Lameter
  Cc: Bartlomiej Zolnierkiewicz, Mark Brown, linux-next, linux-kernel,
	nicolas.pitre, Russell King, Kyungmin Park

On Tue, Sep 02, 2014 at 10:00:07AM -0500, Christoph Lameter wrote:
> Subject: irqchip: Properly fetch the per cpu offset
> 
> The raw_cpu_read() conversion dropped the fetch of the offset
> from base->percpu_base in gic_get_percpu_base.
> 
> Signed-off-by: Christoph Lameter <cl@linux.com>
> 
> Index: linux/drivers/irqchip/irq-gic.c
> ===================================================================
> --- linux.orig/drivers/irqchip/irq-gic.c
> +++ linux/drivers/irqchip/irq-gic.c
> @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
>  #ifdef CONFIG_GIC_NON_BANKED
>  static void __iomem *gic_get_percpu_base(union gic_base *base)
>  {
> -	return raw_cpu_read(base->percpu_base);
> +	return raw_cpu_read(*base->percpu_base);

I suppose this should go through percpu/for-3.18-consistent-ops?  Can
we please cc irq folks and get acks?

Thanks.

-- 
tejun

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

* Re: linux-next: Tree for Sep 1
  2014-09-02 15:00     ` Christoph Lameter
@ 2014-09-03 16:09       ` Bartlomiej Zolnierkiewicz
  2014-09-04 17:11       ` Tejun Heo
                         ` (3 subsequent siblings)
  4 siblings, 0 replies; 40+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-09-03 16:09 UTC (permalink / raw)
  To: Christoph Lameter
  Cc: Mark Brown, linux-next, linux-kernel, nicolas.pitre,
	Russell King, Tejun Heo, Kyungmin Park


Hi,

On Tuesday, September 02, 2014 10:00:07 AM Christoph Lameter wrote:
> On Tue, 2 Sep 2014, Christoph Lameter wrote:
> 
> > Oww.. This is double indirection deal there. A percpu offset pointing to
> > a pointer?
> >
> > Generally the following is true (definition from
> > include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
> >
> > #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))
> 
> I think what the issue is that we dropped the fetch of the percpu offset
> in the patch. Instead we are using the address of the variable that
> contains the offset. Does this patch fix it?

Yes, it fixes the problem.  Thank you.

Tested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

> Subject: irqchip: Properly fetch the per cpu offset
> 
> The raw_cpu_read() conversion dropped the fetch of the offset
> from base->percpu_base in gic_get_percpu_base.
> 
> Signed-off-by: Christoph Lameter <cl@linux.com>
> 
> Index: linux/drivers/irqchip/irq-gic.c
> ===================================================================
> --- linux.orig/drivers/irqchip/irq-gic.c
> +++ linux/drivers/irqchip/irq-gic.c
> @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
>  #ifdef CONFIG_GIC_NON_BANKED
>  static void __iomem *gic_get_percpu_base(union gic_base *base)
>  {
> -	return raw_cpu_read(base->percpu_base);
> +	return raw_cpu_read(*base->percpu_base);
>  }
> 
>  static void __iomem *gic_get_common_base(union gic_base *base)


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

* Re: linux-next: Tree for Sep 1
  2014-09-02 14:07   ` Christoph Lameter
@ 2014-09-02 15:00     ` Christoph Lameter
  2014-09-03 16:09       ` Bartlomiej Zolnierkiewicz
                         ` (4 more replies)
  0 siblings, 5 replies; 40+ messages in thread
From: Christoph Lameter @ 2014-09-02 15:00 UTC (permalink / raw)
  To: Bartlomiej Zolnierkiewicz
  Cc: Mark Brown, linux-next, linux-kernel, nicolas.pitre,
	Russell King, Tejun Heo, Kyungmin Park

On Tue, 2 Sep 2014, Christoph Lameter wrote:

> Oww.. This is double indirection deal there. A percpu offset pointing to
> a pointer?
>
> Generally the following is true (definition from
> include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):
>
> #define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))

I think what the issue is that we dropped the fetch of the percpu offset
in the patch. Instead we are using the address of the variable that
contains the offset. Does this patch fix it?


Subject: irqchip: Properly fetch the per cpu offset

The raw_cpu_read() conversion dropped the fetch of the offset
from base->percpu_base in gic_get_percpu_base.

Signed-off-by: Christoph Lameter <cl@linux.com>

Index: linux/drivers/irqchip/irq-gic.c
===================================================================
--- linux.orig/drivers/irqchip/irq-gic.c
+++ linux/drivers/irqchip/irq-gic.c
@@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
 #ifdef CONFIG_GIC_NON_BANKED
 static void __iomem *gic_get_percpu_base(union gic_base *base)
 {
-	return raw_cpu_read(base->percpu_base);
+	return raw_cpu_read(*base->percpu_base);
 }

 static void __iomem *gic_get_common_base(union gic_base *base)

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

* Re: linux-next: Tree for Sep 1
  2014-09-02 13:19 ` Bartlomiej Zolnierkiewicz
  2014-09-02 14:07   ` Christoph Lameter
@ 2014-09-02 14:58   ` Jason Cooper
  1 sibling, 0 replies; 40+ messages in thread
From: Jason Cooper @ 2014-09-02 14:58 UTC (permalink / raw)
  To: Bartlomiej Zolnierkiewicz, Christoph Lameter, Thomas Gleixner
  Cc: Mark Brown, linux-next, linux-kernel, nicolas.pitre,
	Russell King, Christoph Lameter, Tejun Heo, Kyungmin Park

Christopher,

On Tue, Sep 02, 2014 at 03:19:22PM +0200, Bartlomiej Zolnierkiewicz wrote:
> 
> [ this time with the patch and right cc: list, sorry for the noise ]
> 
> Hi,
> 
> On Tuesday, September 02, 2014 12:07:28 AM Mark Brown wrote:
> > Changes since 20140829:
> > 
> > The akpm-current gained a conflict against Linus' tree.
> > 
> > Non-merge commits (relative to Linus' tree): 2553
> >  2686 files changed, 98625 insertions(+), 79475 deletions(-)
> > 
> > I have created today's linux-next tree at
> > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git .
> > 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 an
> > allmodconfig for x86_64 and a multi_v7_defconfig for arm.
> > 
> > Below is a summary of the state of the merge.
> > 
> > I am currently merging 214 trees (counting Linus' and 30 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 Stephen's 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.
> 
> I need following patch to make it boot on ODROID U3 board
> (ARM Exynos4412 SoC based).  next-20140825 was good, next-20140828
> is bad (I haven't tried next-20140826 and next-20140827).
> 
> Best regards,
> --
> Bartlomiej Zolnierkiewicz
> Samsung R&D Institute Poland
> Samsung Electronics
> 
> 
> From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> Subject: [RFC PATCH] irqchips: gic_get_percpu_base() fix
> 
> Commit 532d0d0690d1 ("irqchips: Replace __this_cpu_ptr uses")
> incorrectly converted *__this_cpu_ptr() to raw_cpu_read() instead
> of *raw_cpu_ptr().  Fix it.

Why were Thomas and I not Cc'd on a patch affecting irq-gic.c?

thx,


Jason.

> 
> Fixes following panic on ODROID U3 board (using ARM Exynos4412 SoC):
> 
> Unable to handle kernel NULL pointer dereference at virtual address 00000004
> pgd = c0004000
> [00000004] *pgd=00000000
> Internal error: Oops: 5 [#1] PREEMPT SMP ARM
> Modules linked in:
> CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.17.0-rc2-next-20140828-dirty #837
> task: c05ece28 ti: c05e2000 task.ti: c05e2000
> PC is at gic_init_bases+0x170/0x380
> LR is at gic_init_bases+0x170/0x380
> pc : [<c05b12bc>]    lr : [<c05b12bc>]    psr: 600001d3
> sp : c05e3f18  ip : 00000004  fp : c05edd7c
> r10: c05ea560  r9 : c05ea488  r8 : 00000010
> r7 : 00004000  r6 : c05ea93c  r5 : c05ea93c  r4 : c05ea93c
> r3 : 2a1a0000  r2 : ffffffff  r1 : 00000008  r0 : 00000000
> Flags: nZCv  IRQs off  FIQs off  Mode SVC_32  ISA ARM  Segment kernel
> Control: 10c5387d  Table: 4000404a  DAC: 00000015
> Process swapper/0 (pid: 0, stack limit = 0xc05e2240)
> Stack: (0xc05e3f18 to 0xc05e4000)
> 3f00:                                                       c05e3f88 c040b2bc
> 3f20: c061c3b8 ffffffff 00000004 c05e3f64 00000000 ea7a3b20 c05c5ff0 00000000
> 3f40: f8820000 f8810000 c05de880 00200200 c05e3f88 c05b157c 00004000 ea7a3b20
> 3f60: c061c3b8 00004000 ea0027c0 ea002800 c05e3f80 00000000 00100100 c05b89c8
> 3f80: ea002800 ea002800 c05e3f88 c05e3f88 413fc090 c05c3f50 ffffffff c0626600
> 3fa0: c05c3f60 eb7ff780 413fc090 00000000 00000000 c05a2e80 c05c3f50 c059e1c4
> 3fc0: 00000001 c059ba24 ffffffff ffffffff c059b600 00000000 00000000 c05c3f60
> 3fe0: c06269d4 c05ea47c c05c3f5c c05edeac 4000406a 40008074 00000000 00000000
> [<c05b12bc>] (gic_init_bases) from [<c05b157c>] (gic_of_init+0xb0/0x118)
> [<c05b157c>] (gic_of_init) from [<c05b89c8>] (of_irq_init+0x164/0x29c)
> [<c05b89c8>] (of_irq_init) from [<c05a2e80>] (exynos_init_irq+0x8/0x50)
> [<c05a2e80>] (exynos_init_irq) from [<c059e1c4>] (init_IRQ+0x24/0x74)
> [<c059e1c4>] (init_IRQ) from [<c059ba24>] (start_kernel+0x200/0x384)
> [<c059ba24>] (start_kernel) from [<40008074>] (0x40008074)
> Code: e59f61d8 e5953594 e1a00006 e12fff33 (e5907004) 
> ---[ end trace cb88537fdc8fa200 ]---
> Kernel panic - not syncing: Attempted to kill the idle task!
> ---[ end Kernel panic - not syncing: Attempted to kill the idle task!
> 
> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: nicolas.pitre@linaro.org
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> Cc: Christoph Lameter <cl@linux.com>
> Cc: Tejun Heo <tj@kernel.org>
> ---
> I'm not sure that it is a correct fix but some other *__this_cpu_ptr()
> usages were not converted to raw_cpu_read() but also to *raw_cpu_ptr()
> (like arch_local_irqs_enabled() in arch/tile/include/asm/irqflags.h).
> 
>  drivers/irqchip/irq-gic.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: b/drivers/irqchip/irq-gic.c
> ===================================================================
> --- a/drivers/irqchip/irq-gic.c	2014-09-02 14:03:41.026758653 +0200
> +++ b/drivers/irqchip/irq-gic.c	2014-09-02 14:37:04.466811546 +0200
> @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
>  #ifdef CONFIG_GIC_NON_BANKED
>  static void __iomem *gic_get_percpu_base(union gic_base *base)
>  {
> -	return raw_cpu_read(base->percpu_base);
> +	return *raw_cpu_ptr(base->percpu_base);
>  }
>  
>  static void __iomem *gic_get_common_base(union gic_base *base)
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

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

* Re: linux-next: Tree for Sep 1
  2014-09-02 13:19 ` Bartlomiej Zolnierkiewicz
@ 2014-09-02 14:07   ` Christoph Lameter
  2014-09-02 15:00     ` Christoph Lameter
  2014-09-02 14:58   ` Jason Cooper
  1 sibling, 1 reply; 40+ messages in thread
From: Christoph Lameter @ 2014-09-02 14:07 UTC (permalink / raw)
  To: Bartlomiej Zolnierkiewicz
  Cc: Mark Brown, linux-next, linux-kernel, nicolas.pitre,
	Russell King, Tejun Heo, Kyungmin Park

On Tue, 2 Sep 2014, Bartlomiej Zolnierkiewicz wrote:

> Commit 532d0d0690d1 ("irqchips: Replace __this_cpu_ptr uses")
> incorrectly converted *__this_cpu_ptr() to raw_cpu_read() instead
> of *raw_cpu_ptr().  Fix it.

Oww.. This is double indirection deal there. A percpu offset pointing to
a pointer?

Generally the following is true (definition from
include/asm-generic/percpu.h that is used for ARM for raw_cpu_read):

#define raw_cpu_read_4(pcp)             (*raw_cpu_ptr(&(pcp)))



> Index: b/drivers/irqchip/irq-gic.c
> ===================================================================
> --- a/drivers/irqchip/irq-gic.c	2014-09-02 14:03:41.026758653 +0200
> +++ b/drivers/irqchip/irq-gic.c	2014-09-02 14:37:04.466811546 +0200
> @@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
>  #ifdef CONFIG_GIC_NON_BANKED
>  static void __iomem *gic_get_percpu_base(union gic_base *base)
>  {
> -	return raw_cpu_read(base->percpu_base);
> +	return *raw_cpu_ptr(base->percpu_base);
>  }
>
>  static void __iomem *gic_get_common_base(union gic_base *base)
>
>

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

* Re: linux-next: Tree for Sep 1
  2014-09-01 23:07 Mark Brown
  2014-09-02 13:16 ` Bartlomiej Zolnierkiewicz
@ 2014-09-02 13:19 ` Bartlomiej Zolnierkiewicz
  2014-09-02 14:07   ` Christoph Lameter
  2014-09-02 14:58   ` Jason Cooper
  1 sibling, 2 replies; 40+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-09-02 13:19 UTC (permalink / raw)
  To: Mark Brown
  Cc: linux-next, linux-kernel, nicolas.pitre, Russell King,
	Christoph Lameter, Tejun Heo, Kyungmin Park


[ this time with the patch and right cc: list, sorry for the noise ]

Hi,

On Tuesday, September 02, 2014 12:07:28 AM Mark Brown wrote:
> Changes since 20140829:
> 
> The akpm-current gained a conflict against Linus' tree.
> 
> Non-merge commits (relative to Linus' tree): 2553
>  2686 files changed, 98625 insertions(+), 79475 deletions(-)
> 
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git .
> 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 an
> allmodconfig for x86_64 and a multi_v7_defconfig for arm.
> 
> Below is a summary of the state of the merge.
> 
> I am currently merging 214 trees (counting Linus' and 30 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 Stephen's 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.

I need following patch to make it boot on ODROID U3 board
(ARM Exynos4412 SoC based).  next-20140825 was good, next-20140828
is bad (I haven't tried next-20140826 and next-20140827).

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics


From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: [RFC PATCH] irqchips: gic_get_percpu_base() fix

Commit 532d0d0690d1 ("irqchips: Replace __this_cpu_ptr uses")
incorrectly converted *__this_cpu_ptr() to raw_cpu_read() instead
of *raw_cpu_ptr().  Fix it.

Fixes following panic on ODROID U3 board (using ARM Exynos4412 SoC):

Unable to handle kernel NULL pointer dereference at virtual address 00000004
pgd = c0004000
[00000004] *pgd=00000000
Internal error: Oops: 5 [#1] PREEMPT SMP ARM
Modules linked in:
CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.17.0-rc2-next-20140828-dirty #837
task: c05ece28 ti: c05e2000 task.ti: c05e2000
PC is at gic_init_bases+0x170/0x380
LR is at gic_init_bases+0x170/0x380
pc : [<c05b12bc>]    lr : [<c05b12bc>]    psr: 600001d3
sp : c05e3f18  ip : 00000004  fp : c05edd7c
r10: c05ea560  r9 : c05ea488  r8 : 00000010
r7 : 00004000  r6 : c05ea93c  r5 : c05ea93c  r4 : c05ea93c
r3 : 2a1a0000  r2 : ffffffff  r1 : 00000008  r0 : 00000000
Flags: nZCv  IRQs off  FIQs off  Mode SVC_32  ISA ARM  Segment kernel
Control: 10c5387d  Table: 4000404a  DAC: 00000015
Process swapper/0 (pid: 0, stack limit = 0xc05e2240)
Stack: (0xc05e3f18 to 0xc05e4000)
3f00:                                                       c05e3f88 c040b2bc
3f20: c061c3b8 ffffffff 00000004 c05e3f64 00000000 ea7a3b20 c05c5ff0 00000000
3f40: f8820000 f8810000 c05de880 00200200 c05e3f88 c05b157c 00004000 ea7a3b20
3f60: c061c3b8 00004000 ea0027c0 ea002800 c05e3f80 00000000 00100100 c05b89c8
3f80: ea002800 ea002800 c05e3f88 c05e3f88 413fc090 c05c3f50 ffffffff c0626600
3fa0: c05c3f60 eb7ff780 413fc090 00000000 00000000 c05a2e80 c05c3f50 c059e1c4
3fc0: 00000001 c059ba24 ffffffff ffffffff c059b600 00000000 00000000 c05c3f60
3fe0: c06269d4 c05ea47c c05c3f5c c05edeac 4000406a 40008074 00000000 00000000
[<c05b12bc>] (gic_init_bases) from [<c05b157c>] (gic_of_init+0xb0/0x118)
[<c05b157c>] (gic_of_init) from [<c05b89c8>] (of_irq_init+0x164/0x29c)
[<c05b89c8>] (of_irq_init) from [<c05a2e80>] (exynos_init_irq+0x8/0x50)
[<c05a2e80>] (exynos_init_irq) from [<c059e1c4>] (init_IRQ+0x24/0x74)
[<c059e1c4>] (init_IRQ) from [<c059ba24>] (start_kernel+0x200/0x384)
[<c059ba24>] (start_kernel) from [<40008074>] (0x40008074)
Code: e59f61d8 e5953594 e1a00006 e12fff33 (e5907004) 
---[ end trace cb88537fdc8fa200 ]---
Kernel panic - not syncing: Attempted to kill the idle task!
---[ end Kernel panic - not syncing: Attempted to kill the idle task!

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: nicolas.pitre@linaro.org
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Christoph Lameter <cl@linux.com>
Cc: Tejun Heo <tj@kernel.org>
---
I'm not sure that it is a correct fix but some other *__this_cpu_ptr()
usages were not converted to raw_cpu_read() but also to *raw_cpu_ptr()
(like arch_local_irqs_enabled() in arch/tile/include/asm/irqflags.h).

 drivers/irqchip/irq-gic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: b/drivers/irqchip/irq-gic.c
===================================================================
--- a/drivers/irqchip/irq-gic.c	2014-09-02 14:03:41.026758653 +0200
+++ b/drivers/irqchip/irq-gic.c	2014-09-02 14:37:04.466811546 +0200
@@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX
 #ifdef CONFIG_GIC_NON_BANKED
 static void __iomem *gic_get_percpu_base(union gic_base *base)
 {
-	return raw_cpu_read(base->percpu_base);
+	return *raw_cpu_ptr(base->percpu_base);
 }
 
 static void __iomem *gic_get_common_base(union gic_base *base)



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

* Re: linux-next: Tree for Sep 1
  2014-09-01 23:07 Mark Brown
@ 2014-09-02 13:16 ` Bartlomiej Zolnierkiewicz
  2014-09-02 13:19 ` Bartlomiej Zolnierkiewicz
  1 sibling, 0 replies; 40+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-09-02 13:16 UTC (permalink / raw)
  To: Mark Brown; +Cc: linux-next, linux-kernel


Hi,

On Tuesday, September 02, 2014 12:07:28 AM Mark Brown wrote:
> Changes since 20140829:
> 
> The akpm-current gained a conflict against Linus' tree.
> 
> Non-merge commits (relative to Linus' tree): 2553
>  2686 files changed, 98625 insertions(+), 79475 deletions(-)
> 
> I have created today's linux-next tree at
> git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git .
> 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 an
> allmodconfig for x86_64 and a multi_v7_defconfig for arm.
> 
> Below is a summary of the state of the merge.
> 
> I am currently merging 214 trees (counting Linus' and 30 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 Stephen's 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.

I need following patch to make it boot on ODROID U3 board
(ARM Exynos4412 SoC based).  next-20140825 was good, next-20140828
is bad (I haven't tried next-20140826 and next-20140827).



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

* linux-next: Tree for Sep 1
@ 2014-09-01 23:07 Mark Brown
  2014-09-02 13:16 ` Bartlomiej Zolnierkiewicz
  2014-09-02 13:19 ` Bartlomiej Zolnierkiewicz
  0 siblings, 2 replies; 40+ messages in thread
From: Mark Brown @ 2014-09-01 23:07 UTC (permalink / raw)
  To: linux-next, linux-kernel

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

Changes since 20140829:

The akpm-current gained a conflict against Linus' tree.

Non-merge commits (relative to Linus' tree): 2553
 2686 files changed, 98625 insertions(+), 79475 deletions(-)

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git .
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 an
allmodconfig for x86_64 and a multi_v7_defconfig for arm.

Below is a summary of the state of the merge.

I am currently merging 214 trees (counting Linus' and 30 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 Stephen's 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.

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

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

end of thread, other threads:[~2022-09-01  7:19 UTC | newest]

Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-01  8:17 linux-next: Tree for Sep 1 Stephen Rothwell
2021-09-01 20:55 ` linux-next: Tree for Sep 1 [sound/soc/mediatek/mt8195/snd-soc-mt8195-afe.ko] Randy Dunlap
2021-09-02  2:35   ` Trevor Wu
2021-09-02  8:22     ` Geert Uytterhoeven
2021-09-02  8:50       ` Trevor Wu
2021-09-02  9:15         ` Chen-Yu Tsai
2021-09-03  7:05           ` Trevor Wu
2021-09-03  7:17             ` Chen-Yu Tsai
  -- strict thread matches above, loose matches on Subject: below --
2022-09-01  7:18 linux-next: Tree for Sep 1 Stephen Rothwell
2017-09-01  6:39 Stephen Rothwell
2015-09-01  8:21 Stephen Rothwell
2014-09-01 23:07 Mark Brown
2014-09-02 13:16 ` Bartlomiej Zolnierkiewicz
2014-09-02 13:19 ` Bartlomiej Zolnierkiewicz
2014-09-02 14:07   ` Christoph Lameter
2014-09-02 15:00     ` Christoph Lameter
2014-09-03 16:09       ` Bartlomiej Zolnierkiewicz
2014-09-04 17:11       ` Tejun Heo
2014-09-04 17:59         ` Christoph Lameter
2014-09-05 18:17           ` Russell King - ARM Linux
2014-09-05 11:31         ` Jason Cooper
2014-09-05 23:48           ` Tejun Heo
2014-09-09  0:37         ` Tejun Heo
2014-09-10 14:15           ` Christoph Lameter
2014-09-10 15:04             ` Jason Cooper
2014-09-10 16:18               ` Nicolas Pitre
2014-09-10 16:21                 ` Christoph Lameter
2014-09-10 16:19               ` Christoph Lameter
2014-09-05 19:27       ` Nicolas Pitre
2014-09-08 14:15         ` Christoph Lameter
2014-09-10 17:41         ` Russell King - ARM Linux
2014-09-10 17:59           ` Nicolas Pitre
2014-09-11 10:24             ` Bartlomiej Zolnierkiewicz
2014-09-10 18:11           ` Marc Zyngier
2014-09-11 11:01             ` Bartlomiej Zolnierkiewicz
2014-09-11 11:17               ` Marc Zyngier
2014-09-14  5:40       ` Jason Cooper
2014-09-18 12:51         ` Bartlomiej Zolnierkiewicz
2014-09-19  3:52       ` Tejun Heo
2014-09-02 14:58   ` Jason Cooper

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