All of lore.kernel.org
 help / color / mirror / Atom feed
* linux-next: Tree for Aug 26
@ 2011-08-26  5:00 Stephen Rothwell
  2011-08-26  8:07 ` linux-next: Tree for Aug 26 (i7core_edac) Randy Dunlap
  2011-08-26 18:06 ` [PATCH -next] staging: fix rts5139 depends & build Randy Dunlap
  0 siblings, 2 replies; 24+ messages in thread
From: Stephen Rothwell @ 2011-08-26  5:00 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

The powerpc allyesconfig build still fails today.

Changes since 20110825:

The slave-dma tree gained a conflict against Linus' tree.

I have reverted the x86/spinlocks branch from the tip tree for today.

The ptrace tree lost its build failure.

The xen tree lost its conflict since I reveretd the version of the same
patches in the tip tree..

The tty tree still has its build failure but I applied a supplied test
patch for it.

The staging tree lost its build failures and gained a conflict against
the net tree.

The moduleh tree lost a conflict.

The akpm tree lost its build failure.

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

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

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

Below is a summary of the state of the merge.

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

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

Thanks to Randy Dunlap for doing many randconfig builds.

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

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

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging arm-lpae/for-next
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgalloc.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/tlb.h
CONFLICT (content): Merge conflict in arch/arm/kernel/head.S
CONFLICT (content): Merge conflict in arch/arm/mm/dma-mapping.c
CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
Merging arm-soc/for-next
Merging at91/at91-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-msm/io.c
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging xilinx/arm-next
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging openrisc/for-upstream
Merging parisc/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/dev
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging docs/docs-move
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging powertools/tools-test
Merging cpupowerutils/master
Merging ieee1394/for-next
Merging ubi/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging iscsi-target/for-next
Merging slave-dma/next
CONFLICT (content): Merge conflict in drivers/dma/amba-pl08x.c
Merging async_tx/next
Merging net/master
CONFLICT (delete/modify): arch/powerpc/configs/40x/hcu4_defconfig deleted in HEAD and modified in net/master. Version net/master of arch/powerpc/configs/40x/hcu4_defconfig left in tree.
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (content): Merge conflict in drivers/net/Makefile
$ git rm -f arch/powerpc/configs/40x/hcu4_defconfig
Applying: powerpc: update ppc64_defconfig for net device movement
Applying: sparc: update sparc32_defconfig for net device movement
Applying: sparc: update sparc64_defconfig for net device movement
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging l2-mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/lantiq-flash.c
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Merging input-mt/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
Merging security/next
CONFLICT (content): Merge conflict in fs/ocfs2/xattr.c
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging pm/linux-next
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-ap4evb.c
CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
CONFLICT (content): Merge conflict in drivers/mfd/twl4030-irq.c
Merging apm/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c
Merging devicetree/devicetree/next
CONFLICT (content): Merge conflict in drivers/of/base.c
Merging spi/spi/next
Merging gpio/gpio/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
[master 2dfbfee] Revert "Merge branch 'x86/spinlocks' into auto-latest"
Merging rcu/rcu/next
Merging kvm/linux-next
Merging oprofile/for-next
Merging ptrace/ptrace
Merging xen/upstream/xen
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging namespace/master
Merging regmap/for-next
Merging driver-core/driver-core-next
Merging tty/tty-next
Applying: tty/powerpc: fix build break with ehv_bytechan.c on allyesconfig
Merging usb/usb-next
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-ring.c
Merging staging/staging-next
CONFLICT (delete/modify): drivers/staging/rtl8192e/r8192E_core.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8192e/r8192E_core.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/xgifb/XGI_main_26.c
$ git rm -f drivers/staging/rtl8192e/r8192E_core.c
Applying: rtl8192e: update for ndo_set_multicast_list removal.
Merging bkl-config/config
Merging tmem/linux-next
Merging writeback/next
Merging arm-dt/devicetree/arm-next
Merging moduleh/module.h-split
CONFLICT (content): Merge conflict in arch/arm/mach-bcmring/mm.c
CONFLICT (content): Recorded preimage for 'drivers/staging/iio/gyro/adis16060_core.c'
CONFLICT (content): Merge conflict in drivers/staging/iio/gyro/adis16060_core.c
CONFLICT (content): Merge conflict in include/linux/dmaengine.h
Applying: dm: use export.h instead of module.h where possible
Applying: block: bsg-lib.c needs export.h not module.h
Applying: PM: EXPORT_SYMBOL needs export.h
Merging kvmtool/master
CONFLICT (content): Merge conflict in include/net/9p/9p.h
Merging scsi-post-merge/merge-base:master
$ git checkout akpm
Applying: Found on allmodconfig build (ARCH=alpha)
Applying: The bug was accidentally found by the following program:
Applying: WARNING: line over 80 characters
Applying: The for loop was looking for i <= 0 instead of i >= 0 so this function
Applying: Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
Applying: Commit d1a05b6 ("memcg do not try to drain per-cpu caches without pages")
Applying: Change to new git tree -
Applying: The test for bad usage of min_t() and max_t() is missing the --ignore
Applying: The various basic memory allocation function return NULL, not an ERR_PTR.
Applying: I get below warnning:
Applying: Paul said: I left Google at the end of last week - if it's not bouncing
Applying: It seems that 7bf693951a8e ("console: allow to retain boot console via
Applying: ZONE_CONGESTED is only cleared in kswapd, but pages can be freed in any
Applying: Replace/remove use of RIO v.1.2 registers/bits that are not
Applying: ep93xx_bl.c uses interfaces from linux/module.h,
Applying: Add missing include of linux/module.h for drivers that use interfaces from
Applying: Commit 79dfdac ("memcg: make oom_lock 0 and 1 based rather than counter")
Applying: We need a callback to do some things after pwm_enable, pwm_disable
Applying: This is a i2c driver, not a platform driver, thus use "i2c" prefix for the
Applying: Make sure we are passing the same cookie in all calls to
Applying: Since 43cc71eed1250 ("platform: prefix MODALIAS with "platform:""), the
Applying: Fix the following build errors:
Applying: bd2802_unregister_led_classdev() should unregister all registered
Applying: Because of x86-implement-strict-user-copy-checks-for-x86_64.patch
Applying: When no floppy is found the module code can be released while a timer
Applying: Fix kconfig unmet dependency warning.  BACKLIGHT_CLASS_DEVICE depends on
Applying: Fix the following memory leak:
Applying: The parameter's origin type is long.  On an i386 architecture, it can
Applying: Since the commit below which added O_PATH support to the *at() calls, the
Applying: Add support for Aspire 1410 BIOS v1.3314.  Fixes the following error:
Applying: This makes the iris driver use the platform API, so it is properly exposed
Applying: On x86_32 casting the unsigned int result of get_random_int() to long may
Applying: This new driver replaces the old PCEngines Alix 2/3 LED driver with a new
Applying: Cc: Ed Wildgoose <git@wildgooses.com>
Applying: Replace the bubble sort in sanitize_e820_map() with a call to the generic
Applying: The x86 timer interrupt handler is the only handler not traced in the
Applying: The current interrupt traces from irq_handler_entry and irq_handler_exit
Applying: Don't allow everybody to use a modem.
Applying: The address limit is already set in flush_old_exec() so this
Applying: A call to va_copy() should always be followed by a call to va_end() in the
Applying: Don't dereference em if it's NULL or an error pointer.
Applying: The RETE bit in IECSR is cleared by writing a 1 to it.
Applying: Some messing with error codes to return 0 on out id's and match
Applying: kbuf is a buffer that is local to this function, so all of the error paths
Applying: fb_set_suspend() must be called with the console semaphore held, which
Applying: hwmon was using an idr with a NULL pointer, so convert to an
Applying: A straightforward looking use of idr for a device id.
Applying: This patchset aims at addressing /proc/stat issue which has been
Applying: update_ts_time_stat currently updates idle time even if we are in iowait
Applying: get_cpu_{idle,iowait}_time_us update idle/iowait counters unconditionally
Applying: show_stat handler of the /proc/stat file relies on kstat_cpu(cpu)
Applying: The address limit is already set in flush_old_exec() so this
Applying: The address limit is already set in flush_old_exec() so this
Applying: Add new check (assert_init) to make sure objects are initialized and
Applying: del_timer_sync() calls debug_object_assert_init() to assert that a timer
Applying: ext4_{set,clear}_bit() is defined as __test_and_{set,clear}_bit_le() for
Applying: The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned,
Applying: The address limit is already set in flush_old_exec() so those calls to
Applying: When do pci remove/rescan on system that have more iommus, got
Applying: The current implementation of dmi_name_in_vendors() is an invitation to
Applying: kernel/rtmutex.c: In function '__rt_mutex_slowlock':
Applying: For headers that get exported to userland and make use of u32 style
Applying: Fix sparse warnings of right shift bigger than source value size:
Applying: We leak in drivers/scsi/aacraid/commctrl.c::aac_send_raw_srb() :
Applying: Some mangling of errors was necessary to maintain current interface.
Applying: This does involve additional use of the spin lock in idr.c.  Is this an
Applying: Instead of open coding this function use kstrtoul_from_user() directly.
Applying: brd_make_request() always returns 0, which doesn't make much sense.
Applying: The address limit is already set in flush_old_exec() so this assignment of
Applying: Unbreak the alpha build.
Applying: Unbreak alpha build.
Applying: Unbreak alpha build.
Applying: When we get corruption reports, it's useful to see if the kernel was
Applying: When we get corruption reports, it's useful to see if the kernel was
Applying: The basic idea behind cross memory attach is to allow MPI programs doing
Applying: - Add x86_64 specific wire up
Applying: > You might get some speed benefit by optimising for the small copies
Applying: acct_isolated of compaction uses page_lru_base_type which returns only
Applying: Change ISOLATE_XXX macro with bitwise isolate_mode_t type.  Normally,
Applying: In async mode, compaction doesn't migrate dirty or writeback pages.  So,
Applying: In __zone_reclaim case, we don't want to shrink mapped page.  Nonetheless,
Applying: unmap_and_move() is one a big messy function.  Clean it up.
Applying: radix_tree_tag_get()'s BUG (when it sees a tag after saw_unset_tag) was
Applying: per-task block plug can reduce block queue lock contention and increase
Applying: The tracing ring-buffer used this function briefly, but not anymore.
Applying: After selecting a task to kill, the oom killer iterates all processes and
Applying: Add the leading word "tmpfs" to the Kconfig string to make it blindingly
Applying: When we get a bad_page bug report, it's useful to see what modules the
Applying: Without swap, anonymous pages are not scanned.  As such, they should not
Applying: fix comment
Applying: The nr_force_scan[] tuple holds the effective scan numbers for anon and
Applying: Some kernel components pin user space memory (infiniband and perf) (by
Applying: Add comments to explain the page statistics field in the mm_struct.
Applying: add missing ;
Applying: Testing from the XFS folk revealed that there is still too much I/O from
Applying: Lumpy reclaim worked with two passes - the first which queued pages for IO
Applying: Direct reclaim should never writeback pages.  For now, handle the
Applying: Direct reclaim should never writeback pages.  Warn if an attempt is made.
Applying: It is preferable that no dirty pages are dispatched for cleaning from the
Applying: Workloads that are allocating frequently and writing files place a large
Applying: When direct reclaim encounters a dirty page, it gets recycled around the
Applying: It's possible a zone watermark is ok when entering the balance_pgdat()
Applying: printk_ratelimit() should not be used, because it shares ratelimiting
Applying: memchr_inv() is mainly used to check whether the whole buffer is filled
Applying: Use newly introduced memchr_inv() for page verification.
Applying: A shrinker function can return -1, means that it cannot do anything
Applying: Use atomic-long operations instead of looping around cmpxchg().
Applying: massage atomic.h inclusions
Applying: The /proc/vmallocinfo shows information about vmalloc allocations in
Applying: Commit 645747462435 ("vmscan: detect mapped file pages used only once")
Applying: Logic added in commit 8cab4754d24a0 ("vmscan: make mapped executable pages
Applying: SPARC32 require access to the start address.  Add a new helper
Applying: With the NO_BOOTMEM symbol added architectures may now use the following
Applying: Using "- 1" relies on the old_end to be page aligned and PAGE_SIZE > 1,
Applying: This replaces ptep_clear_flush() with ptep_get_and_clear() and a single
Applying: This adds THP support to mremap (decreases the number of split_huge_page()
Applying: coding-style nitpicking
Applying: Cc: Andrea Arcangeli <aarcange@redhat.com>
Applying: Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applying: vmstat_text is only available when PROC_FS or SYSFS is enabled.  This
Applying: reduce ifdeffery
Applying: Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applying: Make the security_inode_init_security() initxattrs arg const, to match the
Applying: The current implementation of the /dev/hpet driver couples opening the
Applying: smp_call_function() only lets all other CPUs execute a specific function,
Applying: auto_demotion_disable is called only for online CPUs.  For hotplugged
Applying: Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following warning:
Applying: Strict user copy checks are only really supported on x86_32 even though
Applying: The help text for this config is duplicated across the x86, parisc, and
Applying: s/lib-/obj-/ for usercopy.o
Applying: After an "unexpected" reboot, I found this Oops in my logs:
Applying: In the move of the lis3 driver, the hp_accel.c file got dropped from the
Applying: Add axis correction for HP EliteBook 2730p.
Applying: Add axis correction for HP EliteBook 8540w.
Applying: Add axis correction for HP ProBook 6555b.
Applying: Adapt the help text for CONFIG_HP_ACCEL to the move of
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: Change exported functions to use the device given as parameter
Applying: Signed-off-by: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Applying: We are enabling some power features on medfield.  To test suspend-2-RAM
Applying: We are enabling some power features on medfield.  To test suspend-2-RAM
Applying: We are enabling some power features on medfield.  To test suspend-2-RAM
Applying: Cc: Al Viro <viro@zeniv.linux.org.uk>
Applying: Add V2 of the LED driver for a single timer channel for the TPU hardware
Applying: include linux/module.h
Applying: The memory for struct led_trigger should be kfreed in the
Applying: Currently termination logic (\0 or \n\0) is hardcoded in _kstrtoull(),
Applying: Add support for slice by 8 to existing crc32 algorithm.  Also modify
Applying: don't include asm/msr.h
Applying: epoll can acquire recursively acquire ep->mtx on multiple "struct
Applying: Currently in oprofilefs, files that use ulong_fops mis-handle writes of
Applying: This is the one use of an ida that doesn't retry on receiving -EAGAIN.
Applying: One can get this information from minix/inode.c, but adding the
Applying: The memcg code sometimes uses "struct mem_cgroup *mem" and sometimes uses
Applying: Before calling schedule_timeout(), task state should be changed.
Applying: Signed-off-by: Bob Liu <lliubbo@gmail.com>
Applying: While back-porting Johannes Weiner's patch "mm: memcg-aware global
Applying: If somebody is touching data too early, it might be easier to diagnose a
Applying: Both mem_cgroup_charge_statistics() and mem_cgroup_move_account() were
Applying: On reading sysctl dirs we should return -EISDIR instead of -EINVAL.
Applying: Force this on for -next/mm testing purposes.
Applying: Expand root=PARTUUID=UUID syntax to support selecting a root partition by
Applying: After merging the akpm tree, today's linux-next build (lost of them)
Applying: The discovered bit in PGCCSR register indicates if the device has been
Applying: Add RapidIO mport driver for IDT TSI721 PCI Express-to-SRIO bridge device.
Applying: When I tried to send a patch to remove it, Andi told me we still need to
Applying: Signed-off-by: WANG Cong <amwang@redhat.com>
Applying: Signed-off-by: WANG Cong <amwang@redhat.com>
Applying: Signed-off-by: WANG Cong <amwang@redhat.com>
Applying: This is only an error, no need to use KERN_CRIT log level.
Applying: Signed-off-by: WANG Cong <amwang@redhat.com>
Applying: ERROR: code indent should use tabs where possible
Applying: A default echo function has been provided so it is no longer an error when
Applying: This client driver allows you to use a GPIO pin as a source for PPS
Applying: remove unneeded cast of void*
Applying: Straightforward.  As an aside, the ida_init calls are not needed as far as
Applying: Simply creates one point to call the w1 interface.
Applying: Adds a nolock function to the w1 interface to avoid locking the
Applying: Fixes the deadlock when inserting and removing the ds2780.
Merging akpm

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

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

* Re: linux-next: Tree for Aug 26 (i7core_edac)
  2011-08-26  5:00 linux-next: Tree for Aug 26 Stephen Rothwell
@ 2011-08-26  8:07 ` Randy Dunlap
  2011-08-26 14:16   ` Sedat Dilek
  2011-08-26 18:06 ` [PATCH -next] staging: fix rts5139 depends & build Randy Dunlap
  1 sibling, 1 reply; 24+ messages in thread
From: Randy Dunlap @ 2011-08-26  8:07 UTC (permalink / raw)
  To: Stephen Rothwell, Mauro Carvalho Chehab; +Cc: linux-next, LKML, linux-edac


On Thu, August 25, 2011 10:00 pm, Stephen Rothwell wrote:
> Hi all,
>
> The powerpc allyesconfig build still fails today.
>
> Changes since 20110825:


on i386:

ERROR: "__udivdi3" [drivers/edac/i7core_edac.ko] undefined!

in both get_sdram_scrub_rate()
and set_sdram_scrub_rate()

-- 
~Randy


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

* Re: linux-next: Tree for Aug 26 (i7core_edac)
  2011-08-26  8:07 ` linux-next: Tree for Aug 26 (i7core_edac) Randy Dunlap
@ 2011-08-26 14:16   ` Sedat Dilek
  2011-08-26 14:48     ` Borislav Petkov
  2011-08-26 17:40     ` Randy Dunlap
  0 siblings, 2 replies; 24+ messages in thread
From: Sedat Dilek @ 2011-08-26 14:16 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, Mauro Carvalho Chehab, linux-next, LKML, linux-edac

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

On Fri, Aug 26, 2011 at 10:07 AM, Randy Dunlap <rdunlap@xenotime.net> wrote:
>
> On Thu, August 25, 2011 10:00 pm, Stephen Rothwell wrote:
>> Hi all,
>>
>> The powerpc allyesconfig build still fails today.
>>
>> Changes since 20110825:
>
>
> on i386:
>
> ERROR: "__udivdi3" [drivers/edac/i7core_edac.ko] undefined!
>
> in both get_sdram_scrub_rate()
> and set_sdram_scrub_rate()
>
> --
> ~Randy
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Hi Randy,

can you test with the patch attached, please?

( UNTESTED, just followed patches like "[PATCH] p54: Use do_div for
64-bit division to fix 32-bit kernels" or "[PATCH v1] carl9170: Use
do_div for 64-bit division to fix 32-bit kernels" )

Regards,
- Sedat -

[-- Attachment #2: i7core_edac.c.diff --]
[-- Type: text/x-patch, Size: 1032 bytes --]

diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
index 7cb68de..4d4f3a5 100644
--- a/drivers/edac/i7core_edac.c
+++ b/drivers/edac/i7core_edac.c
@@ -37,6 +37,7 @@
 #include <linux/smp.h>
 #include <asm/mce.h>
 #include <asm/processor.h>
+#include <asm/div64.h>
 
 #include "edac_core.h"
 
@@ -2102,7 +2103,8 @@ static int set_sdram_scrub_rate(struct mem_ctl_info *mci, u32 new_bw)
 		 * program the corresponding register value.
 		 */
 		scrub_interval = (unsigned long long)freq_dclk_mhz *
-			cache_line_size * 1000000 / new_bw;
+			cache_line_size * 1000000);
+		do_div(scrub_interval, new_bw);
 
 		if (!scrub_interval || scrub_interval > SCRUBINTERVAL_MASK)
 			return -EINVAL;
@@ -2153,7 +2155,8 @@ static int get_sdram_scrub_rate(struct mem_ctl_info *mci)
 
 	/* Calculate scrub rate value into byte/sec bandwidth */
 	scrub_rate =  (unsigned long long)freq_dclk_mhz *
-		1000000 * cache_line_size / scrubval;
+		1000000 * cache_line_size);
+	do_div(scrub_rate, scrubval);
 	return (int)scrub_rate;
 }
 

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

* Re: linux-next: Tree for Aug 26 (i7core_edac)
  2011-08-26 14:16   ` Sedat Dilek
@ 2011-08-26 14:48     ` Borislav Petkov
  2011-08-26 17:40     ` Randy Dunlap
  1 sibling, 0 replies; 24+ messages in thread
From: Borislav Petkov @ 2011-08-26 14:48 UTC (permalink / raw)
  To: sedat.dilek
  Cc: Randy Dunlap, Stephen Rothwell, Mauro Carvalho Chehab,
	linux-next, LKML, linux-edac

On Fri, Aug 26, 2011 at 10:16:11AM -0400, Sedat Dilek wrote:
> ( UNTESTED, just followed patches like "[PATCH] p54: Use do_div for
> 64-bit division to fix 32-bit kernels" or "[PATCH v1] carl9170: Use
> do_div for 64-bit division to fix 32-bit kernels" )
> 
> Regards,
> - Sedat -

> diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
> index 7cb68de..4d4f3a5 100644
> --- a/drivers/edac/i7core_edac.c
> +++ b/drivers/edac/i7core_edac.c
> @@ -37,6 +37,7 @@
>  #include <linux/smp.h>
>  #include <asm/mce.h>
>  #include <asm/processor.h>
> +#include <asm/div64.h>
>  
>  #include "edac_core.h"
>  
> @@ -2102,7 +2103,8 @@ static int set_sdram_scrub_rate(struct mem_ctl_info *mci, u32 new_bw)
>  		 * program the corresponding register value.
>  		 */
>  		scrub_interval = (unsigned long long)freq_dclk_mhz *
> -			cache_line_size * 1000000 / new_bw;
> +			cache_line_size * 1000000);
> +		do_div(scrub_interval, new_bw);

This has been an issue pretty often lately on lkml. Instead of doing
64-bit division on 32-bit (which is really slow), you could try to use
the commutative property of integer multiplication and thus reorder the
operations so that the division is 32-bit only. Maybe

((freq_dclk_mhz * cache_line_size) / new_bw) * 1000000

for example. You have to make sure though that new_bw as divisor can
never be bigger than the dividend because otherwise you get the 0. One
question would be what is the interval of freq_dclk_mhz and can (new_bw >> 6)
be ever bigger than it.

And while at it, the cache_line_size is pretty solidly staying 64 Byte
in the short-term future so no need for a local variable. Also, shifting
left by 6 should be a faster equivalent than multiplying by 64.

-- 
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551

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

* Re: linux-next: Tree for Aug 26 (i7core_edac)
  2011-08-26 14:16   ` Sedat Dilek
  2011-08-26 14:48     ` Borislav Petkov
@ 2011-08-26 17:40     ` Randy Dunlap
  2011-08-26 17:54       ` Sedat Dilek
  1 sibling, 1 reply; 24+ messages in thread
From: Randy Dunlap @ 2011-08-26 17:40 UTC (permalink / raw)
  To: sedat.dilek
  Cc: Sedat Dilek, Stephen Rothwell, Mauro Carvalho Chehab, linux-next,
	LKML, linux-edac

On Fri, 26 Aug 2011 16:16:11 +0200 Sedat Dilek wrote:

> On Fri, Aug 26, 2011 at 10:07 AM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> >
> > On Thu, August 25, 2011 10:00 pm, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> The powerpc allyesconfig build still fails today.
> >>
> >> Changes since 20110825:
> >
> >
> > on i386:
> >
> > ERROR: "__udivdi3" [drivers/edac/i7core_edac.ko] undefined!
> >
> > in both get_sdram_scrub_rate()
> > and set_sdram_scrub_rate()
> >
> > --
> 
> Hi Randy,
> 
> can you test with the patch attached, please?
> 
> ( UNTESTED, just followed patches like "[PATCH] p54: Use do_div for
> 64-bit division to fix 32-bit kernels" or "[PATCH v1] carl9170: Use
> do_div for 64-bit division to fix 32-bit kernels" )

Yes, this works after I removed the extra right parens in both cases.
(did you test it?)

thanks,
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

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

* Re: linux-next: Tree for Aug 26 (i7core_edac)
  2011-08-26 17:40     ` Randy Dunlap
@ 2011-08-26 17:54       ` Sedat Dilek
  0 siblings, 0 replies; 24+ messages in thread
From: Sedat Dilek @ 2011-08-26 17:54 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: Stephen Rothwell, Mauro Carvalho Chehab, linux-next, LKML, linux-edac

On Fri, Aug 26, 2011 at 7:40 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> On Fri, 26 Aug 2011 16:16:11 +0200 Sedat Dilek wrote:
>
>> On Fri, Aug 26, 2011 at 10:07 AM, Randy Dunlap <rdunlap@xenotime.net> wrote:
>> >
>> > On Thu, August 25, 2011 10:00 pm, Stephen Rothwell wrote:
>> >> Hi all,
>> >>
>> >> The powerpc allyesconfig build still fails today.
>> >>
>> >> Changes since 20110825:
>> >
>> >
>> > on i386:
>> >
>> > ERROR: "__udivdi3" [drivers/edac/i7core_edac.ko] undefined!
>> >
>> > in both get_sdram_scrub_rate()
>> > and set_sdram_scrub_rate()
>> >
>> > --
>>
>> Hi Randy,
>>
>> can you test with the patch attached, please?
>>
>> ( UNTESTED, just followed patches like "[PATCH] p54: Use do_div for
>> 64-bit division to fix 32-bit kernels" or "[PATCH v1] carl9170: Use
>> do_div for 64-bit division to fix 32-bit kernels" )
>
> Yes, this works after I removed the extra right parens in both cases.

The closing brackets were a test for you (indeed they are wrong).

> (did you test it?)
>

No, even not compile-tested, still struggling with todays linux-next.
Seems I am not alone [1].

- Sedat -

[1] http://lkml.org/lkml/2011/8/26/300

> thanks,
> ---
> ~Randy
> *** Remember to use Documentation/SubmitChecklist when testing your code ***
>

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

* [PATCH -next] staging: fix rts5139 depends & build
  2011-08-26  5:00 linux-next: Tree for Aug 26 Stephen Rothwell
  2011-08-26  8:07 ` linux-next: Tree for Aug 26 (i7core_edac) Randy Dunlap
@ 2011-08-26 18:06 ` Randy Dunlap
  1 sibling, 0 replies; 24+ messages in thread
From: Randy Dunlap @ 2011-08-26 18:06 UTC (permalink / raw)
  To: Stephen Rothwell, Edwin Rong, gregkh, akpm; +Cc: linux-next, LKML, driverdevel

From: Randy Dunlap <rdunlap@xenotime.net>

RTS5139 should depend on USB, not USB_SUPPORT, to fix build
errors.
USB_SUPPORT can be enabled for gadget-only support
or when PCI is not enabled.

ERROR: "usb_reset_endpoint" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_kill_urb" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_deregister_dev" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_unlink_urb" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_deregister" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_register_dev" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_free_coherent" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_submit_urb" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_sg_cancel" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_find_interface" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_sg_init" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_register_driver" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_alloc_coherent" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_free_urb" [drivers/staging/rts5139/rts5139.ko] undefined!
ERROR: "usb_alloc_urb" [drivers/staging/rts5139/rts5139.ko] undefined!

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Edwin Rong <edwin_rong@realsil.com.cn>
---
 drivers/staging/rts5139/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20110826.orig/drivers/staging/rts5139/Kconfig
+++ linux-next-20110826/drivers/staging/rts5139/Kconfig
@@ -1,6 +1,6 @@
 config RTS5139
 	tristate "Realtek RTS5139 USB card reader support"
-	depends on USB_SUPPORT && SCSI
+	depends on USB && SCSI
 	help
 	  Say Y here to include driver code to support the Realtek
 	  RTS5139 USB card readers.

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

* linux-next: Tree for Aug 26
@ 2022-08-26  7:46 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2022-08-26  7:46 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20220825:

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

The drm-intel tree gained a semantic conflict against the drm tree.

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

The pinctrl tree gained a semantic conflict against the i2c tree.

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

Non-merge commits (relative to Linus' tree): 2993
 4337 files changed, 169921 insertions(+), 65395 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 358 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 (4c612826bec1 Merge tag 'net-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging fixes/fixes (1c23f9e627a7 Linux 6.0-rc2)
Merging mm-hotfixes/mm-hotfixes-unstable (c5044de8a23c mm-page_alloc-fix-race-condition-between-build_all_zonelists-and-page-allocation-fix)
Merging kbuild-current/fixes (15b3f48a4339 Merge tag 'kbuild-fixes-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging arc-current/for-curr (952deecb065e arc: dts: Harmonize EHCI/OHCI DT nodes name)
Merging arm-current/fixes (ec85bd369fd2 ARM: findbit: fix overflowing offset)
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 (3cbd67384677 MAINTAINERS: add the Polarfire SoC's i2c driver)
Merging drivers-memory-fixes/fixes (568035b01cfb Linux 6.0-rc1)
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 (f889a2e89ea5 selftests/powerpc: Add missing PMU selftests to .gitignores)
Merging s390-fixes/fixes (41ac42f13708 s390/mm: do not trigger write fault when vma does not allow VM_WRITE)
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 (4c612826bec1 Merge tag 'net-6.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf/master (a657182a5c51 bpf: Don't use tnum_range on array range checking for poke descriptors)
Merging ipsec/master (17ecd4a4db47 xfrm: policy: fix metadata dst->dev xmit null pointer dereference)
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 (55f0a4894484 wifi: mac80211: potential NULL dereference in ieee80211_tx_control_port())
Merging rdma-fixes/for-rc (56c310de0b4b RDMA/rtrs-srv: Pass the correct number of entries for dma mapped SGL)
Merging sound-current/for-linus (6ab55ec0a938 ALSA: control: Fix an out-of-bounds bug in get_ctl_id_hash())
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 (78e1e867f44e regulator: pfuze100: Fix the global-out-of-bounds access in pfuze100_regulator_probe())
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 (b5a5b9d5f28d serial: document start_rx member at struct uart_ops)
Merging usb.current/usb-linus (8531aa1659f7 Revert "xhci: turn off port power in shutdown")
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (1c23f9e627a7 Linux 6.0-rc2)
Merging phy/fixes (568035b01cfb Linux 6.0-rc1)
Merging staging.current/staging-linus (e01f5c8d6af2 staging: r8188eu: Add Rosewill USB-N150 Nano to device tables)
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 (a582123d6f4c Merge tag 'iio-fixes-for-6.0a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio 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 (80b9ebd3e478 Input: goodix - add compatible string for GT1158)
Merging crypto-current/master (af5d35b83f64 crypto: tcrypt - Remove the static variable initialisations to NULL)
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 (3bcc2c1eade4 media: rkvdec: Disable H.264 error detection)
Merging reset-fixes/reset/fixes (a57f68ddc886 reset: Fix devm bulk optional exclusive control getter)
Merging mips-fixes/mips-fixes (568035b01cfb Linux 6.0-rc1)
Merging at91-fixes/at91-fixes (ef0324b6415d ARM: dts: lan966x: fix sys_clk frequency)
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 (cf5029d5dd7c KVM: x86: Protect the unused bits in MSR exiting flags)
Merging hwmon-fixes/hwmon (ed3590561f5d hwmon: (pmbus) Fix vout margin caching)
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 (6b2caaafc5df platform/surface: aggregator_registry: Add HID devices for sensors and UCSI client to SP8)
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 (100d0ae82b5c Merge tag 'amd-drm-fixes-6.0-2022-08-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (6067c82c576a drm/i915/backlight: Disable pps power hook for aux based backlight)
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 (e4009c5fa77b riscv: dts: microchip: mpfs: remove pci axi address translation property)
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 (3f4e432fb9c6 gpio: pxa: use devres for the clock struct)
Merging gpio-intel-fixes/fixes (b93a8b2c5161 gpio: dln2: make irq_chip immutable)
Merging pinctrl-intel-fixes/fixes (ba79c5e45eec MAINTAINERS: Update Intel pin control to Supported)
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 (432b52eea3dc ARM: shmobile: defconfig: Restore graphical consoles)
Merging broadcom-fixes/fixes (a26f045984e7 Merge branch 'devicetree/fixes' into fixes)
Merging perf-current/perf/urgent (15b3f48a4339 Merge tag 'kbuild-fixes-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
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 (15b3f48a4339 Merge tag 'kbuild-fixes-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
Merging perf/perf/core (4e8827acb5e1 perf metrics: Use 'unsigned int' instead of just 'unsigned'.)
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 (3eaecd0677e1 Merge branches 'misc' and 'fixes' into for-next)
Merging arm64/for-next/core (892f7237b3ff arm64: Delay initialisation of cpuinfo_arm64::reg_{zcr,smcr})
Merging arm-perf/for-next/perf (aaaee7b55c9e docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING)
Merging arm-soc/for-next (87a5b37a8f02 Merge branch 'arm/late' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-s3c/Kconfig.s3c64xx
CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig
Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC)
Merging amlogic/for-next (045dd6b2fcf9 Merge branch 'v6.1/dt64' into for-next)
Merging aspeed/for-next (7bc156fbb726 ARM: config: aspeed_g5: Enable PECI)
Merging at91/at91-next (38b729bf1ee6 Merge branch 'at91-dt' into at91-next)
Merging broadcom/next (ade0d6ecf54a Merge branch 'drivers/next' into next)
Merging drivers-memory/for-next (cf4b4433946c Merge branch 'for-v6.1/brcm-stb' 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 (39e1c2b211d0 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 (964421bec6ed Merge branches 'arm64-defconfig-for-6.1', 'arm64-for-6.1', 'clk-for-6.1', 'defconfig-for-6.1', 'drivers-for-6.1' and 'dts-for-6.1' into for-next)
Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema)
Merging renesas/next (64f8982ca069 Merge branch 'renesas-arm-dt-for-v6.1' into renesas-next)
Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage")
Merging rockchip/for-next (a6eeda46092d 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 (4b43ff02d2a4 ARM: dts: stm32: Add ST MIPID02 bindings to AV96)
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 (62b9e4033c13 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next)
Merging xilinx/for-next (0413dd4d95da ARM: dts: zynq: add QSPI controller node)
Merging clk/clk-next (640b47fe2f82 Merge branch 'clk-fixes' 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 (57746e993442 clk: renesas: r9a07g044: Add conditional compilation for r9a07g044_cpg_info)
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 (1c23f9e627a7 Linux 6.0-rc2)
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 (568035b01cfb Linux 6.0-rc1)
Merging soc-fsl/next (4b0986a3613c Linux 5.18)
Merging risc-v/for-next (789f3fa9dca0 Merge tag 'riscv-topo-on-6.0-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ into for-next)
Merging risc-v-mc/dt-for-next (7eac0081a8e9 riscv: dts: microchip: add qspi compatible fallback)
Merging s390/for-next (67a933343b48 Merge branch 'fixes' into for-next)
Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size)
Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging uml/linux-next (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 (985b4f6faa27 Merge branch 'fixes' into for-next)
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 (00535da77b92 Merge branch 'for-next-next-v6.0-20220823' into for-next-20220823)
Merging ceph/master (a8af0d682ae0 libceph: clean up ceph_osdc_start_request prototype)
Merging cifs/for-next (b816251ee876 smb3: fix temporary data corruption in insert range)
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 (df13a3477635 MAINTAINERS: Add Namjae's exfat git tree)
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 (48c8706cbaa7 f2fs: complete checkpoints during remount)
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 (86934198eefa gfs2: Clear flags when withdraw prevents xmote)
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 (deb33fa8542e NFSD enforce filehandle check for source file in COPY)
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 (c918c1a14084 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 (b7cfdf99ca4c Merge branch 'i2c/for-current-fixed' 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 (1ad7a62d52e8 MAINTAINERS: Update Juerg Haefliger's email address)
Merging jc_docs/docs-next (b68015a37f58 Merge branch 'docs-mw' into docs-next)
Merging v4l-dvb/master (568035b01cfb Linux 6.0-rc1)
Merging v4l-dvb-next/master (1ff8334f0a4e media: MAINTAINERS: add entry for i.MX8MP DW100 v4l2 mem2mem driver)
Merging pm/linux-next (149c50bccdd5 Merge branch 'thermal-next' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (0612d928b7ff cpufreq: Add SM6115 to cpufreq-dt-platdev blocklist)
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 (2c34bb6dea48 IB: move from strlcpy with unused retval to strscpy)
Merging net-next/master (880b0dd94f03 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
Merging bpf-next/for-next (d4ffb6f39f1a bpf: Add CGROUP prefix to cgroup_iter_order)
CONFLICT (content): Merge conflict in net/core/filter.c
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/DENYLIST.s390x
Merging ipsec-next/master (93d7c52a6eb9 selftests/net: Refactor xfrm_fill_key() to use array of structs)
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 (808765508e8e Bluetooth: hci_sync: hold hdev->lock when cleanup hci_conn)
Merging wireless-next/for-next (b8c9024e0ed0 wifi: cfg80211: Add link_id to cfg80211_ch_switch_started_notify())
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 (47d35bf22b69 hwrng: imx-rngc - use KBUILD_MODNAME as driver name)
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 (3007dc2af6e8 drm/virtio: Fix same-context optimization)
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 (a9c5e9c82039 drm/amd: remove possible condition with no effect (if == else))
Merging drm-intel/for-linux-next (f02c7d5a8fa3 drm/i915/display/mtl: Extend MBUS programming)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/icl_dsi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/vlv_dsi.c
Applying: fix up for "drm/i915/guc: Add GuC <-> kernel time stamp translation information"
Merging drm-tegra/for-next (135f4c551d51 drm/tegra: vic: Use devm_platform_ioremap_resource())
Merging drm-msm/msm-next (568035b01cfb Linux 6.0-rc1)
Merging drm-msm-lumag/msm-next-lumag (12c71c0c3dbc Merge branch 'msm-next-lumag-dpu' 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 (6cffb1c27f2d drm/etnaviv: Remove duplicate call to drm_gem_free_mmap_offset)
Merging fbdev/for-next (529dc9303ea8 fbdev: fbcon: Properly revert changes when vc_resize() failed)
Merging regmap/for-next (1bfa8e736383 Merge remote-tracking branch 'regmap/for-6.1' into regmap-next)
Merging sound/for-next (384c687fb4ad Merge branch 'topic/memalloc-cleanup' into for-next)
Merging sound-asoc/for-next (d0c485957caa 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 (a9da7251ac8b Input: gameport - move from strlcpy with unused retval to strscpy)
Merging block/for-next (09621f178ff0 Merge branch 'for-6.1/block' into for-next)
Merging device-mapper/for-next (e3a7c2947b9e dm bufio: fix some cases where the code sleeps with spinlock held)
Merging libata/for-next (9587264aea50 ata: libata-core: Simplify ata_dev_set_xfermode())
Merging pcmcia/pcmcia-next (2ef4bb24ff39 pcmcia: Use platform_get_irq() to get the interrupt)
Merging mmc/next (6b77110b282c mmc: core: Switch to basic workqueue API for sdio_irq_work)
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 (e89e9017a478 Merge remote-tracking branch 'regulator/for-6.1' into regulator-next)
Merging security/next (ed5d44d42c95 selinux: Implement userns_create hook)
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 (568035b01cfb Linux 6.0-rc1)
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 (1c23f9e627a7 Linux 6.0-rc2)
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 (0351dc57b95b audit: fix repeated words in comments)
Merging devicetree/for-next (dd3cb467ebb5 dt-bindings: Remove 'Device Tree Bindings' from end of title:)
Merging dt-krzk/for-next (568035b01cfb Linux 6.0-rc1)
Merging mailbox/mailbox-for-next (8a8dc2b9596e mailbox: imx: clear pending interrupts)
Merging spi/for-next (8379bb2d4e68 Merge remote-tracking branch 'spi/for-6.1' into spi-next)
Merging tip/master (920357712207 Merge x86/urgent into tip/master)
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 (942703b9450e rcutorture: Limit read-side polling-API testing)
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 (5f3925e34594 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 (1ea0d3b46798 platform/x86: asus-wmi: Simplify tablet-mode-switch handling)
Merging chrome-platform/for-next (8a07b45fd3c2 platform/chrome: fix memory corruption in ioctl)
Merging hsi/for-next (43c14f8d18a7 HSI: omap_ssi: Fix refcount leak in ssi_probe)
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 (4dce3b375179 usb/hcd: Fix dma_map_sg error check)
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 (1c23f9e627a7 Linux 6.0-rc2)
Merging tty/tty-next (568035b01cfb Linux 6.0-rc1)
Merging char-misc/char-misc-next (568035b01cfb Linux 6.0-rc1)
Merging coresight/next (84fa8f159022 dt-bindings: arm: coresight-tmc: Add 'iommu' property)
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 (682ca76bc60a iio: Avoid multiple line dereference for mask)
Merging phy-next/next (568035b01cfb Linux 6.0-rc1)
Merging soundwire/next (63198aaa91ac soundwire: intel: remove use of __func__ in dev_dbg)
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 (dba908967df5 staging: r8188eu: remove unnecessary null check)
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 (b48dc0e02bb6 Merge branch 'for-6.0-fixes' 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 (1e65d136d956 dt-bindings: gpio: fairchild,74hc595: use spi-peripheral-props.yaml)
Merging gpio-intel/for-next (b65bb2c14891 gpio: pch: Change PCI device macros)
Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4)
Merging pinctrl/for-next (a0d281349ac5 Merge branch 'devel' into for-next)
Applying: pinctrl: fixup for "i2c: Make remove callback return void"
Merging pinctrl-intel/for-next (25097de7b236 pinctrl: intel: Add Intel Meteor Lake pin controller support)
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 (ab7039dbcc61 selftests/vm: use top_srcdir instead of recomputing relative paths)
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 (568035b01cfb Linux 6.0-rc1)
Merging seccomp/for-next/seccomp (1c23f9e627a7 Linux 6.0-rc2)
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 (47c88c8216cf nvmem: brcm_nvram: Use kzalloc for allocating only one element)
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 (bb3c64f6a017 bus: mhi: host: Fix up null pointer access in mhi_irq_handler)
Merging memblock/for-next (8f6e32c6bd09 memblock tests: update reference to obsolete build option in comments)
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 (6c3a9c9ae02a efi/x86-mixed: move unmitigated RET into .rodata)
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 (a37efa83a49a landlock: Document Landlock's file truncation support)
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 kspp/for-next/kspp (1c23f9e627a7 Linux 6.0-rc2)
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 (fddfb0911108 Merge branch 'mm-nonmm-unstable' into mm-everything)
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in mm/vmscan.c
Applying: Revert "mm: reduce noise in show_mem for lowmem allocations"
Applying: Revert "mm-reduce-noise-in-show_mem-for-lowmem-allocations-fix"

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

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

* linux-next: Tree for Aug 26
@ 2021-08-26 10:42 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2021-08-26 10:42 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20210825:

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

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

The bpf-next tree gained a build failure so I used the version from
next-20210825.

The kspp tree gained a conflict against the kbuild tree and a build
failure so I used the version from next-20210825.

Non-merge commits (relative to Linus' tree): 9660
 9291 files changed, 545271 insertions(+), 216584 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 (73f3af7b4611 Merge branch 'akpm' (patches from Andrew))
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 (054bc6a105d7 arm/arm64: dts: Fix remaining dtc 'unit_address_format' warnings)
Merging drivers-memory-fixes/fixes (e73f0f0ee754 Linux 5.14-rc1)
Merging m68k-current/for-linus (21ed49265986 m68k: MAC should select HAVE_PATA_PLATFORM)
Merging powerpc-fixes/fixes (787c70f2f999 powerpc/64s: Fix scv implicit soft-mask table for relocated kernels)
Merging s390-fixes/fixes (2a671f77ee49 s390/pci: fix use after free of zpci_dev)
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 (cd9b50adc6bb net/sched: ets: fix crash when flipping from 'strict' to 'quantum')
Merging bpf/master (5b029a32cfe4 bpf: Fix ringbuf helper function compatibility)
Merging ipsec/master (480e93e12aa0 net: xfrm: Fix end of loop tests for list_for_each_entry)
Merging netfilter/master (e3245a7b7b34 netfilter: nft_ct: protect nft_ct_pcpu_template_refcnt with mutex)
Merging ipvs/master (269fc69533de netfilter: nfnetlink_hook: translate inet ingress to netdev)
Merging wireless-drivers/master (abf3d98dee7c mt76: fix enum type mismatch)
Merging mac80211/master (a8f89fa27773 ice: do not abort devlink info if board identifier can't be found)
Merging rdma-fixes/for-rc (cc4f596cf85e RDMA/rxe: Zero out index member of struct rxe_queue)
Merging sound-current/for-linus (93ab3eafb0b3 ALSA: hda/realtek: Quirk for HP Spectre x360 14 amp setup)
Merging sound-asoc-fixes/for-linus (7dc488712d9f Merge remote-tracking branch 'asoc/for-5.14' into asoc-linus)
Merging regmap-fixes/for-linus (ff1176468d36 Linux 5.14-rc3)
Merging regulator-fixes/for-linus (c1ff86006574 Merge remote-tracking branch 'regulator/for-5.14' into regulator-linus)
Merging spi-fixes/for-linus (651d7bf3536d 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 (e22ce8eb631b Linux 5.14-rc7)
Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6)
Merging usb-serial-fixes/usb-linus (df7b16d1c00e Revert "USB: serial: ch341: fix character loss at high transfer rates")
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 (a5056c0bc24f Merge tag 'iio-fixes-5.14a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
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 (e22ce8eb631b Linux 5.14-rc7)
Merging input-current/for-linus (818b26588994 Merge branch 'next' into for-linus)
Merging crypto-current/master (5261cdf457ce crypto: drbg - select SHA512)
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 (03726fd90f4b 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 (e22ce8eb631b Linux 5.14-rc7)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (6da463bcc215 drm/i915/dp: Drop redundant debug print)
Merging mmc-fixes/fixes (e22ce8eb631b Linux 5.14-rc7)
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 (89abbf642699 checkkconfigsymbols.py: Forbid passing 'HEAD' to --commit)
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)
Merging arc/for-next (a79a9c765f95 ARC: mm: move MMU specific bits out of entry code ...)
Merging arm/for-next (1c9b5911f53b Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (cac313b2a295 Merge branch 'for-next/entry' 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 (4364229fd558 soc: document merges)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/marvell/cn9130-db.dts
Applying: arm64: dts: cn913x: fixup for ("arm/arm64: dts: Fix remaining dtc 'unit_address_format' warnings"
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 (4aa1b095e57e Merge branch 'clk-frac-divider' 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 (eba54cbb92d2 MIPS: mscc: ocelot: mark the phy-mode for internal PHY ports)
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 (94effcedaa54 openrisc: Fix compiler warnings in setup)
Merging parisc-hd/for-next (f5ca3d6901cb parisc: math-emu: Avoid "fmt" macro collision)
Merging powerpc/next (4e08fe92fcb8 Merge branch 'topic/ppc-kvm' into next)
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 (fde9c59aebaf riscv: explicitly use symbol offsets for VDSO)
Merging s390/for-next (7b518758d02c Merge branch 'features' into for-next)
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 (1aee020155f3 um: remove unneeded semicolon in um_arch.c)
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 (7ddfd7955f4d 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 (8bba541556a3 Merge branch 'for-next-next-v5.14-20210823' into for-next-20210823)
Merging ceph/master (a9e6ffbc5b73 ceph: fix possible null-pointer dereference in ceph_mdsmap_decode())
Merging cifs/for-next (77af3f8b5616 cifs: add cifs_common directory to MAINTAINERS file)
Merging cifsd/cifsd-for-next (32e19d12fc7c Merge pull request #69 from namjaejeon/cifsd-for-next)
CONFLICT (content): Merge conflict in fs/Kconfig
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 (9e445093e523 ext4: fix race writing to an inline_data file while its xattrs are changing)
Merging f2fs/dev (fbf883da3618 f2fs: fix to account missing .skipped_gc_rwsem)
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 (76224355db75 fuse: truncate pagecache on atomic_o_trunc)
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 (8197de78f1ad NFSv3: Delete duplicate judgement in nfs3_async_handle_jukebox)
Merging nfsd/nfsd-next (ab1016d39cc0 nfsd: fix NULL dereference in nfs3svc_encode_getaclres)
Merging cel/for-next (7aa6133a15d6 nfsd: fix crash on LOCKT on reexported NFSv3)
Merging ntfs3/master (11e4e66efd44 Merge branch 'torvalds:master' into master)
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 (61e0d0cc51cd xfs: fix perag structure refcounting error when scrub fails)
Merging zonefs/for-next (95b115332a83 zonefs: remove redundant null bio check)
Merging iomap/iomap-for-next (742dd4b8c5bb mm/swap: consider max pages in iomap_swapfile_add_extent)
Merging djw-vfs/vfs-for-next (d03ef4daf33a fs: forbid invalid project ID)
Merging file-locks/locks-next (2949e8427af3 fs: clean up after mandatory file locking support removal)
CONFLICT (content): Merge conflict in fs/nfs/file.c
Merging vfs/for-next (2cfbffc62045 Merge branch 'work.init' into for-next)
Merging printk/for-next (23d8adcf8022 Merge branch 'rework/printk_safe-removal' into for-next)
Merging pci/next (ce3800c7f802 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)
CONFLICT (content): Merge conflict in include/uapi/linux/virtio_ids.h
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 (b51f752c586c hwmon: (dell-smm) Rework SMM function debugging)
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 (4d51a7d02bd1 Merge branch 'pm-domains-fixes' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (05bc63618a5b 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 (e122d7edf1a2 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 (f3cfd136aef0 of: restricted dma: Don't fail device probe on rmem init failure)
CONFLICT (content): Merge conflict in kernel/dma/direct.c
Merging rdma/for-next (f0a64199195e RDMA/hns: Delete unused hns bitmap interface)
Merging net-next/master (e3f30ab28ac8 Merge branch 'pktgen-samples-next')
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
Applying: NET_VENDOR_CIRRUS is not ready for COMPILE_TEST
Merging bpf-next/for-next (0584e965fb25 Merge branch 'bpf: tcp: Allow bpf-tcp-cc to call bpf_(get|set)sockopt')
$ git reset --hard HEAD^
Merging next-20210825 version of bpf-next
Merging ipsec-next/master (5d8dbb7fb82b net: xfrm: fix shift-out-of-bounce)
Merging mlx5-next/mlx5-next (598fe77df855 net/mlx5: Lag, Create shared FDB when in switchdev mode)
Merging netfilter-next/master (7bc416f14716 netfilter: x_tables: handle xt_register_template() returning an error value)
Merging ipvs-next/master (9344988d2979 netfilter: ctnetlink: allow to filter dump by status bits)
Merging wireless-drivers-next/master (609c1308fbc6 hinic: switch from 'pci_' to 'dma_' API)
Merging bluetooth/master (2ac6ae88cdc8 bluetooth: mgmt: Disallow legacy MGMT_OP_READ_LOCAL_OOB_EXT_DATA)
Merging mac80211-next/master (f5a4c24e689f mac80211: introduce individual TWT support in AP mode)
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 (abfc7fad6394 crypto: skcipher - in_irq() cleanup)
Merging drm/drm-next (397ab98e2d69 Merge tag 'drm-msm-next-2021-08-12' of https://gitlab.freedesktop.org/drm/msm 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_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"
Merging drm-misc/for-linux-next (bd7ffbc3ca12 drm/panfrost: Clamp lock region to Bifrost minimum)
Merging amdgpu/drm-next (4c2b33ac5eec 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 (59e4e762a17d gpu: ipu-v3: Fix i.MX IPU-v3 offset calculations for (semi)planar U/V formats)
Merging etnaviv/etnaviv/next (81fd23e2b3cc drm/etnaviv: Implement mmap as GEM object function)
Merging regmap/for-next (cc15156265f0 Merge remote-tracking branch 'regmap/for-5.15' into regmap-next)
Merging sound/for-next (6e41340994e5 ALSA: usb-audio: Move set-interface-first workaround into common quirk)
Merging sound-asoc/for-next (516270ef2f3b Merge remote-tracking branch 'asoc/for-5.15' into asoc-next)
Merging modules/modules-next (ced75a2f5da7 MAINTAINERS: Add Luis Chamberlain as modules maintainer)
Merging input/next (76ba1900cb67 dt-bindings: power: reset: qcom-pon: Convert qcom PON binding to yaml)
Merging block/for-next (f75a126f84e7 Merge branch 'for-5.15/drivers' 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 (f80c8e6864eb mmc: queue: Remove unused parameters(request_queue))
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 (ff1176468d36 Linux 5.14-rc3)
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 (13b11b316f52 dt-bindings: Add vendor prefix for Topic Embedded Systems)
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 (4f197188da66 MAINTAINERS: add entry for polarfire soc mailbox)
Merging spi/for-next (fcda07171274 Merge remote-tracking branch 'spi/for-5.15' into spi-next)
Merging tip/auto-latest (32df9c49c98f Merge branch 'core/debugobjects')
CONFLICT (content): Merge conflict in include/asm-generic/bitops/non-atomic.h
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 (7c7b363d62a5 Merge branch kvm-arm64/pkvm-fixed-features-prologue 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 (1f703d2cf204 KVM: s390: allow facility 192 (vector-packed-decimal-enhancement facility 2))
Merging xen-tip/linux-next (88ca2521bd5b xen/events: Fix race in set_evtchn_to_irq)
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 (0c59e612c0b6 platform/mellanox: mlxbf-pmc: fix kernel-doc notation)
Merging chrome-platform/for-next (a8db7a3f8ac6 platform/chrome: cros_ec_typec: Use existing feature check)
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 (bd1e336aa853 driver core: platform: Remove platform_device_add_properties())
CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c
Merging usb/usb-next (85fb1a27b128 Merge 5.14-rc7 into usb-next)
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 (4e9340bb551a USB: serial: cp210x: determine fw version for CP2105 and CP2108)
Merging usb-chipidea-next/for-usb-next (6e741c2732a8 usb: chipidea: add loop timeout for hw_ep_set_halt())
Merging tty/tty-next (88c1d2478ec8 tty: serial: fsl_lpuart: check dma_tx_in_progress in tx dma callback)
Merging char-misc/char-misc-next (637d0957516e Merge 5.14-rc7 into char-misc-next)
Merging extcon/extcon-next (07de34f5ce1e extcon: max3355: Drop unused include)
Merging phy-next/next (152a810eae03 phy: qcom-qmp: Add support for SM6115 UFS phy)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml
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 (eb24c1007e68 vfio: Remove struct vfio_device_ops open/release)
Merging staging/staging-next (093991aaadf0 staging: r8188eu: Remove empty rtw_mfree_xmit_priv_lock())
CONFLICT (modify/delete): drivers/staging/rtl8188eu/os_dep/os_intfs.c deleted in staging/staging-next and modified in HEAD. Version HEAD 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 staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rtl8188eu/os_dep/ioctl_linux.c left in tree.
CONFLICT (modify/delete): drivers/staging/rtl8188eu/include/osdep_intf.h deleted in staging/staging-next and modified in HEAD. Version HEAD 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/misc/Kconfig
$ 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
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 (42c7ada5aa37 dmaengine: xilinx_dma: Set DMA mask for coherent APIs)
Merging cgroup/for-next (a057486e0fc1 Merge branch 'for-5.15' into for-next)
Merging scsi/for-next (fad336c06aff 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 (98640afa163e vdpa_sim: Use iova_shift() for the size passed to alloc_iova())
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 (37cba6432d88 Merge branch 'ib-rockchip' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into gpio/for-next)
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 (4f125116ffe0 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 (a051b2e56f2a selftests/x86: Fix error: variably modified 'altstack_data' at file scope)
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 (30c10d32152d Merge branch 'for-5.12/cxl' into libnvdimm-for-next)
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 (d56163f65a20 Merge branch 'for-next/overflow' into for-next/kspp)
CONFLICT (content): Merge conflict in Makefile
$ git reset --hard HEAD^
Merging next-20210825 version of kspp
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (0f79ce970e79 gnss: drop stray semicolons)
Merging fsi/next (9ab1428dfe2c fsi/sbefifo: Fix reset timeout)
Merging slimbus/for-next (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)
Applying: drm/i915/ttm: fix up for "lib/scatterlist: Provide a dedicated function to support tableappend"
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 (036a16a39e2f cxl/pci: Fix debug message in cxl_probe_regs())
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: Revert "kbuild: detect objtool changes correctly and remove .SECONDEXPANSION"
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 (96d884eabf74 arch: remove compat_alloc_user_space)

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

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

* Re: linux-next: Tree for Aug 26
  2020-09-10  4:14                   ` Stephen Rothwell
@ 2020-09-10  5:44                     ` Paul E. McKenney
  0 siblings, 0 replies; 24+ messages in thread
From: Paul E. McKenney @ 2020-09-10  5:44 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Anders Roxell, Linux Next Mailing List, Linux Kernel Mailing List

On Thu, Sep 10, 2020 at 02:14:32PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 7 Sep 2020 10:55:47 +0200 Anders Roxell <anders.roxell@linaro.org> wrote:
> >
> > On Thu, 3 Sep 2020 at 18:14, Paul E. McKenney <paulmck@kernel.org> wrote:
> > >
> > > On Thu, Sep 03, 2020 at 10:39:10AM +0200, Anders Roxell wrote:  
> > > > Hi Paul,
> > > >
> > > > On Sat, 29 Aug 2020 at 00:59, Paul E. McKenney <paulmck@kernel.org> wrote:  
> > > > >
> > > > > On Fri, Aug 28, 2020 at 09:24:19PM +0200, Anders Roxell wrote:  
> > > > > > On Fri, 28 Aug 2020 at 15:29, Paul E. McKenney <paulmck@kernel.org> wrote:  
> > > > > > >
> > > > > > > On Fri, Aug 28, 2020 at 09:37:17AM +0200, Anders Roxell wrote:  
> > > > > > > > On Wed, 26 Aug 2020 at 21:39, Paul E. McKenney <paulmck@kernel.org> wrote:  
> > > > > > > > >
> > > > > > > > > On Wed, Aug 26, 2020 at 08:19:01PM +0200, Anders Roxell wrote:  
> > > > > > > > > > On Wed, 26 Aug 2020 at 08:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > > > > > > > >
> > > > > > > > > [ . . . ]
> > > > > > > > >  
> > > > > > > > > > I've built and run an arm64 allmodconfig kernel where I use the
> > > > > > > > > > defconfig as the base, I do this for testing purposes.
> > > > > > > > > > I can see the following call trace [1]:
> > > > > > > > > >
> > > > > > > > > > [ 2595.811453][    T1] Running tests on all trace events:
> > > > > > > > > > [ 2595.860933][    T1] Testing all events:
> > > > > > > > > > [ 4316.066072][    T8] kworker/dying (8) used greatest stack depth:
> > > > > > > > > > 27056 bytes left
> > > > > > > > > > [ 8561.924871][    C0] watchdog: BUG: soft lockup - CPU#0 stuck for
> > > > > > > > > > 22s! [migration/0:14]
> > > > > > > > > > [ 8561.934498][    C0] Modules linked in:
> > > > > > > > > > [ 8561.942303][    C0] irq event stamp: 4044
> > > > > > > > > > [ 8561.949044][    C0] hardirqs last  enabled at (4043):
> > > > > > > > > > [<ffffa000126b530c>] _raw_spin_unlock_irqrestore+0xac/0x138
> > > > > > > > > > [ 8561.960848][    C0] hardirqs last disabled at (4044):
> > > > > > > > > > [<ffffa000126a89f8>] __schedule+0xf8/0x7e0
> > > > > > > > > > [ 8561.971418][    C0] softirqs last  enabled at (3698):
> > > > > > > > > > [<ffffa00010001b04>] __do_softirq+0x524/0x5f8
> > > > > > > > > > [ 8561.982191][    C0] softirqs last disabled at (3689):
> > > > > > > > > > [<ffffa000101216c8>] __irq_exit_rcu+0x128/0x1a0
> > > > > > > > > > [ 8561.993068][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > > > > > > >    W         5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > > > > > > [ 8562.005684][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > > > > > > [ 8562.013247][    C0] pstate: 80400005 (Nzcv daif +PAN -UAO BTYPE=--)
> > > > > > > > > > [ 8562.021657][    C0] pc : arch_local_irq_enable+0x58/0x80
> > > > > > > > > > [ 8562.029323][    C0] lr : _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > > > > [ 8562.036739][    C0] sp : ffff0000698efaa0
> > > > > > > > > > [ 8562.042984][    C0] x29: ffff0000698efaa0 x28: ffff00006ad0f270
> > > > > > > > > > [ 8562.053814][    C0] x27: ffff00006ad0f248 x26: ffff0000698d4718
> > > > > > > > > > [ 8562.064687][    C0] x25: ffff00006ad0e798 x24: ffffa000139e3a40
> > > > > > > > > > [ 8562.075506][    C0] x23: 0000000000000001 x22: ffffa000154f5000
> > > > > > > > > > [ 8562.086425][    C0] x21: ffff00006ad0e798 x20: ffff00006ad0e780
> > > > > > > > > > [ 8562.097255][    C0] x19: ffffa000126a905c x18: 00000000000014c0
> > > > > > > > > > [ 8562.108071][    C0] x17: 0000000000001500 x16: 0000000000001440
> > > > > > > > > > [ 8562.118918][    C0] x15: 00000000f1f1f1f1 x14: 003d090000000000
> > > > > > > > > > [ 8562.129739][    C0] x13: 00003d0900000000 x12: ffff80000d31df41
> > > > > > > > > > [ 8562.140544][    C0] x11: 1fffe0000d31df40 x10: ffff80000d31df40
> > > > > > > > > > [ 8562.151366][    C0] x9 : dfffa00000000000 x8 : ffff0000698efa07
> > > > > > > > > > [ 8562.162247][    C0] x7 : 0000000000000001 x6 : 00007ffff2ce20c0
> > > > > > > > > > [ 8562.173072][    C0] x5 : ffff0000698d4040 x4 : dfffa00000000000
> > > > > > > > > > [ 8562.183954][    C0] x3 : ffffa0001040f904 x2 : 0000000000000007
> > > > > > > > > > [ 8562.194811][    C0] x1 : ffffa00014080000 x0 : 00000000000000e0
> > > > > > > > > > [ 8562.205858][    C0] Call trace:
> > > > > > > > > > [ 8562.211739][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > > > > > > [ 8562.219076][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > > > > [ 8562.226394][    C0]  __schedule+0x75c/0x7e0
> > > > > > > > > > [ 8562.233074][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > > > > > > [ 8562.268210][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > > > > > > [ 8562.275735][    C0]  ftrace_graph_call+0x0/0x4
> > > > > > > > > > [ 8562.282647][    C0]  preempt_count_add+0xc/0x240
> > > > > > > > > > [ 8562.289686][    C0]  schedule+0xe4/0x160
> > > > > > > > > > [ 8562.296187][    C0]  smpboot_thread_fn+0x47c/0x540
> > > > > > > > > > [ 8562.303377][    C0]  kthread+0x23c/0x260
> > > > > > > > > > [ 8562.309906][    C0]  ret_from_fork+0x10/0x18
> > > > > > > > > > [ 8562.316604][    C0] Kernel panic - not syncing: softlockup: hung tasks
> > > > > > > > > > [ 8562.325230][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > > > > > > >    W    L    5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > > > > > > [ 8562.337861][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > > > > > > [ 8562.345374][    C0] Call trace:
> > > > > > > > > > [ 8562.351228][    C0]  dump_backtrace+0x0/0x320
> > > > > > > > > > [ 8562.358070][    C0]  show_stack+0x38/0x60
> > > > > > > > > > [ 8562.364728][    C0]  dump_stack+0x1c0/0x280
> > > > > > > > > > [ 8562.371447][    C0]  panic+0x32c/0x614
> > > > > > > > > > [ 8562.377868][    C0]  watchdog_timer_fn+0x49c/0x560
> > > > > > > > > > [ 8562.385076][    C0]  __run_hrtimer+0x1cc/0x360
> > > > > > > > > > [ 8562.392021][    C0]  __hrtimer_run_queues+0x1a0/0x220
> > > > > > > > > > [ 8562.399500][    C0]  hrtimer_interrupt+0x1f8/0x440
> > > > > > > > > > [ 8562.406807][    C0]  arch_timer_handler_virt+0x68/0xa0
> > > > > > > > > > [ 8562.414338][    C0]  handle_percpu_devid_irq+0x118/0x2a0
> > > > > > > > > > [ 8562.421992][    C0]  __handle_domain_irq+0x150/0x1c0
> > > > > > > > > > [ 8562.429315][    C0]  gic_handle_irq+0x98/0x120
> > > > > > > > > > [ 8562.436297][    C0]  el1_irq+0xd4/0x1c0  
> > > > > > > > >
> > > > > > > > > We appear to have taken an interrupt here, just after releasing
> > > > > > > > > an irq-disabled lock and enabling interrupts.
> > > > > > > > >  
> > > > > > > > > > [ 8562.442748][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > > > > > > [ 8562.450116][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > > > > [ 8562.457360][    C0]  __schedule+0x75c/0x7e0
> > > > > > > > > > [ 8562.464142][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > > > > > > [ 8562.471745][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > > > > > > [ 8562.479195][    C0]  ftrace_graph_call+0x0/0x4
> > > > > > > > > > [ 8562.486159][    C0]  preempt_count_add+0xc/0x240
> > > > > > > > > > [ 8562.493210][    C0]  schedule+0xe4/0x160  
> > > > > > > > >
> > > > > > > > > We are trying to sleep, so we took a pass through the scheduler and
> > > > > > > > > did some tracing.
> > > > > > > > >  
> > > > > > > > > > [ 8562.499737][    C0]  smpboot_thread_fn+0x47c/0x540  
> > > > > > > > >
> > > > > > > > > Here we might be bringing up a CPU?  Except that according to your
> > > > > > > > > dmesg, there is only one CPU.  ("RCU restricting CPUs from NR_CPUS=256
> > > > > > > > > to nr_cpu_ids=1").  So this seems unlikely.
> > > > > > > > >
> > > > > > > > > Huh.  The first dmesg in output-next-20200826.log is instead a
> > > > > > > > > DEBUG_LOCKS_WARN_ON() from lockdep.  Might this be related?  Or do you
> > > > > > > > > also see this warning when boot happens quickly?
> > > > > > > > >
> > > > > > > > > (I do see the soft lockup later on.)
> > > > > > > > >  
> > > > > > > > > > [ 8562.506960][    C0]  kthread+0x23c/0x260
> > > > > > > > > > [ 8562.513496][    C0]  ret_from_fork+0x10/0x18
> > > > > > > > > > [ 8562.521052][    C0] Kernel Offset: disabled
> > > > > > > > > > [ 8562.527725][    C0] CPU features: 0x0240002,20002004
> > > > > > > > > > [ 8562.534950][    C0] Memory Limit: none
> > > > > > > > > > [ 8562.543830][    C0] ---[ end Kernel panic - not syncing:
> > > > > > > > > > softlockup: hung tasks ]---
> > > > > > > > > >
> > > > > > > > > > When I tested to checkout and build e6df9766894d ("Merge remote-tracking branch
> > > > > > > > > > 'irqchip/irq/irqchip-next' into master") that was merged into today's
> > > > > > > > > > tag I was able to
> > > > > > > > > > boot [2]. When I checked out 25e6e115dd1d ("Merge remote-tracking
> > > > > > > > > > branch 'rcu/rcu/next' into master") and built and tested that I was
> > > > > > > > > > able to boot [3] after a
> > > > > > > > > > looong time. To clarify, the rcu merge comes after the irqchip merge.
> > > > > > > > > >
> > > > > > > > > > I also tried to only revert the rcu tree from todays next tag like this:
> > > > > > > > > > "git diff e6df9766894d..25e6e115dd1d | patch -Rp1". When I built that
> > > > > > > > > > I was able to
> > > > > > > > > > boot [4] too.
> > > > > > > > > >
> > > > > > > > > > Any idea what's going on here?  
> > > > > > > > >
> > > > > > > > > Could you please try bisecting the RCU commits?  
> > > > > > > >
> > > > > > > > I did a bisect and found:
> > > > > > > > 3c8e1e3eca23 ("rcu: Always set .need_qs from __rcu_read_lock() for strict GPs")
> > > > > > > >
> > > > > > > > When I reverted that on next-20200826 and on next-20200827 the
> > > > > > > > allmodconfig kernel boots [1], there's other issues that I can see in
> > > > > > > > the log but not this one.  
> > > > > > >
> > > > > > > Thank you for bisecting!
> > > > > > >
> > > > > > > I take it that you have CONFIG_RCU_STRICT_GRACE_PERIOD=y in your .config?  
> > > > > >
> > > > > > Correct.
> > > > > >  
> > > > > > > Ah, you do, according to this line in your dmesg:
> > > > > > >
> > > > > > >         rcu:    RCU strict (and thus non-scalable) grace periods enabled.  
> > > > > >
> > > > > > Yup.
> > > > > >  
> > > > > > >
> > > > > > > And much else besides, serious debugging enabled!  ;-)  
> > > > > >
> > > > > > as you can see from the time it takes to boot it is alot =)
> > > > > >  
> > > > > > >
> > > > > > > Does this reproduce with CONFIG_RCU_STRICT_GRACE_PERIOD=n?  
> > > > > >
> > > > > > I trying that now.
> > > > > >  
> > > > > > > My guess,
> > > > > > > given the commit that your bisection converged on, is that it will not
> > > > > > > reproduce in that case.  
> > > > > >
> > > > > > Your guess was correct, it worked =)  
> > > > >
> > > > > I cannot reproduce this.  I would suggest enabling KASAN, but you have
> > > > > already enabled it.  At this point, I suggest clearing up the other
> > > > > issues.  If this issue remains, please let me know and I will see what
> > > > > additional diagnostics I can provide.  
> > > >
> > > > On tag next-20200902 I see this workqueue lockup [1], does that give
> > > > you any ideas?
> > > > when I disable CONFIG_RCU_STRICT_GRACE_PERIOD it works.  
> > >
> > > Does exactly the same commit as you bisected to last time determine
> > > whether this happens or not?  
> > 
> > Yes it's the exact same commit.
> 
> Has this been fixed?

Here is the situation...

Historically, asynchronous RCU grace periods (call_rcu() rather
than the synchronous synchronize_rcu()) have taken some milliseconds
to complete.  They still do.  I was asked to produce a debugging option
that makes the grace periods much shorter, as in down to 40 microseconds.
This apparently can break things that assume longer call_rcu()-induced
grace periods.  (Things like rcupdate.rcu_expedited and single-CPU
operation have trained the code to expect the occasional very short
grace period from synchronize_rcu().)

If you don't want to help debug these problems, then you should always
always always build with CONFIG_RCU_STRICT_GRACE_PERIOD=n.  I have not
yet set aside time to go look into this particular issue.

Fair enough?

							Thanx, Paul

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

* Re: linux-next: Tree for Aug 26
  2020-09-07  8:55                 ` Anders Roxell
@ 2020-09-10  4:14                   ` Stephen Rothwell
  2020-09-10  5:44                     ` Paul E. McKenney
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2020-09-10  4:14 UTC (permalink / raw)
  To: Anders Roxell; +Cc: paulmck, Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

On Mon, 7 Sep 2020 10:55:47 +0200 Anders Roxell <anders.roxell@linaro.org> wrote:
>
> On Thu, 3 Sep 2020 at 18:14, Paul E. McKenney <paulmck@kernel.org> wrote:
> >
> > On Thu, Sep 03, 2020 at 10:39:10AM +0200, Anders Roxell wrote:  
> > > Hi Paul,
> > >
> > > On Sat, 29 Aug 2020 at 00:59, Paul E. McKenney <paulmck@kernel.org> wrote:  
> > > >
> > > > On Fri, Aug 28, 2020 at 09:24:19PM +0200, Anders Roxell wrote:  
> > > > > On Fri, 28 Aug 2020 at 15:29, Paul E. McKenney <paulmck@kernel.org> wrote:  
> > > > > >
> > > > > > On Fri, Aug 28, 2020 at 09:37:17AM +0200, Anders Roxell wrote:  
> > > > > > > On Wed, 26 Aug 2020 at 21:39, Paul E. McKenney <paulmck@kernel.org> wrote:  
> > > > > > > >
> > > > > > > > On Wed, Aug 26, 2020 at 08:19:01PM +0200, Anders Roxell wrote:  
> > > > > > > > > On Wed, 26 Aug 2020 at 08:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > > > > > > >
> > > > > > > > [ . . . ]
> > > > > > > >  
> > > > > > > > > I've built and run an arm64 allmodconfig kernel where I use the
> > > > > > > > > defconfig as the base, I do this for testing purposes.
> > > > > > > > > I can see the following call trace [1]:
> > > > > > > > >
> > > > > > > > > [ 2595.811453][    T1] Running tests on all trace events:
> > > > > > > > > [ 2595.860933][    T1] Testing all events:
> > > > > > > > > [ 4316.066072][    T8] kworker/dying (8) used greatest stack depth:
> > > > > > > > > 27056 bytes left
> > > > > > > > > [ 8561.924871][    C0] watchdog: BUG: soft lockup - CPU#0 stuck for
> > > > > > > > > 22s! [migration/0:14]
> > > > > > > > > [ 8561.934498][    C0] Modules linked in:
> > > > > > > > > [ 8561.942303][    C0] irq event stamp: 4044
> > > > > > > > > [ 8561.949044][    C0] hardirqs last  enabled at (4043):
> > > > > > > > > [<ffffa000126b530c>] _raw_spin_unlock_irqrestore+0xac/0x138
> > > > > > > > > [ 8561.960848][    C0] hardirqs last disabled at (4044):
> > > > > > > > > [<ffffa000126a89f8>] __schedule+0xf8/0x7e0
> > > > > > > > > [ 8561.971418][    C0] softirqs last  enabled at (3698):
> > > > > > > > > [<ffffa00010001b04>] __do_softirq+0x524/0x5f8
> > > > > > > > > [ 8561.982191][    C0] softirqs last disabled at (3689):
> > > > > > > > > [<ffffa000101216c8>] __irq_exit_rcu+0x128/0x1a0
> > > > > > > > > [ 8561.993068][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > > > > > >    W         5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > > > > > [ 8562.005684][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > > > > > [ 8562.013247][    C0] pstate: 80400005 (Nzcv daif +PAN -UAO BTYPE=--)
> > > > > > > > > [ 8562.021657][    C0] pc : arch_local_irq_enable+0x58/0x80
> > > > > > > > > [ 8562.029323][    C0] lr : _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > > > [ 8562.036739][    C0] sp : ffff0000698efaa0
> > > > > > > > > [ 8562.042984][    C0] x29: ffff0000698efaa0 x28: ffff00006ad0f270
> > > > > > > > > [ 8562.053814][    C0] x27: ffff00006ad0f248 x26: ffff0000698d4718
> > > > > > > > > [ 8562.064687][    C0] x25: ffff00006ad0e798 x24: ffffa000139e3a40
> > > > > > > > > [ 8562.075506][    C0] x23: 0000000000000001 x22: ffffa000154f5000
> > > > > > > > > [ 8562.086425][    C0] x21: ffff00006ad0e798 x20: ffff00006ad0e780
> > > > > > > > > [ 8562.097255][    C0] x19: ffffa000126a905c x18: 00000000000014c0
> > > > > > > > > [ 8562.108071][    C0] x17: 0000000000001500 x16: 0000000000001440
> > > > > > > > > [ 8562.118918][    C0] x15: 00000000f1f1f1f1 x14: 003d090000000000
> > > > > > > > > [ 8562.129739][    C0] x13: 00003d0900000000 x12: ffff80000d31df41
> > > > > > > > > [ 8562.140544][    C0] x11: 1fffe0000d31df40 x10: ffff80000d31df40
> > > > > > > > > [ 8562.151366][    C0] x9 : dfffa00000000000 x8 : ffff0000698efa07
> > > > > > > > > [ 8562.162247][    C0] x7 : 0000000000000001 x6 : 00007ffff2ce20c0
> > > > > > > > > [ 8562.173072][    C0] x5 : ffff0000698d4040 x4 : dfffa00000000000
> > > > > > > > > [ 8562.183954][    C0] x3 : ffffa0001040f904 x2 : 0000000000000007
> > > > > > > > > [ 8562.194811][    C0] x1 : ffffa00014080000 x0 : 00000000000000e0
> > > > > > > > > [ 8562.205858][    C0] Call trace:
> > > > > > > > > [ 8562.211739][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > > > > > [ 8562.219076][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > > > [ 8562.226394][    C0]  __schedule+0x75c/0x7e0
> > > > > > > > > [ 8562.233074][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > > > > > [ 8562.268210][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > > > > > [ 8562.275735][    C0]  ftrace_graph_call+0x0/0x4
> > > > > > > > > [ 8562.282647][    C0]  preempt_count_add+0xc/0x240
> > > > > > > > > [ 8562.289686][    C0]  schedule+0xe4/0x160
> > > > > > > > > [ 8562.296187][    C0]  smpboot_thread_fn+0x47c/0x540
> > > > > > > > > [ 8562.303377][    C0]  kthread+0x23c/0x260
> > > > > > > > > [ 8562.309906][    C0]  ret_from_fork+0x10/0x18
> > > > > > > > > [ 8562.316604][    C0] Kernel panic - not syncing: softlockup: hung tasks
> > > > > > > > > [ 8562.325230][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > > > > > >    W    L    5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > > > > > [ 8562.337861][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > > > > > [ 8562.345374][    C0] Call trace:
> > > > > > > > > [ 8562.351228][    C0]  dump_backtrace+0x0/0x320
> > > > > > > > > [ 8562.358070][    C0]  show_stack+0x38/0x60
> > > > > > > > > [ 8562.364728][    C0]  dump_stack+0x1c0/0x280
> > > > > > > > > [ 8562.371447][    C0]  panic+0x32c/0x614
> > > > > > > > > [ 8562.377868][    C0]  watchdog_timer_fn+0x49c/0x560
> > > > > > > > > [ 8562.385076][    C0]  __run_hrtimer+0x1cc/0x360
> > > > > > > > > [ 8562.392021][    C0]  __hrtimer_run_queues+0x1a0/0x220
> > > > > > > > > [ 8562.399500][    C0]  hrtimer_interrupt+0x1f8/0x440
> > > > > > > > > [ 8562.406807][    C0]  arch_timer_handler_virt+0x68/0xa0
> > > > > > > > > [ 8562.414338][    C0]  handle_percpu_devid_irq+0x118/0x2a0
> > > > > > > > > [ 8562.421992][    C0]  __handle_domain_irq+0x150/0x1c0
> > > > > > > > > [ 8562.429315][    C0]  gic_handle_irq+0x98/0x120
> > > > > > > > > [ 8562.436297][    C0]  el1_irq+0xd4/0x1c0  
> > > > > > > >
> > > > > > > > We appear to have taken an interrupt here, just after releasing
> > > > > > > > an irq-disabled lock and enabling interrupts.
> > > > > > > >  
> > > > > > > > > [ 8562.442748][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > > > > > [ 8562.450116][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > > > [ 8562.457360][    C0]  __schedule+0x75c/0x7e0
> > > > > > > > > [ 8562.464142][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > > > > > [ 8562.471745][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > > > > > [ 8562.479195][    C0]  ftrace_graph_call+0x0/0x4
> > > > > > > > > [ 8562.486159][    C0]  preempt_count_add+0xc/0x240
> > > > > > > > > [ 8562.493210][    C0]  schedule+0xe4/0x160  
> > > > > > > >
> > > > > > > > We are trying to sleep, so we took a pass through the scheduler and
> > > > > > > > did some tracing.
> > > > > > > >  
> > > > > > > > > [ 8562.499737][    C0]  smpboot_thread_fn+0x47c/0x540  
> > > > > > > >
> > > > > > > > Here we might be bringing up a CPU?  Except that according to your
> > > > > > > > dmesg, there is only one CPU.  ("RCU restricting CPUs from NR_CPUS=256
> > > > > > > > to nr_cpu_ids=1").  So this seems unlikely.
> > > > > > > >
> > > > > > > > Huh.  The first dmesg in output-next-20200826.log is instead a
> > > > > > > > DEBUG_LOCKS_WARN_ON() from lockdep.  Might this be related?  Or do you
> > > > > > > > also see this warning when boot happens quickly?
> > > > > > > >
> > > > > > > > (I do see the soft lockup later on.)
> > > > > > > >  
> > > > > > > > > [ 8562.506960][    C0]  kthread+0x23c/0x260
> > > > > > > > > [ 8562.513496][    C0]  ret_from_fork+0x10/0x18
> > > > > > > > > [ 8562.521052][    C0] Kernel Offset: disabled
> > > > > > > > > [ 8562.527725][    C0] CPU features: 0x0240002,20002004
> > > > > > > > > [ 8562.534950][    C0] Memory Limit: none
> > > > > > > > > [ 8562.543830][    C0] ---[ end Kernel panic - not syncing:
> > > > > > > > > softlockup: hung tasks ]---
> > > > > > > > >
> > > > > > > > > When I tested to checkout and build e6df9766894d ("Merge remote-tracking branch
> > > > > > > > > 'irqchip/irq/irqchip-next' into master") that was merged into today's
> > > > > > > > > tag I was able to
> > > > > > > > > boot [2]. When I checked out 25e6e115dd1d ("Merge remote-tracking
> > > > > > > > > branch 'rcu/rcu/next' into master") and built and tested that I was
> > > > > > > > > able to boot [3] after a
> > > > > > > > > looong time. To clarify, the rcu merge comes after the irqchip merge.
> > > > > > > > >
> > > > > > > > > I also tried to only revert the rcu tree from todays next tag like this:
> > > > > > > > > "git diff e6df9766894d..25e6e115dd1d | patch -Rp1". When I built that
> > > > > > > > > I was able to
> > > > > > > > > boot [4] too.
> > > > > > > > >
> > > > > > > > > Any idea what's going on here?  
> > > > > > > >
> > > > > > > > Could you please try bisecting the RCU commits?  
> > > > > > >
> > > > > > > I did a bisect and found:
> > > > > > > 3c8e1e3eca23 ("rcu: Always set .need_qs from __rcu_read_lock() for strict GPs")
> > > > > > >
> > > > > > > When I reverted that on next-20200826 and on next-20200827 the
> > > > > > > allmodconfig kernel boots [1], there's other issues that I can see in
> > > > > > > the log but not this one.  
> > > > > >
> > > > > > Thank you for bisecting!
> > > > > >
> > > > > > I take it that you have CONFIG_RCU_STRICT_GRACE_PERIOD=y in your .config?  
> > > > >
> > > > > Correct.
> > > > >  
> > > > > > Ah, you do, according to this line in your dmesg:
> > > > > >
> > > > > >         rcu:    RCU strict (and thus non-scalable) grace periods enabled.  
> > > > >
> > > > > Yup.
> > > > >  
> > > > > >
> > > > > > And much else besides, serious debugging enabled!  ;-)  
> > > > >
> > > > > as you can see from the time it takes to boot it is alot =)
> > > > >  
> > > > > >
> > > > > > Does this reproduce with CONFIG_RCU_STRICT_GRACE_PERIOD=n?  
> > > > >
> > > > > I trying that now.
> > > > >  
> > > > > > My guess,
> > > > > > given the commit that your bisection converged on, is that it will not
> > > > > > reproduce in that case.  
> > > > >
> > > > > Your guess was correct, it worked =)  
> > > >
> > > > I cannot reproduce this.  I would suggest enabling KASAN, but you have
> > > > already enabled it.  At this point, I suggest clearing up the other
> > > > issues.  If this issue remains, please let me know and I will see what
> > > > additional diagnostics I can provide.  
> > >
> > > On tag next-20200902 I see this workqueue lockup [1], does that give
> > > you any ideas?
> > > when I disable CONFIG_RCU_STRICT_GRACE_PERIOD it works.  
> >
> > Does exactly the same commit as you bisected to last time determine
> > whether this happens or not?  
> 
> Yes it's the exact same commit.

Has this been fixed?

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: Tree for Aug 26
  2020-09-03 16:14               ` Paul E. McKenney
@ 2020-09-07  8:55                 ` Anders Roxell
  2020-09-10  4:14                   ` Stephen Rothwell
  0 siblings, 1 reply; 24+ messages in thread
From: Anders Roxell @ 2020-09-07  8:55 UTC (permalink / raw)
  To: paulmck
  Cc: Stephen Rothwell, Linux Next Mailing List, Linux Kernel Mailing List

On Thu, 3 Sep 2020 at 18:14, Paul E. McKenney <paulmck@kernel.org> wrote:
>
> On Thu, Sep 03, 2020 at 10:39:10AM +0200, Anders Roxell wrote:
> > Hi Paul,
> >
> > On Sat, 29 Aug 2020 at 00:59, Paul E. McKenney <paulmck@kernel.org> wrote:
> > >
> > > On Fri, Aug 28, 2020 at 09:24:19PM +0200, Anders Roxell wrote:
> > > > On Fri, 28 Aug 2020 at 15:29, Paul E. McKenney <paulmck@kernel.org> wrote:
> > > > >
> > > > > On Fri, Aug 28, 2020 at 09:37:17AM +0200, Anders Roxell wrote:
> > > > > > On Wed, 26 Aug 2020 at 21:39, Paul E. McKenney <paulmck@kernel.org> wrote:
> > > > > > >
> > > > > > > On Wed, Aug 26, 2020 at 08:19:01PM +0200, Anders Roxell wrote:
> > > > > > > > On Wed, 26 Aug 2020 at 08:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > > > >
> > > > > > > [ . . . ]
> > > > > > >
> > > > > > > > I've built and run an arm64 allmodconfig kernel where I use the
> > > > > > > > defconfig as the base, I do this for testing purposes.
> > > > > > > > I can see the following call trace [1]:
> > > > > > > >
> > > > > > > > [ 2595.811453][    T1] Running tests on all trace events:
> > > > > > > > [ 2595.860933][    T1] Testing all events:
> > > > > > > > [ 4316.066072][    T8] kworker/dying (8) used greatest stack depth:
> > > > > > > > 27056 bytes left
> > > > > > > > [ 8561.924871][    C0] watchdog: BUG: soft lockup - CPU#0 stuck for
> > > > > > > > 22s! [migration/0:14]
> > > > > > > > [ 8561.934498][    C0] Modules linked in:
> > > > > > > > [ 8561.942303][    C0] irq event stamp: 4044
> > > > > > > > [ 8561.949044][    C0] hardirqs last  enabled at (4043):
> > > > > > > > [<ffffa000126b530c>] _raw_spin_unlock_irqrestore+0xac/0x138
> > > > > > > > [ 8561.960848][    C0] hardirqs last disabled at (4044):
> > > > > > > > [<ffffa000126a89f8>] __schedule+0xf8/0x7e0
> > > > > > > > [ 8561.971418][    C0] softirqs last  enabled at (3698):
> > > > > > > > [<ffffa00010001b04>] __do_softirq+0x524/0x5f8
> > > > > > > > [ 8561.982191][    C0] softirqs last disabled at (3689):
> > > > > > > > [<ffffa000101216c8>] __irq_exit_rcu+0x128/0x1a0
> > > > > > > > [ 8561.993068][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > > > > >    W         5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > > > > [ 8562.005684][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > > > > [ 8562.013247][    C0] pstate: 80400005 (Nzcv daif +PAN -UAO BTYPE=--)
> > > > > > > > [ 8562.021657][    C0] pc : arch_local_irq_enable+0x58/0x80
> > > > > > > > [ 8562.029323][    C0] lr : _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > > [ 8562.036739][    C0] sp : ffff0000698efaa0
> > > > > > > > [ 8562.042984][    C0] x29: ffff0000698efaa0 x28: ffff00006ad0f270
> > > > > > > > [ 8562.053814][    C0] x27: ffff00006ad0f248 x26: ffff0000698d4718
> > > > > > > > [ 8562.064687][    C0] x25: ffff00006ad0e798 x24: ffffa000139e3a40
> > > > > > > > [ 8562.075506][    C0] x23: 0000000000000001 x22: ffffa000154f5000
> > > > > > > > [ 8562.086425][    C0] x21: ffff00006ad0e798 x20: ffff00006ad0e780
> > > > > > > > [ 8562.097255][    C0] x19: ffffa000126a905c x18: 00000000000014c0
> > > > > > > > [ 8562.108071][    C0] x17: 0000000000001500 x16: 0000000000001440
> > > > > > > > [ 8562.118918][    C0] x15: 00000000f1f1f1f1 x14: 003d090000000000
> > > > > > > > [ 8562.129739][    C0] x13: 00003d0900000000 x12: ffff80000d31df41
> > > > > > > > [ 8562.140544][    C0] x11: 1fffe0000d31df40 x10: ffff80000d31df40
> > > > > > > > [ 8562.151366][    C0] x9 : dfffa00000000000 x8 : ffff0000698efa07
> > > > > > > > [ 8562.162247][    C0] x7 : 0000000000000001 x6 : 00007ffff2ce20c0
> > > > > > > > [ 8562.173072][    C0] x5 : ffff0000698d4040 x4 : dfffa00000000000
> > > > > > > > [ 8562.183954][    C0] x3 : ffffa0001040f904 x2 : 0000000000000007
> > > > > > > > [ 8562.194811][    C0] x1 : ffffa00014080000 x0 : 00000000000000e0
> > > > > > > > [ 8562.205858][    C0] Call trace:
> > > > > > > > [ 8562.211739][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > > > > [ 8562.219076][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > > [ 8562.226394][    C0]  __schedule+0x75c/0x7e0
> > > > > > > > [ 8562.233074][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > > > > [ 8562.268210][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > > > > [ 8562.275735][    C0]  ftrace_graph_call+0x0/0x4
> > > > > > > > [ 8562.282647][    C0]  preempt_count_add+0xc/0x240
> > > > > > > > [ 8562.289686][    C0]  schedule+0xe4/0x160
> > > > > > > > [ 8562.296187][    C0]  smpboot_thread_fn+0x47c/0x540
> > > > > > > > [ 8562.303377][    C0]  kthread+0x23c/0x260
> > > > > > > > [ 8562.309906][    C0]  ret_from_fork+0x10/0x18
> > > > > > > > [ 8562.316604][    C0] Kernel panic - not syncing: softlockup: hung tasks
> > > > > > > > [ 8562.325230][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > > > > >    W    L    5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > > > > [ 8562.337861][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > > > > [ 8562.345374][    C0] Call trace:
> > > > > > > > [ 8562.351228][    C0]  dump_backtrace+0x0/0x320
> > > > > > > > [ 8562.358070][    C0]  show_stack+0x38/0x60
> > > > > > > > [ 8562.364728][    C0]  dump_stack+0x1c0/0x280
> > > > > > > > [ 8562.371447][    C0]  panic+0x32c/0x614
> > > > > > > > [ 8562.377868][    C0]  watchdog_timer_fn+0x49c/0x560
> > > > > > > > [ 8562.385076][    C0]  __run_hrtimer+0x1cc/0x360
> > > > > > > > [ 8562.392021][    C0]  __hrtimer_run_queues+0x1a0/0x220
> > > > > > > > [ 8562.399500][    C0]  hrtimer_interrupt+0x1f8/0x440
> > > > > > > > [ 8562.406807][    C0]  arch_timer_handler_virt+0x68/0xa0
> > > > > > > > [ 8562.414338][    C0]  handle_percpu_devid_irq+0x118/0x2a0
> > > > > > > > [ 8562.421992][    C0]  __handle_domain_irq+0x150/0x1c0
> > > > > > > > [ 8562.429315][    C0]  gic_handle_irq+0x98/0x120
> > > > > > > > [ 8562.436297][    C0]  el1_irq+0xd4/0x1c0
> > > > > > >
> > > > > > > We appear to have taken an interrupt here, just after releasing
> > > > > > > an irq-disabled lock and enabling interrupts.
> > > > > > >
> > > > > > > > [ 8562.442748][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > > > > [ 8562.450116][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > > [ 8562.457360][    C0]  __schedule+0x75c/0x7e0
> > > > > > > > [ 8562.464142][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > > > > [ 8562.471745][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > > > > [ 8562.479195][    C0]  ftrace_graph_call+0x0/0x4
> > > > > > > > [ 8562.486159][    C0]  preempt_count_add+0xc/0x240
> > > > > > > > [ 8562.493210][    C0]  schedule+0xe4/0x160
> > > > > > >
> > > > > > > We are trying to sleep, so we took a pass through the scheduler and
> > > > > > > did some tracing.
> > > > > > >
> > > > > > > > [ 8562.499737][    C0]  smpboot_thread_fn+0x47c/0x540
> > > > > > >
> > > > > > > Here we might be bringing up a CPU?  Except that according to your
> > > > > > > dmesg, there is only one CPU.  ("RCU restricting CPUs from NR_CPUS=256
> > > > > > > to nr_cpu_ids=1").  So this seems unlikely.
> > > > > > >
> > > > > > > Huh.  The first dmesg in output-next-20200826.log is instead a
> > > > > > > DEBUG_LOCKS_WARN_ON() from lockdep.  Might this be related?  Or do you
> > > > > > > also see this warning when boot happens quickly?
> > > > > > >
> > > > > > > (I do see the soft lockup later on.)
> > > > > > >
> > > > > > > > [ 8562.506960][    C0]  kthread+0x23c/0x260
> > > > > > > > [ 8562.513496][    C0]  ret_from_fork+0x10/0x18
> > > > > > > > [ 8562.521052][    C0] Kernel Offset: disabled
> > > > > > > > [ 8562.527725][    C0] CPU features: 0x0240002,20002004
> > > > > > > > [ 8562.534950][    C0] Memory Limit: none
> > > > > > > > [ 8562.543830][    C0] ---[ end Kernel panic - not syncing:
> > > > > > > > softlockup: hung tasks ]---
> > > > > > > >
> > > > > > > > When I tested to checkout and build e6df9766894d ("Merge remote-tracking branch
> > > > > > > > 'irqchip/irq/irqchip-next' into master") that was merged into today's
> > > > > > > > tag I was able to
> > > > > > > > boot [2]. When I checked out 25e6e115dd1d ("Merge remote-tracking
> > > > > > > > branch 'rcu/rcu/next' into master") and built and tested that I was
> > > > > > > > able to boot [3] after a
> > > > > > > > looong time. To clarify, the rcu merge comes after the irqchip merge.
> > > > > > > >
> > > > > > > > I also tried to only revert the rcu tree from todays next tag like this:
> > > > > > > > "git diff e6df9766894d..25e6e115dd1d | patch -Rp1". When I built that
> > > > > > > > I was able to
> > > > > > > > boot [4] too.
> > > > > > > >
> > > > > > > > Any idea what's going on here?
> > > > > > >
> > > > > > > Could you please try bisecting the RCU commits?
> > > > > >
> > > > > > I did a bisect and found:
> > > > > > 3c8e1e3eca23 ("rcu: Always set .need_qs from __rcu_read_lock() for strict GPs")
> > > > > >
> > > > > > When I reverted that on next-20200826 and on next-20200827 the
> > > > > > allmodconfig kernel boots [1], there's other issues that I can see in
> > > > > > the log but not this one.
> > > > >
> > > > > Thank you for bisecting!
> > > > >
> > > > > I take it that you have CONFIG_RCU_STRICT_GRACE_PERIOD=y in your .config?
> > > >
> > > > Correct.
> > > >
> > > > > Ah, you do, according to this line in your dmesg:
> > > > >
> > > > >         rcu:    RCU strict (and thus non-scalable) grace periods enabled.
> > > >
> > > > Yup.
> > > >
> > > > >
> > > > > And much else besides, serious debugging enabled!  ;-)
> > > >
> > > > as you can see from the time it takes to boot it is alot =)
> > > >
> > > > >
> > > > > Does this reproduce with CONFIG_RCU_STRICT_GRACE_PERIOD=n?
> > > >
> > > > I trying that now.
> > > >
> > > > > My guess,
> > > > > given the commit that your bisection converged on, is that it will not
> > > > > reproduce in that case.
> > > >
> > > > Your guess was correct, it worked =)
> > >
> > > I cannot reproduce this.  I would suggest enabling KASAN, but you have
> > > already enabled it.  At this point, I suggest clearing up the other
> > > issues.  If this issue remains, please let me know and I will see what
> > > additional diagnostics I can provide.
> >
> > On tag next-20200902 I see this workqueue lockup [1], does that give
> > you any ideas?
> > when I disable CONFIG_RCU_STRICT_GRACE_PERIOD it works.
>
> Does exactly the same commit as you bisected to last time determine
> whether this happens or not?

Yes it's the exact same commit.

Cheers,
Anders

>
>                                                         Thanx, Paul
>
> > Cheers,
> > Anders
> > [1] http://ix.io/2w0B
> >
> > >
> > >                                                         Thanx, Paul
> > >
> > > > Cheers,
> > > > Anders
> > > >
> > > > >
> > > > >                                                         Thanx, Paul
> > > > >
> > > > > > Cheers,
> > > > > > Anders
> > > > > > [1] https://people.linaro.org/~anders.roxell/output-next-20200827-3c8e1e3eca23.log
> > > > > >
> > > > > > >  They are linear,
> > > > > > > extending from 0d23eddbe5d4 ("rcu: Remove KCSAN stubs") to 72cc80705122
> > > > > > > ("rcu: Remove unused "cpu" parameter from rcu_report_qs_rdp()".
> > > > > > >
> > > > > > > I do regularly test single-CPU premptible RCU, but not on ARM.  Nor do
> > > > > > > I normally enable quite this much debug, so I might have missed something.
> > > > > > >
> > > > > > >                                                         Thanx, Paul
> > > > > > >
> > > > > > > > Cheers,
> > > > > > > > Anders
> > > > > > > > [1] https://people.linaro.org/~anders.roxell/output-next-20200826.log
> > > > > > > > [2] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-e6df9766894d.log
> > > > > > > > [3] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-25e6e115dd1d.log
> > > > > > > > [4] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-revert-e6df9766894d-25e6e115dd1d.log

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

* Re: linux-next: Tree for Aug 26
  2020-09-03  8:39             ` Anders Roxell
@ 2020-09-03 16:14               ` Paul E. McKenney
  2020-09-07  8:55                 ` Anders Roxell
  0 siblings, 1 reply; 24+ messages in thread
From: Paul E. McKenney @ 2020-09-03 16:14 UTC (permalink / raw)
  To: Anders Roxell
  Cc: Stephen Rothwell, Linux Next Mailing List, Linux Kernel Mailing List

On Thu, Sep 03, 2020 at 10:39:10AM +0200, Anders Roxell wrote:
> Hi Paul,
> 
> On Sat, 29 Aug 2020 at 00:59, Paul E. McKenney <paulmck@kernel.org> wrote:
> >
> > On Fri, Aug 28, 2020 at 09:24:19PM +0200, Anders Roxell wrote:
> > > On Fri, 28 Aug 2020 at 15:29, Paul E. McKenney <paulmck@kernel.org> wrote:
> > > >
> > > > On Fri, Aug 28, 2020 at 09:37:17AM +0200, Anders Roxell wrote:
> > > > > On Wed, 26 Aug 2020 at 21:39, Paul E. McKenney <paulmck@kernel.org> wrote:
> > > > > >
> > > > > > On Wed, Aug 26, 2020 at 08:19:01PM +0200, Anders Roxell wrote:
> > > > > > > On Wed, 26 Aug 2020 at 08:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > > >
> > > > > > [ . . . ]
> > > > > >
> > > > > > > I've built and run an arm64 allmodconfig kernel where I use the
> > > > > > > defconfig as the base, I do this for testing purposes.
> > > > > > > I can see the following call trace [1]:
> > > > > > >
> > > > > > > [ 2595.811453][    T1] Running tests on all trace events:
> > > > > > > [ 2595.860933][    T1] Testing all events:
> > > > > > > [ 4316.066072][    T8] kworker/dying (8) used greatest stack depth:
> > > > > > > 27056 bytes left
> > > > > > > [ 8561.924871][    C0] watchdog: BUG: soft lockup - CPU#0 stuck for
> > > > > > > 22s! [migration/0:14]
> > > > > > > [ 8561.934498][    C0] Modules linked in:
> > > > > > > [ 8561.942303][    C0] irq event stamp: 4044
> > > > > > > [ 8561.949044][    C0] hardirqs last  enabled at (4043):
> > > > > > > [<ffffa000126b530c>] _raw_spin_unlock_irqrestore+0xac/0x138
> > > > > > > [ 8561.960848][    C0] hardirqs last disabled at (4044):
> > > > > > > [<ffffa000126a89f8>] __schedule+0xf8/0x7e0
> > > > > > > [ 8561.971418][    C0] softirqs last  enabled at (3698):
> > > > > > > [<ffffa00010001b04>] __do_softirq+0x524/0x5f8
> > > > > > > [ 8561.982191][    C0] softirqs last disabled at (3689):
> > > > > > > [<ffffa000101216c8>] __irq_exit_rcu+0x128/0x1a0
> > > > > > > [ 8561.993068][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > > > >    W         5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > > > [ 8562.005684][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > > > [ 8562.013247][    C0] pstate: 80400005 (Nzcv daif +PAN -UAO BTYPE=--)
> > > > > > > [ 8562.021657][    C0] pc : arch_local_irq_enable+0x58/0x80
> > > > > > > [ 8562.029323][    C0] lr : _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > [ 8562.036739][    C0] sp : ffff0000698efaa0
> > > > > > > [ 8562.042984][    C0] x29: ffff0000698efaa0 x28: ffff00006ad0f270
> > > > > > > [ 8562.053814][    C0] x27: ffff00006ad0f248 x26: ffff0000698d4718
> > > > > > > [ 8562.064687][    C0] x25: ffff00006ad0e798 x24: ffffa000139e3a40
> > > > > > > [ 8562.075506][    C0] x23: 0000000000000001 x22: ffffa000154f5000
> > > > > > > [ 8562.086425][    C0] x21: ffff00006ad0e798 x20: ffff00006ad0e780
> > > > > > > [ 8562.097255][    C0] x19: ffffa000126a905c x18: 00000000000014c0
> > > > > > > [ 8562.108071][    C0] x17: 0000000000001500 x16: 0000000000001440
> > > > > > > [ 8562.118918][    C0] x15: 00000000f1f1f1f1 x14: 003d090000000000
> > > > > > > [ 8562.129739][    C0] x13: 00003d0900000000 x12: ffff80000d31df41
> > > > > > > [ 8562.140544][    C0] x11: 1fffe0000d31df40 x10: ffff80000d31df40
> > > > > > > [ 8562.151366][    C0] x9 : dfffa00000000000 x8 : ffff0000698efa07
> > > > > > > [ 8562.162247][    C0] x7 : 0000000000000001 x6 : 00007ffff2ce20c0
> > > > > > > [ 8562.173072][    C0] x5 : ffff0000698d4040 x4 : dfffa00000000000
> > > > > > > [ 8562.183954][    C0] x3 : ffffa0001040f904 x2 : 0000000000000007
> > > > > > > [ 8562.194811][    C0] x1 : ffffa00014080000 x0 : 00000000000000e0
> > > > > > > [ 8562.205858][    C0] Call trace:
> > > > > > > [ 8562.211739][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > > > [ 8562.219076][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > [ 8562.226394][    C0]  __schedule+0x75c/0x7e0
> > > > > > > [ 8562.233074][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > > > [ 8562.268210][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > > > [ 8562.275735][    C0]  ftrace_graph_call+0x0/0x4
> > > > > > > [ 8562.282647][    C0]  preempt_count_add+0xc/0x240
> > > > > > > [ 8562.289686][    C0]  schedule+0xe4/0x160
> > > > > > > [ 8562.296187][    C0]  smpboot_thread_fn+0x47c/0x540
> > > > > > > [ 8562.303377][    C0]  kthread+0x23c/0x260
> > > > > > > [ 8562.309906][    C0]  ret_from_fork+0x10/0x18
> > > > > > > [ 8562.316604][    C0] Kernel panic - not syncing: softlockup: hung tasks
> > > > > > > [ 8562.325230][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > > > >    W    L    5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > > > [ 8562.337861][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > > > [ 8562.345374][    C0] Call trace:
> > > > > > > [ 8562.351228][    C0]  dump_backtrace+0x0/0x320
> > > > > > > [ 8562.358070][    C0]  show_stack+0x38/0x60
> > > > > > > [ 8562.364728][    C0]  dump_stack+0x1c0/0x280
> > > > > > > [ 8562.371447][    C0]  panic+0x32c/0x614
> > > > > > > [ 8562.377868][    C0]  watchdog_timer_fn+0x49c/0x560
> > > > > > > [ 8562.385076][    C0]  __run_hrtimer+0x1cc/0x360
> > > > > > > [ 8562.392021][    C0]  __hrtimer_run_queues+0x1a0/0x220
> > > > > > > [ 8562.399500][    C0]  hrtimer_interrupt+0x1f8/0x440
> > > > > > > [ 8562.406807][    C0]  arch_timer_handler_virt+0x68/0xa0
> > > > > > > [ 8562.414338][    C0]  handle_percpu_devid_irq+0x118/0x2a0
> > > > > > > [ 8562.421992][    C0]  __handle_domain_irq+0x150/0x1c0
> > > > > > > [ 8562.429315][    C0]  gic_handle_irq+0x98/0x120
> > > > > > > [ 8562.436297][    C0]  el1_irq+0xd4/0x1c0
> > > > > >
> > > > > > We appear to have taken an interrupt here, just after releasing
> > > > > > an irq-disabled lock and enabling interrupts.
> > > > > >
> > > > > > > [ 8562.442748][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > > > [ 8562.450116][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > > > [ 8562.457360][    C0]  __schedule+0x75c/0x7e0
> > > > > > > [ 8562.464142][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > > > [ 8562.471745][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > > > [ 8562.479195][    C0]  ftrace_graph_call+0x0/0x4
> > > > > > > [ 8562.486159][    C0]  preempt_count_add+0xc/0x240
> > > > > > > [ 8562.493210][    C0]  schedule+0xe4/0x160
> > > > > >
> > > > > > We are trying to sleep, so we took a pass through the scheduler and
> > > > > > did some tracing.
> > > > > >
> > > > > > > [ 8562.499737][    C0]  smpboot_thread_fn+0x47c/0x540
> > > > > >
> > > > > > Here we might be bringing up a CPU?  Except that according to your
> > > > > > dmesg, there is only one CPU.  ("RCU restricting CPUs from NR_CPUS=256
> > > > > > to nr_cpu_ids=1").  So this seems unlikely.
> > > > > >
> > > > > > Huh.  The first dmesg in output-next-20200826.log is instead a
> > > > > > DEBUG_LOCKS_WARN_ON() from lockdep.  Might this be related?  Or do you
> > > > > > also see this warning when boot happens quickly?
> > > > > >
> > > > > > (I do see the soft lockup later on.)
> > > > > >
> > > > > > > [ 8562.506960][    C0]  kthread+0x23c/0x260
> > > > > > > [ 8562.513496][    C0]  ret_from_fork+0x10/0x18
> > > > > > > [ 8562.521052][    C0] Kernel Offset: disabled
> > > > > > > [ 8562.527725][    C0] CPU features: 0x0240002,20002004
> > > > > > > [ 8562.534950][    C0] Memory Limit: none
> > > > > > > [ 8562.543830][    C0] ---[ end Kernel panic - not syncing:
> > > > > > > softlockup: hung tasks ]---
> > > > > > >
> > > > > > > When I tested to checkout and build e6df9766894d ("Merge remote-tracking branch
> > > > > > > 'irqchip/irq/irqchip-next' into master") that was merged into today's
> > > > > > > tag I was able to
> > > > > > > boot [2]. When I checked out 25e6e115dd1d ("Merge remote-tracking
> > > > > > > branch 'rcu/rcu/next' into master") and built and tested that I was
> > > > > > > able to boot [3] after a
> > > > > > > looong time. To clarify, the rcu merge comes after the irqchip merge.
> > > > > > >
> > > > > > > I also tried to only revert the rcu tree from todays next tag like this:
> > > > > > > "git diff e6df9766894d..25e6e115dd1d | patch -Rp1". When I built that
> > > > > > > I was able to
> > > > > > > boot [4] too.
> > > > > > >
> > > > > > > Any idea what's going on here?
> > > > > >
> > > > > > Could you please try bisecting the RCU commits?
> > > > >
> > > > > I did a bisect and found:
> > > > > 3c8e1e3eca23 ("rcu: Always set .need_qs from __rcu_read_lock() for strict GPs")
> > > > >
> > > > > When I reverted that on next-20200826 and on next-20200827 the
> > > > > allmodconfig kernel boots [1], there's other issues that I can see in
> > > > > the log but not this one.
> > > >
> > > > Thank you for bisecting!
> > > >
> > > > I take it that you have CONFIG_RCU_STRICT_GRACE_PERIOD=y in your .config?
> > >
> > > Correct.
> > >
> > > > Ah, you do, according to this line in your dmesg:
> > > >
> > > >         rcu:    RCU strict (and thus non-scalable) grace periods enabled.
> > >
> > > Yup.
> > >
> > > >
> > > > And much else besides, serious debugging enabled!  ;-)
> > >
> > > as you can see from the time it takes to boot it is alot =)
> > >
> > > >
> > > > Does this reproduce with CONFIG_RCU_STRICT_GRACE_PERIOD=n?
> > >
> > > I trying that now.
> > >
> > > > My guess,
> > > > given the commit that your bisection converged on, is that it will not
> > > > reproduce in that case.
> > >
> > > Your guess was correct, it worked =)
> >
> > I cannot reproduce this.  I would suggest enabling KASAN, but you have
> > already enabled it.  At this point, I suggest clearing up the other
> > issues.  If this issue remains, please let me know and I will see what
> > additional diagnostics I can provide.
> 
> On tag next-20200902 I see this workqueue lockup [1], does that give
> you any ideas?
> when I disable CONFIG_RCU_STRICT_GRACE_PERIOD it works.

Does exactly the same commit as you bisected to last time determine
whether this happens or not?

							Thanx, Paul

> Cheers,
> Anders
> [1] http://ix.io/2w0B
> 
> >
> >                                                         Thanx, Paul
> >
> > > Cheers,
> > > Anders
> > >
> > > >
> > > >                                                         Thanx, Paul
> > > >
> > > > > Cheers,
> > > > > Anders
> > > > > [1] https://people.linaro.org/~anders.roxell/output-next-20200827-3c8e1e3eca23.log
> > > > >
> > > > > >  They are linear,
> > > > > > extending from 0d23eddbe5d4 ("rcu: Remove KCSAN stubs") to 72cc80705122
> > > > > > ("rcu: Remove unused "cpu" parameter from rcu_report_qs_rdp()".
> > > > > >
> > > > > > I do regularly test single-CPU premptible RCU, but not on ARM.  Nor do
> > > > > > I normally enable quite this much debug, so I might have missed something.
> > > > > >
> > > > > >                                                         Thanx, Paul
> > > > > >
> > > > > > > Cheers,
> > > > > > > Anders
> > > > > > > [1] https://people.linaro.org/~anders.roxell/output-next-20200826.log
> > > > > > > [2] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-e6df9766894d.log
> > > > > > > [3] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-25e6e115dd1d.log
> > > > > > > [4] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-revert-e6df9766894d-25e6e115dd1d.log

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

* Re: linux-next: Tree for Aug 26
  2020-08-28 22:59           ` Paul E. McKenney
@ 2020-09-03  8:39             ` Anders Roxell
  2020-09-03 16:14               ` Paul E. McKenney
  0 siblings, 1 reply; 24+ messages in thread
From: Anders Roxell @ 2020-09-03  8:39 UTC (permalink / raw)
  To: paulmck
  Cc: Stephen Rothwell, Linux Next Mailing List, Linux Kernel Mailing List

Hi Paul,

On Sat, 29 Aug 2020 at 00:59, Paul E. McKenney <paulmck@kernel.org> wrote:
>
> On Fri, Aug 28, 2020 at 09:24:19PM +0200, Anders Roxell wrote:
> > On Fri, 28 Aug 2020 at 15:29, Paul E. McKenney <paulmck@kernel.org> wrote:
> > >
> > > On Fri, Aug 28, 2020 at 09:37:17AM +0200, Anders Roxell wrote:
> > > > On Wed, 26 Aug 2020 at 21:39, Paul E. McKenney <paulmck@kernel.org> wrote:
> > > > >
> > > > > On Wed, Aug 26, 2020 at 08:19:01PM +0200, Anders Roxell wrote:
> > > > > > On Wed, 26 Aug 2020 at 08:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > > >
> > > > > [ . . . ]
> > > > >
> > > > > > I've built and run an arm64 allmodconfig kernel where I use the
> > > > > > defconfig as the base, I do this for testing purposes.
> > > > > > I can see the following call trace [1]:
> > > > > >
> > > > > > [ 2595.811453][    T1] Running tests on all trace events:
> > > > > > [ 2595.860933][    T1] Testing all events:
> > > > > > [ 4316.066072][    T8] kworker/dying (8) used greatest stack depth:
> > > > > > 27056 bytes left
> > > > > > [ 8561.924871][    C0] watchdog: BUG: soft lockup - CPU#0 stuck for
> > > > > > 22s! [migration/0:14]
> > > > > > [ 8561.934498][    C0] Modules linked in:
> > > > > > [ 8561.942303][    C0] irq event stamp: 4044
> > > > > > [ 8561.949044][    C0] hardirqs last  enabled at (4043):
> > > > > > [<ffffa000126b530c>] _raw_spin_unlock_irqrestore+0xac/0x138
> > > > > > [ 8561.960848][    C0] hardirqs last disabled at (4044):
> > > > > > [<ffffa000126a89f8>] __schedule+0xf8/0x7e0
> > > > > > [ 8561.971418][    C0] softirqs last  enabled at (3698):
> > > > > > [<ffffa00010001b04>] __do_softirq+0x524/0x5f8
> > > > > > [ 8561.982191][    C0] softirqs last disabled at (3689):
> > > > > > [<ffffa000101216c8>] __irq_exit_rcu+0x128/0x1a0
> > > > > > [ 8561.993068][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > > >    W         5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > > [ 8562.005684][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > > [ 8562.013247][    C0] pstate: 80400005 (Nzcv daif +PAN -UAO BTYPE=--)
> > > > > > [ 8562.021657][    C0] pc : arch_local_irq_enable+0x58/0x80
> > > > > > [ 8562.029323][    C0] lr : _raw_spin_unlock_irq+0x84/0xc0
> > > > > > [ 8562.036739][    C0] sp : ffff0000698efaa0
> > > > > > [ 8562.042984][    C0] x29: ffff0000698efaa0 x28: ffff00006ad0f270
> > > > > > [ 8562.053814][    C0] x27: ffff00006ad0f248 x26: ffff0000698d4718
> > > > > > [ 8562.064687][    C0] x25: ffff00006ad0e798 x24: ffffa000139e3a40
> > > > > > [ 8562.075506][    C0] x23: 0000000000000001 x22: ffffa000154f5000
> > > > > > [ 8562.086425][    C0] x21: ffff00006ad0e798 x20: ffff00006ad0e780
> > > > > > [ 8562.097255][    C0] x19: ffffa000126a905c x18: 00000000000014c0
> > > > > > [ 8562.108071][    C0] x17: 0000000000001500 x16: 0000000000001440
> > > > > > [ 8562.118918][    C0] x15: 00000000f1f1f1f1 x14: 003d090000000000
> > > > > > [ 8562.129739][    C0] x13: 00003d0900000000 x12: ffff80000d31df41
> > > > > > [ 8562.140544][    C0] x11: 1fffe0000d31df40 x10: ffff80000d31df40
> > > > > > [ 8562.151366][    C0] x9 : dfffa00000000000 x8 : ffff0000698efa07
> > > > > > [ 8562.162247][    C0] x7 : 0000000000000001 x6 : 00007ffff2ce20c0
> > > > > > [ 8562.173072][    C0] x5 : ffff0000698d4040 x4 : dfffa00000000000
> > > > > > [ 8562.183954][    C0] x3 : ffffa0001040f904 x2 : 0000000000000007
> > > > > > [ 8562.194811][    C0] x1 : ffffa00014080000 x0 : 00000000000000e0
> > > > > > [ 8562.205858][    C0] Call trace:
> > > > > > [ 8562.211739][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > > [ 8562.219076][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > > [ 8562.226394][    C0]  __schedule+0x75c/0x7e0
> > > > > > [ 8562.233074][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > > [ 8562.268210][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > > [ 8562.275735][    C0]  ftrace_graph_call+0x0/0x4
> > > > > > [ 8562.282647][    C0]  preempt_count_add+0xc/0x240
> > > > > > [ 8562.289686][    C0]  schedule+0xe4/0x160
> > > > > > [ 8562.296187][    C0]  smpboot_thread_fn+0x47c/0x540
> > > > > > [ 8562.303377][    C0]  kthread+0x23c/0x260
> > > > > > [ 8562.309906][    C0]  ret_from_fork+0x10/0x18
> > > > > > [ 8562.316604][    C0] Kernel panic - not syncing: softlockup: hung tasks
> > > > > > [ 8562.325230][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > > >    W    L    5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > > [ 8562.337861][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > > [ 8562.345374][    C0] Call trace:
> > > > > > [ 8562.351228][    C0]  dump_backtrace+0x0/0x320
> > > > > > [ 8562.358070][    C0]  show_stack+0x38/0x60
> > > > > > [ 8562.364728][    C0]  dump_stack+0x1c0/0x280
> > > > > > [ 8562.371447][    C0]  panic+0x32c/0x614
> > > > > > [ 8562.377868][    C0]  watchdog_timer_fn+0x49c/0x560
> > > > > > [ 8562.385076][    C0]  __run_hrtimer+0x1cc/0x360
> > > > > > [ 8562.392021][    C0]  __hrtimer_run_queues+0x1a0/0x220
> > > > > > [ 8562.399500][    C0]  hrtimer_interrupt+0x1f8/0x440
> > > > > > [ 8562.406807][    C0]  arch_timer_handler_virt+0x68/0xa0
> > > > > > [ 8562.414338][    C0]  handle_percpu_devid_irq+0x118/0x2a0
> > > > > > [ 8562.421992][    C0]  __handle_domain_irq+0x150/0x1c0
> > > > > > [ 8562.429315][    C0]  gic_handle_irq+0x98/0x120
> > > > > > [ 8562.436297][    C0]  el1_irq+0xd4/0x1c0
> > > > >
> > > > > We appear to have taken an interrupt here, just after releasing
> > > > > an irq-disabled lock and enabling interrupts.
> > > > >
> > > > > > [ 8562.442748][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > > [ 8562.450116][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > > [ 8562.457360][    C0]  __schedule+0x75c/0x7e0
> > > > > > [ 8562.464142][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > > [ 8562.471745][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > > [ 8562.479195][    C0]  ftrace_graph_call+0x0/0x4
> > > > > > [ 8562.486159][    C0]  preempt_count_add+0xc/0x240
> > > > > > [ 8562.493210][    C0]  schedule+0xe4/0x160
> > > > >
> > > > > We are trying to sleep, so we took a pass through the scheduler and
> > > > > did some tracing.
> > > > >
> > > > > > [ 8562.499737][    C0]  smpboot_thread_fn+0x47c/0x540
> > > > >
> > > > > Here we might be bringing up a CPU?  Except that according to your
> > > > > dmesg, there is only one CPU.  ("RCU restricting CPUs from NR_CPUS=256
> > > > > to nr_cpu_ids=1").  So this seems unlikely.
> > > > >
> > > > > Huh.  The first dmesg in output-next-20200826.log is instead a
> > > > > DEBUG_LOCKS_WARN_ON() from lockdep.  Might this be related?  Or do you
> > > > > also see this warning when boot happens quickly?
> > > > >
> > > > > (I do see the soft lockup later on.)
> > > > >
> > > > > > [ 8562.506960][    C0]  kthread+0x23c/0x260
> > > > > > [ 8562.513496][    C0]  ret_from_fork+0x10/0x18
> > > > > > [ 8562.521052][    C0] Kernel Offset: disabled
> > > > > > [ 8562.527725][    C0] CPU features: 0x0240002,20002004
> > > > > > [ 8562.534950][    C0] Memory Limit: none
> > > > > > [ 8562.543830][    C0] ---[ end Kernel panic - not syncing:
> > > > > > softlockup: hung tasks ]---
> > > > > >
> > > > > > When I tested to checkout and build e6df9766894d ("Merge remote-tracking branch
> > > > > > 'irqchip/irq/irqchip-next' into master") that was merged into today's
> > > > > > tag I was able to
> > > > > > boot [2]. When I checked out 25e6e115dd1d ("Merge remote-tracking
> > > > > > branch 'rcu/rcu/next' into master") and built and tested that I was
> > > > > > able to boot [3] after a
> > > > > > looong time. To clarify, the rcu merge comes after the irqchip merge.
> > > > > >
> > > > > > I also tried to only revert the rcu tree from todays next tag like this:
> > > > > > "git diff e6df9766894d..25e6e115dd1d | patch -Rp1". When I built that
> > > > > > I was able to
> > > > > > boot [4] too.
> > > > > >
> > > > > > Any idea what's going on here?
> > > > >
> > > > > Could you please try bisecting the RCU commits?
> > > >
> > > > I did a bisect and found:
> > > > 3c8e1e3eca23 ("rcu: Always set .need_qs from __rcu_read_lock() for strict GPs")
> > > >
> > > > When I reverted that on next-20200826 and on next-20200827 the
> > > > allmodconfig kernel boots [1], there's other issues that I can see in
> > > > the log but not this one.
> > >
> > > Thank you for bisecting!
> > >
> > > I take it that you have CONFIG_RCU_STRICT_GRACE_PERIOD=y in your .config?
> >
> > Correct.
> >
> > > Ah, you do, according to this line in your dmesg:
> > >
> > >         rcu:    RCU strict (and thus non-scalable) grace periods enabled.
> >
> > Yup.
> >
> > >
> > > And much else besides, serious debugging enabled!  ;-)
> >
> > as you can see from the time it takes to boot it is alot =)
> >
> > >
> > > Does this reproduce with CONFIG_RCU_STRICT_GRACE_PERIOD=n?
> >
> > I trying that now.
> >
> > > My guess,
> > > given the commit that your bisection converged on, is that it will not
> > > reproduce in that case.
> >
> > Your guess was correct, it worked =)
>
> I cannot reproduce this.  I would suggest enabling KASAN, but you have
> already enabled it.  At this point, I suggest clearing up the other
> issues.  If this issue remains, please let me know and I will see what
> additional diagnostics I can provide.

On tag next-20200902 I see this workqueue lockup [1], does that give
you any ideas?
when I disable CONFIG_RCU_STRICT_GRACE_PERIOD it works.

Cheers,
Anders
[1] http://ix.io/2w0B

>
>                                                         Thanx, Paul
>
> > Cheers,
> > Anders
> >
> > >
> > >                                                         Thanx, Paul
> > >
> > > > Cheers,
> > > > Anders
> > > > [1] https://people.linaro.org/~anders.roxell/output-next-20200827-3c8e1e3eca23.log
> > > >
> > > > >  They are linear,
> > > > > extending from 0d23eddbe5d4 ("rcu: Remove KCSAN stubs") to 72cc80705122
> > > > > ("rcu: Remove unused "cpu" parameter from rcu_report_qs_rdp()".
> > > > >
> > > > > I do regularly test single-CPU premptible RCU, but not on ARM.  Nor do
> > > > > I normally enable quite this much debug, so I might have missed something.
> > > > >
> > > > >                                                         Thanx, Paul
> > > > >
> > > > > > Cheers,
> > > > > > Anders
> > > > > > [1] https://people.linaro.org/~anders.roxell/output-next-20200826.log
> > > > > > [2] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-e6df9766894d.log
> > > > > > [3] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-25e6e115dd1d.log
> > > > > > [4] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-revert-e6df9766894d-25e6e115dd1d.log

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

* Re: linux-next: Tree for Aug 26
  2020-08-28 19:24         ` Anders Roxell
@ 2020-08-28 22:59           ` Paul E. McKenney
  2020-09-03  8:39             ` Anders Roxell
  0 siblings, 1 reply; 24+ messages in thread
From: Paul E. McKenney @ 2020-08-28 22:59 UTC (permalink / raw)
  To: Anders Roxell
  Cc: Stephen Rothwell, Linux Next Mailing List, Linux Kernel Mailing List

On Fri, Aug 28, 2020 at 09:24:19PM +0200, Anders Roxell wrote:
> On Fri, 28 Aug 2020 at 15:29, Paul E. McKenney <paulmck@kernel.org> wrote:
> >
> > On Fri, Aug 28, 2020 at 09:37:17AM +0200, Anders Roxell wrote:
> > > On Wed, 26 Aug 2020 at 21:39, Paul E. McKenney <paulmck@kernel.org> wrote:
> > > >
> > > > On Wed, Aug 26, 2020 at 08:19:01PM +0200, Anders Roxell wrote:
> > > > > On Wed, 26 Aug 2020 at 08:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > [ . . . ]
> > > >
> > > > > I've built and run an arm64 allmodconfig kernel where I use the
> > > > > defconfig as the base, I do this for testing purposes.
> > > > > I can see the following call trace [1]:
> > > > >
> > > > > [ 2595.811453][    T1] Running tests on all trace events:
> > > > > [ 2595.860933][    T1] Testing all events:
> > > > > [ 4316.066072][    T8] kworker/dying (8) used greatest stack depth:
> > > > > 27056 bytes left
> > > > > [ 8561.924871][    C0] watchdog: BUG: soft lockup - CPU#0 stuck for
> > > > > 22s! [migration/0:14]
> > > > > [ 8561.934498][    C0] Modules linked in:
> > > > > [ 8561.942303][    C0] irq event stamp: 4044
> > > > > [ 8561.949044][    C0] hardirqs last  enabled at (4043):
> > > > > [<ffffa000126b530c>] _raw_spin_unlock_irqrestore+0xac/0x138
> > > > > [ 8561.960848][    C0] hardirqs last disabled at (4044):
> > > > > [<ffffa000126a89f8>] __schedule+0xf8/0x7e0
> > > > > [ 8561.971418][    C0] softirqs last  enabled at (3698):
> > > > > [<ffffa00010001b04>] __do_softirq+0x524/0x5f8
> > > > > [ 8561.982191][    C0] softirqs last disabled at (3689):
> > > > > [<ffffa000101216c8>] __irq_exit_rcu+0x128/0x1a0
> > > > > [ 8561.993068][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > >    W         5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > [ 8562.005684][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > [ 8562.013247][    C0] pstate: 80400005 (Nzcv daif +PAN -UAO BTYPE=--)
> > > > > [ 8562.021657][    C0] pc : arch_local_irq_enable+0x58/0x80
> > > > > [ 8562.029323][    C0] lr : _raw_spin_unlock_irq+0x84/0xc0
> > > > > [ 8562.036739][    C0] sp : ffff0000698efaa0
> > > > > [ 8562.042984][    C0] x29: ffff0000698efaa0 x28: ffff00006ad0f270
> > > > > [ 8562.053814][    C0] x27: ffff00006ad0f248 x26: ffff0000698d4718
> > > > > [ 8562.064687][    C0] x25: ffff00006ad0e798 x24: ffffa000139e3a40
> > > > > [ 8562.075506][    C0] x23: 0000000000000001 x22: ffffa000154f5000
> > > > > [ 8562.086425][    C0] x21: ffff00006ad0e798 x20: ffff00006ad0e780
> > > > > [ 8562.097255][    C0] x19: ffffa000126a905c x18: 00000000000014c0
> > > > > [ 8562.108071][    C0] x17: 0000000000001500 x16: 0000000000001440
> > > > > [ 8562.118918][    C0] x15: 00000000f1f1f1f1 x14: 003d090000000000
> > > > > [ 8562.129739][    C0] x13: 00003d0900000000 x12: ffff80000d31df41
> > > > > [ 8562.140544][    C0] x11: 1fffe0000d31df40 x10: ffff80000d31df40
> > > > > [ 8562.151366][    C0] x9 : dfffa00000000000 x8 : ffff0000698efa07
> > > > > [ 8562.162247][    C0] x7 : 0000000000000001 x6 : 00007ffff2ce20c0
> > > > > [ 8562.173072][    C0] x5 : ffff0000698d4040 x4 : dfffa00000000000
> > > > > [ 8562.183954][    C0] x3 : ffffa0001040f904 x2 : 0000000000000007
> > > > > [ 8562.194811][    C0] x1 : ffffa00014080000 x0 : 00000000000000e0
> > > > > [ 8562.205858][    C0] Call trace:
> > > > > [ 8562.211739][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > [ 8562.219076][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > [ 8562.226394][    C0]  __schedule+0x75c/0x7e0
> > > > > [ 8562.233074][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > [ 8562.268210][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > [ 8562.275735][    C0]  ftrace_graph_call+0x0/0x4
> > > > > [ 8562.282647][    C0]  preempt_count_add+0xc/0x240
> > > > > [ 8562.289686][    C0]  schedule+0xe4/0x160
> > > > > [ 8562.296187][    C0]  smpboot_thread_fn+0x47c/0x540
> > > > > [ 8562.303377][    C0]  kthread+0x23c/0x260
> > > > > [ 8562.309906][    C0]  ret_from_fork+0x10/0x18
> > > > > [ 8562.316604][    C0] Kernel panic - not syncing: softlockup: hung tasks
> > > > > [ 8562.325230][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > > >    W    L    5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > > [ 8562.337861][    C0] Hardware name: linux,dummy-virt (DT)
> > > > > [ 8562.345374][    C0] Call trace:
> > > > > [ 8562.351228][    C0]  dump_backtrace+0x0/0x320
> > > > > [ 8562.358070][    C0]  show_stack+0x38/0x60
> > > > > [ 8562.364728][    C0]  dump_stack+0x1c0/0x280
> > > > > [ 8562.371447][    C0]  panic+0x32c/0x614
> > > > > [ 8562.377868][    C0]  watchdog_timer_fn+0x49c/0x560
> > > > > [ 8562.385076][    C0]  __run_hrtimer+0x1cc/0x360
> > > > > [ 8562.392021][    C0]  __hrtimer_run_queues+0x1a0/0x220
> > > > > [ 8562.399500][    C0]  hrtimer_interrupt+0x1f8/0x440
> > > > > [ 8562.406807][    C0]  arch_timer_handler_virt+0x68/0xa0
> > > > > [ 8562.414338][    C0]  handle_percpu_devid_irq+0x118/0x2a0
> > > > > [ 8562.421992][    C0]  __handle_domain_irq+0x150/0x1c0
> > > > > [ 8562.429315][    C0]  gic_handle_irq+0x98/0x120
> > > > > [ 8562.436297][    C0]  el1_irq+0xd4/0x1c0
> > > >
> > > > We appear to have taken an interrupt here, just after releasing
> > > > an irq-disabled lock and enabling interrupts.
> > > >
> > > > > [ 8562.442748][    C0]  arch_local_irq_enable+0x58/0x80
> > > > > [ 8562.450116][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > > [ 8562.457360][    C0]  __schedule+0x75c/0x7e0
> > > > > [ 8562.464142][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > > [ 8562.471745][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > > [ 8562.479195][    C0]  ftrace_graph_call+0x0/0x4
> > > > > [ 8562.486159][    C0]  preempt_count_add+0xc/0x240
> > > > > [ 8562.493210][    C0]  schedule+0xe4/0x160
> > > >
> > > > We are trying to sleep, so we took a pass through the scheduler and
> > > > did some tracing.
> > > >
> > > > > [ 8562.499737][    C0]  smpboot_thread_fn+0x47c/0x540
> > > >
> > > > Here we might be bringing up a CPU?  Except that according to your
> > > > dmesg, there is only one CPU.  ("RCU restricting CPUs from NR_CPUS=256
> > > > to nr_cpu_ids=1").  So this seems unlikely.
> > > >
> > > > Huh.  The first dmesg in output-next-20200826.log is instead a
> > > > DEBUG_LOCKS_WARN_ON() from lockdep.  Might this be related?  Or do you
> > > > also see this warning when boot happens quickly?
> > > >
> > > > (I do see the soft lockup later on.)
> > > >
> > > > > [ 8562.506960][    C0]  kthread+0x23c/0x260
> > > > > [ 8562.513496][    C0]  ret_from_fork+0x10/0x18
> > > > > [ 8562.521052][    C0] Kernel Offset: disabled
> > > > > [ 8562.527725][    C0] CPU features: 0x0240002,20002004
> > > > > [ 8562.534950][    C0] Memory Limit: none
> > > > > [ 8562.543830][    C0] ---[ end Kernel panic - not syncing:
> > > > > softlockup: hung tasks ]---
> > > > >
> > > > > When I tested to checkout and build e6df9766894d ("Merge remote-tracking branch
> > > > > 'irqchip/irq/irqchip-next' into master") that was merged into today's
> > > > > tag I was able to
> > > > > boot [2]. When I checked out 25e6e115dd1d ("Merge remote-tracking
> > > > > branch 'rcu/rcu/next' into master") and built and tested that I was
> > > > > able to boot [3] after a
> > > > > looong time. To clarify, the rcu merge comes after the irqchip merge.
> > > > >
> > > > > I also tried to only revert the rcu tree from todays next tag like this:
> > > > > "git diff e6df9766894d..25e6e115dd1d | patch -Rp1". When I built that
> > > > > I was able to
> > > > > boot [4] too.
> > > > >
> > > > > Any idea what's going on here?
> > > >
> > > > Could you please try bisecting the RCU commits?
> > >
> > > I did a bisect and found:
> > > 3c8e1e3eca23 ("rcu: Always set .need_qs from __rcu_read_lock() for strict GPs")
> > >
> > > When I reverted that on next-20200826 and on next-20200827 the
> > > allmodconfig kernel boots [1], there's other issues that I can see in
> > > the log but not this one.
> >
> > Thank you for bisecting!
> >
> > I take it that you have CONFIG_RCU_STRICT_GRACE_PERIOD=y in your .config?
> 
> Correct.
> 
> > Ah, you do, according to this line in your dmesg:
> >
> >         rcu:    RCU strict (and thus non-scalable) grace periods enabled.
> 
> Yup.
> 
> >
> > And much else besides, serious debugging enabled!  ;-)
> 
> as you can see from the time it takes to boot it is alot =)
> 
> >
> > Does this reproduce with CONFIG_RCU_STRICT_GRACE_PERIOD=n?
> 
> I trying that now.
> 
> > My guess,
> > given the commit that your bisection converged on, is that it will not
> > reproduce in that case.
> 
> Your guess was correct, it worked =)

I cannot reproduce this.  I would suggest enabling KASAN, but you have
already enabled it.  At this point, I suggest clearing up the other
issues.  If this issue remains, please let me know and I will see what
additional diagnostics I can provide.

							Thanx, Paul

> Cheers,
> Anders
> 
> >
> >                                                         Thanx, Paul
> >
> > > Cheers,
> > > Anders
> > > [1] https://people.linaro.org/~anders.roxell/output-next-20200827-3c8e1e3eca23.log
> > >
> > > >  They are linear,
> > > > extending from 0d23eddbe5d4 ("rcu: Remove KCSAN stubs") to 72cc80705122
> > > > ("rcu: Remove unused "cpu" parameter from rcu_report_qs_rdp()".
> > > >
> > > > I do regularly test single-CPU premptible RCU, but not on ARM.  Nor do
> > > > I normally enable quite this much debug, so I might have missed something.
> > > >
> > > >                                                         Thanx, Paul
> > > >
> > > > > Cheers,
> > > > > Anders
> > > > > [1] https://people.linaro.org/~anders.roxell/output-next-20200826.log
> > > > > [2] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-e6df9766894d.log
> > > > > [3] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-25e6e115dd1d.log
> > > > > [4] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-revert-e6df9766894d-25e6e115dd1d.log

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

* Re: linux-next: Tree for Aug 26
  2020-08-28 13:29       ` Paul E. McKenney
@ 2020-08-28 19:24         ` Anders Roxell
  2020-08-28 22:59           ` Paul E. McKenney
  0 siblings, 1 reply; 24+ messages in thread
From: Anders Roxell @ 2020-08-28 19:24 UTC (permalink / raw)
  To: paulmck
  Cc: Stephen Rothwell, Linux Next Mailing List, Linux Kernel Mailing List

On Fri, 28 Aug 2020 at 15:29, Paul E. McKenney <paulmck@kernel.org> wrote:
>
> On Fri, Aug 28, 2020 at 09:37:17AM +0200, Anders Roxell wrote:
> > On Wed, 26 Aug 2020 at 21:39, Paul E. McKenney <paulmck@kernel.org> wrote:
> > >
> > > On Wed, Aug 26, 2020 at 08:19:01PM +0200, Anders Roxell wrote:
> > > > On Wed, 26 Aug 2020 at 08:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > [ . . . ]
> > >
> > > > I've built and run an arm64 allmodconfig kernel where I use the
> > > > defconfig as the base, I do this for testing purposes.
> > > > I can see the following call trace [1]:
> > > >
> > > > [ 2595.811453][    T1] Running tests on all trace events:
> > > > [ 2595.860933][    T1] Testing all events:
> > > > [ 4316.066072][    T8] kworker/dying (8) used greatest stack depth:
> > > > 27056 bytes left
> > > > [ 8561.924871][    C0] watchdog: BUG: soft lockup - CPU#0 stuck for
> > > > 22s! [migration/0:14]
> > > > [ 8561.934498][    C0] Modules linked in:
> > > > [ 8561.942303][    C0] irq event stamp: 4044
> > > > [ 8561.949044][    C0] hardirqs last  enabled at (4043):
> > > > [<ffffa000126b530c>] _raw_spin_unlock_irqrestore+0xac/0x138
> > > > [ 8561.960848][    C0] hardirqs last disabled at (4044):
> > > > [<ffffa000126a89f8>] __schedule+0xf8/0x7e0
> > > > [ 8561.971418][    C0] softirqs last  enabled at (3698):
> > > > [<ffffa00010001b04>] __do_softirq+0x524/0x5f8
> > > > [ 8561.982191][    C0] softirqs last disabled at (3689):
> > > > [<ffffa000101216c8>] __irq_exit_rcu+0x128/0x1a0
> > > > [ 8561.993068][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > >    W         5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > [ 8562.005684][    C0] Hardware name: linux,dummy-virt (DT)
> > > > [ 8562.013247][    C0] pstate: 80400005 (Nzcv daif +PAN -UAO BTYPE=--)
> > > > [ 8562.021657][    C0] pc : arch_local_irq_enable+0x58/0x80
> > > > [ 8562.029323][    C0] lr : _raw_spin_unlock_irq+0x84/0xc0
> > > > [ 8562.036739][    C0] sp : ffff0000698efaa0
> > > > [ 8562.042984][    C0] x29: ffff0000698efaa0 x28: ffff00006ad0f270
> > > > [ 8562.053814][    C0] x27: ffff00006ad0f248 x26: ffff0000698d4718
> > > > [ 8562.064687][    C0] x25: ffff00006ad0e798 x24: ffffa000139e3a40
> > > > [ 8562.075506][    C0] x23: 0000000000000001 x22: ffffa000154f5000
> > > > [ 8562.086425][    C0] x21: ffff00006ad0e798 x20: ffff00006ad0e780
> > > > [ 8562.097255][    C0] x19: ffffa000126a905c x18: 00000000000014c0
> > > > [ 8562.108071][    C0] x17: 0000000000001500 x16: 0000000000001440
> > > > [ 8562.118918][    C0] x15: 00000000f1f1f1f1 x14: 003d090000000000
> > > > [ 8562.129739][    C0] x13: 00003d0900000000 x12: ffff80000d31df41
> > > > [ 8562.140544][    C0] x11: 1fffe0000d31df40 x10: ffff80000d31df40
> > > > [ 8562.151366][    C0] x9 : dfffa00000000000 x8 : ffff0000698efa07
> > > > [ 8562.162247][    C0] x7 : 0000000000000001 x6 : 00007ffff2ce20c0
> > > > [ 8562.173072][    C0] x5 : ffff0000698d4040 x4 : dfffa00000000000
> > > > [ 8562.183954][    C0] x3 : ffffa0001040f904 x2 : 0000000000000007
> > > > [ 8562.194811][    C0] x1 : ffffa00014080000 x0 : 00000000000000e0
> > > > [ 8562.205858][    C0] Call trace:
> > > > [ 8562.211739][    C0]  arch_local_irq_enable+0x58/0x80
> > > > [ 8562.219076][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > [ 8562.226394][    C0]  __schedule+0x75c/0x7e0
> > > > [ 8562.233074][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > [ 8562.268210][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > [ 8562.275735][    C0]  ftrace_graph_call+0x0/0x4
> > > > [ 8562.282647][    C0]  preempt_count_add+0xc/0x240
> > > > [ 8562.289686][    C0]  schedule+0xe4/0x160
> > > > [ 8562.296187][    C0]  smpboot_thread_fn+0x47c/0x540
> > > > [ 8562.303377][    C0]  kthread+0x23c/0x260
> > > > [ 8562.309906][    C0]  ret_from_fork+0x10/0x18
> > > > [ 8562.316604][    C0] Kernel panic - not syncing: softlockup: hung tasks
> > > > [ 8562.325230][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > > >    W    L    5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > > [ 8562.337861][    C0] Hardware name: linux,dummy-virt (DT)
> > > > [ 8562.345374][    C0] Call trace:
> > > > [ 8562.351228][    C0]  dump_backtrace+0x0/0x320
> > > > [ 8562.358070][    C0]  show_stack+0x38/0x60
> > > > [ 8562.364728][    C0]  dump_stack+0x1c0/0x280
> > > > [ 8562.371447][    C0]  panic+0x32c/0x614
> > > > [ 8562.377868][    C0]  watchdog_timer_fn+0x49c/0x560
> > > > [ 8562.385076][    C0]  __run_hrtimer+0x1cc/0x360
> > > > [ 8562.392021][    C0]  __hrtimer_run_queues+0x1a0/0x220
> > > > [ 8562.399500][    C0]  hrtimer_interrupt+0x1f8/0x440
> > > > [ 8562.406807][    C0]  arch_timer_handler_virt+0x68/0xa0
> > > > [ 8562.414338][    C0]  handle_percpu_devid_irq+0x118/0x2a0
> > > > [ 8562.421992][    C0]  __handle_domain_irq+0x150/0x1c0
> > > > [ 8562.429315][    C0]  gic_handle_irq+0x98/0x120
> > > > [ 8562.436297][    C0]  el1_irq+0xd4/0x1c0
> > >
> > > We appear to have taken an interrupt here, just after releasing
> > > an irq-disabled lock and enabling interrupts.
> > >
> > > > [ 8562.442748][    C0]  arch_local_irq_enable+0x58/0x80
> > > > [ 8562.450116][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > > [ 8562.457360][    C0]  __schedule+0x75c/0x7e0
> > > > [ 8562.464142][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > > [ 8562.471745][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > > [ 8562.479195][    C0]  ftrace_graph_call+0x0/0x4
> > > > [ 8562.486159][    C0]  preempt_count_add+0xc/0x240
> > > > [ 8562.493210][    C0]  schedule+0xe4/0x160
> > >
> > > We are trying to sleep, so we took a pass through the scheduler and
> > > did some tracing.
> > >
> > > > [ 8562.499737][    C0]  smpboot_thread_fn+0x47c/0x540
> > >
> > > Here we might be bringing up a CPU?  Except that according to your
> > > dmesg, there is only one CPU.  ("RCU restricting CPUs from NR_CPUS=256
> > > to nr_cpu_ids=1").  So this seems unlikely.
> > >
> > > Huh.  The first dmesg in output-next-20200826.log is instead a
> > > DEBUG_LOCKS_WARN_ON() from lockdep.  Might this be related?  Or do you
> > > also see this warning when boot happens quickly?
> > >
> > > (I do see the soft lockup later on.)
> > >
> > > > [ 8562.506960][    C0]  kthread+0x23c/0x260
> > > > [ 8562.513496][    C0]  ret_from_fork+0x10/0x18
> > > > [ 8562.521052][    C0] Kernel Offset: disabled
> > > > [ 8562.527725][    C0] CPU features: 0x0240002,20002004
> > > > [ 8562.534950][    C0] Memory Limit: none
> > > > [ 8562.543830][    C0] ---[ end Kernel panic - not syncing:
> > > > softlockup: hung tasks ]---
> > > >
> > > > When I tested to checkout and build e6df9766894d ("Merge remote-tracking branch
> > > > 'irqchip/irq/irqchip-next' into master") that was merged into today's
> > > > tag I was able to
> > > > boot [2]. When I checked out 25e6e115dd1d ("Merge remote-tracking
> > > > branch 'rcu/rcu/next' into master") and built and tested that I was
> > > > able to boot [3] after a
> > > > looong time. To clarify, the rcu merge comes after the irqchip merge.
> > > >
> > > > I also tried to only revert the rcu tree from todays next tag like this:
> > > > "git diff e6df9766894d..25e6e115dd1d | patch -Rp1". When I built that
> > > > I was able to
> > > > boot [4] too.
> > > >
> > > > Any idea what's going on here?
> > >
> > > Could you please try bisecting the RCU commits?
> >
> > I did a bisect and found:
> > 3c8e1e3eca23 ("rcu: Always set .need_qs from __rcu_read_lock() for strict GPs")
> >
> > When I reverted that on next-20200826 and on next-20200827 the
> > allmodconfig kernel boots [1], there's other issues that I can see in
> > the log but not this one.
>
> Thank you for bisecting!
>
> I take it that you have CONFIG_RCU_STRICT_GRACE_PERIOD=y in your .config?

Correct.

> Ah, you do, according to this line in your dmesg:
>
>         rcu:    RCU strict (and thus non-scalable) grace periods enabled.

Yup.

>
> And much else besides, serious debugging enabled!  ;-)

as you can see from the time it takes to boot it is alot =)

>
> Does this reproduce with CONFIG_RCU_STRICT_GRACE_PERIOD=n?

I trying that now.

> My guess,
> given the commit that your bisection converged on, is that it will not
> reproduce in that case.

Your guess was correct, it worked =)

Cheers,
Anders

>
>                                                         Thanx, Paul
>
> > Cheers,
> > Anders
> > [1] https://people.linaro.org/~anders.roxell/output-next-20200827-3c8e1e3eca23.log
> >
> > >  They are linear,
> > > extending from 0d23eddbe5d4 ("rcu: Remove KCSAN stubs") to 72cc80705122
> > > ("rcu: Remove unused "cpu" parameter from rcu_report_qs_rdp()".
> > >
> > > I do regularly test single-CPU premptible RCU, but not on ARM.  Nor do
> > > I normally enable quite this much debug, so I might have missed something.
> > >
> > >                                                         Thanx, Paul
> > >
> > > > Cheers,
> > > > Anders
> > > > [1] https://people.linaro.org/~anders.roxell/output-next-20200826.log
> > > > [2] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-e6df9766894d.log
> > > > [3] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-25e6e115dd1d.log
> > > > [4] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-revert-e6df9766894d-25e6e115dd1d.log

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

* Re: linux-next: Tree for Aug 26
  2020-08-28  7:37     ` Anders Roxell
@ 2020-08-28 13:29       ` Paul E. McKenney
  2020-08-28 19:24         ` Anders Roxell
  0 siblings, 1 reply; 24+ messages in thread
From: Paul E. McKenney @ 2020-08-28 13:29 UTC (permalink / raw)
  To: Anders Roxell
  Cc: Stephen Rothwell, Linux Next Mailing List, Linux Kernel Mailing List

On Fri, Aug 28, 2020 at 09:37:17AM +0200, Anders Roxell wrote:
> On Wed, 26 Aug 2020 at 21:39, Paul E. McKenney <paulmck@kernel.org> wrote:
> >
> > On Wed, Aug 26, 2020 at 08:19:01PM +0200, Anders Roxell wrote:
> > > On Wed, 26 Aug 2020 at 08:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > [ . . . ]
> >
> > > I've built and run an arm64 allmodconfig kernel where I use the
> > > defconfig as the base, I do this for testing purposes.
> > > I can see the following call trace [1]:
> > >
> > > [ 2595.811453][    T1] Running tests on all trace events:
> > > [ 2595.860933][    T1] Testing all events:
> > > [ 4316.066072][    T8] kworker/dying (8) used greatest stack depth:
> > > 27056 bytes left
> > > [ 8561.924871][    C0] watchdog: BUG: soft lockup - CPU#0 stuck for
> > > 22s! [migration/0:14]
> > > [ 8561.934498][    C0] Modules linked in:
> > > [ 8561.942303][    C0] irq event stamp: 4044
> > > [ 8561.949044][    C0] hardirqs last  enabled at (4043):
> > > [<ffffa000126b530c>] _raw_spin_unlock_irqrestore+0xac/0x138
> > > [ 8561.960848][    C0] hardirqs last disabled at (4044):
> > > [<ffffa000126a89f8>] __schedule+0xf8/0x7e0
> > > [ 8561.971418][    C0] softirqs last  enabled at (3698):
> > > [<ffffa00010001b04>] __do_softirq+0x524/0x5f8
> > > [ 8561.982191][    C0] softirqs last disabled at (3689):
> > > [<ffffa000101216c8>] __irq_exit_rcu+0x128/0x1a0
> > > [ 8561.993068][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > >    W         5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > [ 8562.005684][    C0] Hardware name: linux,dummy-virt (DT)
> > > [ 8562.013247][    C0] pstate: 80400005 (Nzcv daif +PAN -UAO BTYPE=--)
> > > [ 8562.021657][    C0] pc : arch_local_irq_enable+0x58/0x80
> > > [ 8562.029323][    C0] lr : _raw_spin_unlock_irq+0x84/0xc0
> > > [ 8562.036739][    C0] sp : ffff0000698efaa0
> > > [ 8562.042984][    C0] x29: ffff0000698efaa0 x28: ffff00006ad0f270
> > > [ 8562.053814][    C0] x27: ffff00006ad0f248 x26: ffff0000698d4718
> > > [ 8562.064687][    C0] x25: ffff00006ad0e798 x24: ffffa000139e3a40
> > > [ 8562.075506][    C0] x23: 0000000000000001 x22: ffffa000154f5000
> > > [ 8562.086425][    C0] x21: ffff00006ad0e798 x20: ffff00006ad0e780
> > > [ 8562.097255][    C0] x19: ffffa000126a905c x18: 00000000000014c0
> > > [ 8562.108071][    C0] x17: 0000000000001500 x16: 0000000000001440
> > > [ 8562.118918][    C0] x15: 00000000f1f1f1f1 x14: 003d090000000000
> > > [ 8562.129739][    C0] x13: 00003d0900000000 x12: ffff80000d31df41
> > > [ 8562.140544][    C0] x11: 1fffe0000d31df40 x10: ffff80000d31df40
> > > [ 8562.151366][    C0] x9 : dfffa00000000000 x8 : ffff0000698efa07
> > > [ 8562.162247][    C0] x7 : 0000000000000001 x6 : 00007ffff2ce20c0
> > > [ 8562.173072][    C0] x5 : ffff0000698d4040 x4 : dfffa00000000000
> > > [ 8562.183954][    C0] x3 : ffffa0001040f904 x2 : 0000000000000007
> > > [ 8562.194811][    C0] x1 : ffffa00014080000 x0 : 00000000000000e0
> > > [ 8562.205858][    C0] Call trace:
> > > [ 8562.211739][    C0]  arch_local_irq_enable+0x58/0x80
> > > [ 8562.219076][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > [ 8562.226394][    C0]  __schedule+0x75c/0x7e0
> > > [ 8562.233074][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > [ 8562.268210][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > [ 8562.275735][    C0]  ftrace_graph_call+0x0/0x4
> > > [ 8562.282647][    C0]  preempt_count_add+0xc/0x240
> > > [ 8562.289686][    C0]  schedule+0xe4/0x160
> > > [ 8562.296187][    C0]  smpboot_thread_fn+0x47c/0x540
> > > [ 8562.303377][    C0]  kthread+0x23c/0x260
> > > [ 8562.309906][    C0]  ret_from_fork+0x10/0x18
> > > [ 8562.316604][    C0] Kernel panic - not syncing: softlockup: hung tasks
> > > [ 8562.325230][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> > >    W    L    5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > > [ 8562.337861][    C0] Hardware name: linux,dummy-virt (DT)
> > > [ 8562.345374][    C0] Call trace:
> > > [ 8562.351228][    C0]  dump_backtrace+0x0/0x320
> > > [ 8562.358070][    C0]  show_stack+0x38/0x60
> > > [ 8562.364728][    C0]  dump_stack+0x1c0/0x280
> > > [ 8562.371447][    C0]  panic+0x32c/0x614
> > > [ 8562.377868][    C0]  watchdog_timer_fn+0x49c/0x560
> > > [ 8562.385076][    C0]  __run_hrtimer+0x1cc/0x360
> > > [ 8562.392021][    C0]  __hrtimer_run_queues+0x1a0/0x220
> > > [ 8562.399500][    C0]  hrtimer_interrupt+0x1f8/0x440
> > > [ 8562.406807][    C0]  arch_timer_handler_virt+0x68/0xa0
> > > [ 8562.414338][    C0]  handle_percpu_devid_irq+0x118/0x2a0
> > > [ 8562.421992][    C0]  __handle_domain_irq+0x150/0x1c0
> > > [ 8562.429315][    C0]  gic_handle_irq+0x98/0x120
> > > [ 8562.436297][    C0]  el1_irq+0xd4/0x1c0
> >
> > We appear to have taken an interrupt here, just after releasing
> > an irq-disabled lock and enabling interrupts.
> >
> > > [ 8562.442748][    C0]  arch_local_irq_enable+0x58/0x80
> > > [ 8562.450116][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > > [ 8562.457360][    C0]  __schedule+0x75c/0x7e0
> > > [ 8562.464142][    C0]  preempt_schedule_notrace+0x64/0xc0
> > > [ 8562.471745][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > > [ 8562.479195][    C0]  ftrace_graph_call+0x0/0x4
> > > [ 8562.486159][    C0]  preempt_count_add+0xc/0x240
> > > [ 8562.493210][    C0]  schedule+0xe4/0x160
> >
> > We are trying to sleep, so we took a pass through the scheduler and
> > did some tracing.
> >
> > > [ 8562.499737][    C0]  smpboot_thread_fn+0x47c/0x540
> >
> > Here we might be bringing up a CPU?  Except that according to your
> > dmesg, there is only one CPU.  ("RCU restricting CPUs from NR_CPUS=256
> > to nr_cpu_ids=1").  So this seems unlikely.
> >
> > Huh.  The first dmesg in output-next-20200826.log is instead a
> > DEBUG_LOCKS_WARN_ON() from lockdep.  Might this be related?  Or do you
> > also see this warning when boot happens quickly?
> >
> > (I do see the soft lockup later on.)
> >
> > > [ 8562.506960][    C0]  kthread+0x23c/0x260
> > > [ 8562.513496][    C0]  ret_from_fork+0x10/0x18
> > > [ 8562.521052][    C0] Kernel Offset: disabled
> > > [ 8562.527725][    C0] CPU features: 0x0240002,20002004
> > > [ 8562.534950][    C0] Memory Limit: none
> > > [ 8562.543830][    C0] ---[ end Kernel panic - not syncing:
> > > softlockup: hung tasks ]---
> > >
> > > When I tested to checkout and build e6df9766894d ("Merge remote-tracking branch
> > > 'irqchip/irq/irqchip-next' into master") that was merged into today's
> > > tag I was able to
> > > boot [2]. When I checked out 25e6e115dd1d ("Merge remote-tracking
> > > branch 'rcu/rcu/next' into master") and built and tested that I was
> > > able to boot [3] after a
> > > looong time. To clarify, the rcu merge comes after the irqchip merge.
> > >
> > > I also tried to only revert the rcu tree from todays next tag like this:
> > > "git diff e6df9766894d..25e6e115dd1d | patch -Rp1". When I built that
> > > I was able to
> > > boot [4] too.
> > >
> > > Any idea what's going on here?
> >
> > Could you please try bisecting the RCU commits?
> 
> I did a bisect and found:
> 3c8e1e3eca23 ("rcu: Always set .need_qs from __rcu_read_lock() for strict GPs")
> 
> When I reverted that on next-20200826 and on next-20200827 the
> allmodconfig kernel boots [1], there's other issues that I can see in
> the log but not this one.

Thank you for bisecting!

I take it that you have CONFIG_RCU_STRICT_GRACE_PERIOD=y in your .config?
Ah, you do, according to this line in your dmesg:

	rcu: 	RCU strict (and thus non-scalable) grace periods enabled.

And much else besides, serious debugging enabled!  ;-)

Does this reproduce with CONFIG_RCU_STRICT_GRACE_PERIOD=n?  My guess,
given the commit that your bisection converged on, is that it will not
reproduce in that case.

							Thanx, Paul

> Cheers,
> Anders
> [1] https://people.linaro.org/~anders.roxell/output-next-20200827-3c8e1e3eca23.log
> 
> >  They are linear,
> > extending from 0d23eddbe5d4 ("rcu: Remove KCSAN stubs") to 72cc80705122
> > ("rcu: Remove unused "cpu" parameter from rcu_report_qs_rdp()".
> >
> > I do regularly test single-CPU premptible RCU, but not on ARM.  Nor do
> > I normally enable quite this much debug, so I might have missed something.
> >
> >                                                         Thanx, Paul
> >
> > > Cheers,
> > > Anders
> > > [1] https://people.linaro.org/~anders.roxell/output-next-20200826.log
> > > [2] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-e6df9766894d.log
> > > [3] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-25e6e115dd1d.log
> > > [4] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-revert-e6df9766894d-25e6e115dd1d.log

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

* Re: linux-next: Tree for Aug 26
  2020-08-26 19:39   ` Paul E. McKenney
@ 2020-08-28  7:37     ` Anders Roxell
  2020-08-28 13:29       ` Paul E. McKenney
  0 siblings, 1 reply; 24+ messages in thread
From: Anders Roxell @ 2020-08-28  7:37 UTC (permalink / raw)
  To: paulmck
  Cc: Stephen Rothwell, Linux Next Mailing List, Linux Kernel Mailing List

On Wed, 26 Aug 2020 at 21:39, Paul E. McKenney <paulmck@kernel.org> wrote:
>
> On Wed, Aug 26, 2020 at 08:19:01PM +0200, Anders Roxell wrote:
> > On Wed, 26 Aug 2020 at 08:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> [ . . . ]
>
> > I've built and run an arm64 allmodconfig kernel where I use the
> > defconfig as the base, I do this for testing purposes.
> > I can see the following call trace [1]:
> >
> > [ 2595.811453][    T1] Running tests on all trace events:
> > [ 2595.860933][    T1] Testing all events:
> > [ 4316.066072][    T8] kworker/dying (8) used greatest stack depth:
> > 27056 bytes left
> > [ 8561.924871][    C0] watchdog: BUG: soft lockup - CPU#0 stuck for
> > 22s! [migration/0:14]
> > [ 8561.934498][    C0] Modules linked in:
> > [ 8561.942303][    C0] irq event stamp: 4044
> > [ 8561.949044][    C0] hardirqs last  enabled at (4043):
> > [<ffffa000126b530c>] _raw_spin_unlock_irqrestore+0xac/0x138
> > [ 8561.960848][    C0] hardirqs last disabled at (4044):
> > [<ffffa000126a89f8>] __schedule+0xf8/0x7e0
> > [ 8561.971418][    C0] softirqs last  enabled at (3698):
> > [<ffffa00010001b04>] __do_softirq+0x524/0x5f8
> > [ 8561.982191][    C0] softirqs last disabled at (3689):
> > [<ffffa000101216c8>] __irq_exit_rcu+0x128/0x1a0
> > [ 8561.993068][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> >    W         5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > [ 8562.005684][    C0] Hardware name: linux,dummy-virt (DT)
> > [ 8562.013247][    C0] pstate: 80400005 (Nzcv daif +PAN -UAO BTYPE=--)
> > [ 8562.021657][    C0] pc : arch_local_irq_enable+0x58/0x80
> > [ 8562.029323][    C0] lr : _raw_spin_unlock_irq+0x84/0xc0
> > [ 8562.036739][    C0] sp : ffff0000698efaa0
> > [ 8562.042984][    C0] x29: ffff0000698efaa0 x28: ffff00006ad0f270
> > [ 8562.053814][    C0] x27: ffff00006ad0f248 x26: ffff0000698d4718
> > [ 8562.064687][    C0] x25: ffff00006ad0e798 x24: ffffa000139e3a40
> > [ 8562.075506][    C0] x23: 0000000000000001 x22: ffffa000154f5000
> > [ 8562.086425][    C0] x21: ffff00006ad0e798 x20: ffff00006ad0e780
> > [ 8562.097255][    C0] x19: ffffa000126a905c x18: 00000000000014c0
> > [ 8562.108071][    C0] x17: 0000000000001500 x16: 0000000000001440
> > [ 8562.118918][    C0] x15: 00000000f1f1f1f1 x14: 003d090000000000
> > [ 8562.129739][    C0] x13: 00003d0900000000 x12: ffff80000d31df41
> > [ 8562.140544][    C0] x11: 1fffe0000d31df40 x10: ffff80000d31df40
> > [ 8562.151366][    C0] x9 : dfffa00000000000 x8 : ffff0000698efa07
> > [ 8562.162247][    C0] x7 : 0000000000000001 x6 : 00007ffff2ce20c0
> > [ 8562.173072][    C0] x5 : ffff0000698d4040 x4 : dfffa00000000000
> > [ 8562.183954][    C0] x3 : ffffa0001040f904 x2 : 0000000000000007
> > [ 8562.194811][    C0] x1 : ffffa00014080000 x0 : 00000000000000e0
> > [ 8562.205858][    C0] Call trace:
> > [ 8562.211739][    C0]  arch_local_irq_enable+0x58/0x80
> > [ 8562.219076][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > [ 8562.226394][    C0]  __schedule+0x75c/0x7e0
> > [ 8562.233074][    C0]  preempt_schedule_notrace+0x64/0xc0
> > [ 8562.268210][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > [ 8562.275735][    C0]  ftrace_graph_call+0x0/0x4
> > [ 8562.282647][    C0]  preempt_count_add+0xc/0x240
> > [ 8562.289686][    C0]  schedule+0xe4/0x160
> > [ 8562.296187][    C0]  smpboot_thread_fn+0x47c/0x540
> > [ 8562.303377][    C0]  kthread+0x23c/0x260
> > [ 8562.309906][    C0]  ret_from_fork+0x10/0x18
> > [ 8562.316604][    C0] Kernel panic - not syncing: softlockup: hung tasks
> > [ 8562.325230][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
> >    W    L    5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> > [ 8562.337861][    C0] Hardware name: linux,dummy-virt (DT)
> > [ 8562.345374][    C0] Call trace:
> > [ 8562.351228][    C0]  dump_backtrace+0x0/0x320
> > [ 8562.358070][    C0]  show_stack+0x38/0x60
> > [ 8562.364728][    C0]  dump_stack+0x1c0/0x280
> > [ 8562.371447][    C0]  panic+0x32c/0x614
> > [ 8562.377868][    C0]  watchdog_timer_fn+0x49c/0x560
> > [ 8562.385076][    C0]  __run_hrtimer+0x1cc/0x360
> > [ 8562.392021][    C0]  __hrtimer_run_queues+0x1a0/0x220
> > [ 8562.399500][    C0]  hrtimer_interrupt+0x1f8/0x440
> > [ 8562.406807][    C0]  arch_timer_handler_virt+0x68/0xa0
> > [ 8562.414338][    C0]  handle_percpu_devid_irq+0x118/0x2a0
> > [ 8562.421992][    C0]  __handle_domain_irq+0x150/0x1c0
> > [ 8562.429315][    C0]  gic_handle_irq+0x98/0x120
> > [ 8562.436297][    C0]  el1_irq+0xd4/0x1c0
>
> We appear to have taken an interrupt here, just after releasing
> an irq-disabled lock and enabling interrupts.
>
> > [ 8562.442748][    C0]  arch_local_irq_enable+0x58/0x80
> > [ 8562.450116][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> > [ 8562.457360][    C0]  __schedule+0x75c/0x7e0
> > [ 8562.464142][    C0]  preempt_schedule_notrace+0x64/0xc0
> > [ 8562.471745][    C0]  ftrace_ops_list_func+0x494/0x4e0
> > [ 8562.479195][    C0]  ftrace_graph_call+0x0/0x4
> > [ 8562.486159][    C0]  preempt_count_add+0xc/0x240
> > [ 8562.493210][    C0]  schedule+0xe4/0x160
>
> We are trying to sleep, so we took a pass through the scheduler and
> did some tracing.
>
> > [ 8562.499737][    C0]  smpboot_thread_fn+0x47c/0x540
>
> Here we might be bringing up a CPU?  Except that according to your
> dmesg, there is only one CPU.  ("RCU restricting CPUs from NR_CPUS=256
> to nr_cpu_ids=1").  So this seems unlikely.
>
> Huh.  The first dmesg in output-next-20200826.log is instead a
> DEBUG_LOCKS_WARN_ON() from lockdep.  Might this be related?  Or do you
> also see this warning when boot happens quickly?
>
> (I do see the soft lockup later on.)
>
> > [ 8562.506960][    C0]  kthread+0x23c/0x260
> > [ 8562.513496][    C0]  ret_from_fork+0x10/0x18
> > [ 8562.521052][    C0] Kernel Offset: disabled
> > [ 8562.527725][    C0] CPU features: 0x0240002,20002004
> > [ 8562.534950][    C0] Memory Limit: none
> > [ 8562.543830][    C0] ---[ end Kernel panic - not syncing:
> > softlockup: hung tasks ]---
> >
> > When I tested to checkout and build e6df9766894d ("Merge remote-tracking branch
> > 'irqchip/irq/irqchip-next' into master") that was merged into today's
> > tag I was able to
> > boot [2]. When I checked out 25e6e115dd1d ("Merge remote-tracking
> > branch 'rcu/rcu/next' into master") and built and tested that I was
> > able to boot [3] after a
> > looong time. To clarify, the rcu merge comes after the irqchip merge.
> >
> > I also tried to only revert the rcu tree from todays next tag like this:
> > "git diff e6df9766894d..25e6e115dd1d | patch -Rp1". When I built that
> > I was able to
> > boot [4] too.
> >
> > Any idea what's going on here?
>
> Could you please try bisecting the RCU commits?

I did a bisect and found:
3c8e1e3eca23 ("rcu: Always set .need_qs from __rcu_read_lock() for strict GPs")

When I reverted that on next-20200826 and on next-20200827 the
allmodconfig kernel boots [1], there's other issues that I can see in
the log but not this one.

Cheers,
Anders
[1] https://people.linaro.org/~anders.roxell/output-next-20200827-3c8e1e3eca23.log

>  They are linear,
> extending from 0d23eddbe5d4 ("rcu: Remove KCSAN stubs") to 72cc80705122
> ("rcu: Remove unused "cpu" parameter from rcu_report_qs_rdp()".
>
> I do regularly test single-CPU premptible RCU, but not on ARM.  Nor do
> I normally enable quite this much debug, so I might have missed something.
>
>                                                         Thanx, Paul
>
> > Cheers,
> > Anders
> > [1] https://people.linaro.org/~anders.roxell/output-next-20200826.log
> > [2] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-e6df9766894d.log
> > [3] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-25e6e115dd1d.log
> > [4] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-revert-e6df9766894d-25e6e115dd1d.log

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

* Re: linux-next: Tree for Aug 26
  2020-08-26 18:19 ` Anders Roxell
@ 2020-08-26 19:39   ` Paul E. McKenney
  2020-08-28  7:37     ` Anders Roxell
  0 siblings, 1 reply; 24+ messages in thread
From: Paul E. McKenney @ 2020-08-26 19:39 UTC (permalink / raw)
  To: Anders Roxell
  Cc: Stephen Rothwell, Linux Next Mailing List, Linux Kernel Mailing List

On Wed, Aug 26, 2020 at 08:19:01PM +0200, Anders Roxell wrote:
> On Wed, 26 Aug 2020 at 08:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

[ . . . ]

> I've built and run an arm64 allmodconfig kernel where I use the
> defconfig as the base, I do this for testing purposes.
> I can see the following call trace [1]:
> 
> [ 2595.811453][    T1] Running tests on all trace events:
> [ 2595.860933][    T1] Testing all events:
> [ 4316.066072][    T8] kworker/dying (8) used greatest stack depth:
> 27056 bytes left
> [ 8561.924871][    C0] watchdog: BUG: soft lockup - CPU#0 stuck for
> 22s! [migration/0:14]
> [ 8561.934498][    C0] Modules linked in:
> [ 8561.942303][    C0] irq event stamp: 4044
> [ 8561.949044][    C0] hardirqs last  enabled at (4043):
> [<ffffa000126b530c>] _raw_spin_unlock_irqrestore+0xac/0x138
> [ 8561.960848][    C0] hardirqs last disabled at (4044):
> [<ffffa000126a89f8>] __schedule+0xf8/0x7e0
> [ 8561.971418][    C0] softirqs last  enabled at (3698):
> [<ffffa00010001b04>] __do_softirq+0x524/0x5f8
> [ 8561.982191][    C0] softirqs last disabled at (3689):
> [<ffffa000101216c8>] __irq_exit_rcu+0x128/0x1a0
> [ 8561.993068][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
>    W         5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> [ 8562.005684][    C0] Hardware name: linux,dummy-virt (DT)
> [ 8562.013247][    C0] pstate: 80400005 (Nzcv daif +PAN -UAO BTYPE=--)
> [ 8562.021657][    C0] pc : arch_local_irq_enable+0x58/0x80
> [ 8562.029323][    C0] lr : _raw_spin_unlock_irq+0x84/0xc0
> [ 8562.036739][    C0] sp : ffff0000698efaa0
> [ 8562.042984][    C0] x29: ffff0000698efaa0 x28: ffff00006ad0f270
> [ 8562.053814][    C0] x27: ffff00006ad0f248 x26: ffff0000698d4718
> [ 8562.064687][    C0] x25: ffff00006ad0e798 x24: ffffa000139e3a40
> [ 8562.075506][    C0] x23: 0000000000000001 x22: ffffa000154f5000
> [ 8562.086425][    C0] x21: ffff00006ad0e798 x20: ffff00006ad0e780
> [ 8562.097255][    C0] x19: ffffa000126a905c x18: 00000000000014c0
> [ 8562.108071][    C0] x17: 0000000000001500 x16: 0000000000001440
> [ 8562.118918][    C0] x15: 00000000f1f1f1f1 x14: 003d090000000000
> [ 8562.129739][    C0] x13: 00003d0900000000 x12: ffff80000d31df41
> [ 8562.140544][    C0] x11: 1fffe0000d31df40 x10: ffff80000d31df40
> [ 8562.151366][    C0] x9 : dfffa00000000000 x8 : ffff0000698efa07
> [ 8562.162247][    C0] x7 : 0000000000000001 x6 : 00007ffff2ce20c0
> [ 8562.173072][    C0] x5 : ffff0000698d4040 x4 : dfffa00000000000
> [ 8562.183954][    C0] x3 : ffffa0001040f904 x2 : 0000000000000007
> [ 8562.194811][    C0] x1 : ffffa00014080000 x0 : 00000000000000e0
> [ 8562.205858][    C0] Call trace:
> [ 8562.211739][    C0]  arch_local_irq_enable+0x58/0x80
> [ 8562.219076][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> [ 8562.226394][    C0]  __schedule+0x75c/0x7e0
> [ 8562.233074][    C0]  preempt_schedule_notrace+0x64/0xc0
> [ 8562.268210][    C0]  ftrace_ops_list_func+0x494/0x4e0
> [ 8562.275735][    C0]  ftrace_graph_call+0x0/0x4
> [ 8562.282647][    C0]  preempt_count_add+0xc/0x240
> [ 8562.289686][    C0]  schedule+0xe4/0x160
> [ 8562.296187][    C0]  smpboot_thread_fn+0x47c/0x540
> [ 8562.303377][    C0]  kthread+0x23c/0x260
> [ 8562.309906][    C0]  ret_from_fork+0x10/0x18
> [ 8562.316604][    C0] Kernel panic - not syncing: softlockup: hung tasks
> [ 8562.325230][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
>    W    L    5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
> [ 8562.337861][    C0] Hardware name: linux,dummy-virt (DT)
> [ 8562.345374][    C0] Call trace:
> [ 8562.351228][    C0]  dump_backtrace+0x0/0x320
> [ 8562.358070][    C0]  show_stack+0x38/0x60
> [ 8562.364728][    C0]  dump_stack+0x1c0/0x280
> [ 8562.371447][    C0]  panic+0x32c/0x614
> [ 8562.377868][    C0]  watchdog_timer_fn+0x49c/0x560
> [ 8562.385076][    C0]  __run_hrtimer+0x1cc/0x360
> [ 8562.392021][    C0]  __hrtimer_run_queues+0x1a0/0x220
> [ 8562.399500][    C0]  hrtimer_interrupt+0x1f8/0x440
> [ 8562.406807][    C0]  arch_timer_handler_virt+0x68/0xa0
> [ 8562.414338][    C0]  handle_percpu_devid_irq+0x118/0x2a0
> [ 8562.421992][    C0]  __handle_domain_irq+0x150/0x1c0
> [ 8562.429315][    C0]  gic_handle_irq+0x98/0x120
> [ 8562.436297][    C0]  el1_irq+0xd4/0x1c0

We appear to have taken an interrupt here, just after releasing
an irq-disabled lock and enabling interrupts.

> [ 8562.442748][    C0]  arch_local_irq_enable+0x58/0x80
> [ 8562.450116][    C0]  _raw_spin_unlock_irq+0x84/0xc0
> [ 8562.457360][    C0]  __schedule+0x75c/0x7e0
> [ 8562.464142][    C0]  preempt_schedule_notrace+0x64/0xc0
> [ 8562.471745][    C0]  ftrace_ops_list_func+0x494/0x4e0
> [ 8562.479195][    C0]  ftrace_graph_call+0x0/0x4
> [ 8562.486159][    C0]  preempt_count_add+0xc/0x240
> [ 8562.493210][    C0]  schedule+0xe4/0x160

We are trying to sleep, so we took a pass through the scheduler and
did some tracing.

> [ 8562.499737][    C0]  smpboot_thread_fn+0x47c/0x540

Here we might be bringing up a CPU?  Except that according to your
dmesg, there is only one CPU.  ("RCU restricting CPUs from NR_CPUS=256
to nr_cpu_ids=1").  So this seems unlikely.

Huh.  The first dmesg in output-next-20200826.log is instead a
DEBUG_LOCKS_WARN_ON() from lockdep.  Might this be related?  Or do you
also see this warning when boot happens quickly?

(I do see the soft lockup later on.)

> [ 8562.506960][    C0]  kthread+0x23c/0x260
> [ 8562.513496][    C0]  ret_from_fork+0x10/0x18
> [ 8562.521052][    C0] Kernel Offset: disabled
> [ 8562.527725][    C0] CPU features: 0x0240002,20002004
> [ 8562.534950][    C0] Memory Limit: none
> [ 8562.543830][    C0] ---[ end Kernel panic - not syncing:
> softlockup: hung tasks ]---
> 
> When I tested to checkout and build e6df9766894d ("Merge remote-tracking branch
> 'irqchip/irq/irqchip-next' into master") that was merged into today's
> tag I was able to
> boot [2]. When I checked out 25e6e115dd1d ("Merge remote-tracking
> branch 'rcu/rcu/next' into master") and built and tested that I was
> able to boot [3] after a
> looong time. To clarify, the rcu merge comes after the irqchip merge.
> 
> I also tried to only revert the rcu tree from todays next tag like this:
> "git diff e6df9766894d..25e6e115dd1d | patch -Rp1". When I built that
> I was able to
> boot [4] too.
> 
> Any idea what's going on here?

Could you please try bisecting the RCU commits?  They are linear,
extending from 0d23eddbe5d4 ("rcu: Remove KCSAN stubs") to 72cc80705122
("rcu: Remove unused "cpu" parameter from rcu_report_qs_rdp()".

I do regularly test single-CPU premptible RCU, but not on ARM.  Nor do
I normally enable quite this much debug, so I might have missed something.

							Thanx, Paul

> Cheers,
> Anders
> [1] https://people.linaro.org/~anders.roxell/output-next-20200826.log
> [2] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-e6df9766894d.log
> [3] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-25e6e115dd1d.log
> [4] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-revert-e6df9766894d-25e6e115dd1d.log

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

* Re: linux-next: Tree for Aug 26
  2020-08-26  6:33 Stephen Rothwell
@ 2020-08-26 18:19 ` Anders Roxell
  2020-08-26 19:39   ` Paul E. McKenney
  0 siblings, 1 reply; 24+ messages in thread
From: Anders Roxell @ 2020-08-26 18:19 UTC (permalink / raw)
  To: Stephen Rothwell, paulmck
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

On Wed, 26 Aug 2020 at 08:33, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> News:  There will be no linux-next releases next Monday or Tuesday.
>
> Changes since 20200825:
>
> The bpf-next tree lost its build failure.
>
> The drm-misc tree gained conflicts against Linus' tree and the amdgpu
> tree.  It also gained a semantic conflict against the drm-misc-fixes tree.
>
> Non-merge commits (relative to Linus' tree): 2773
>  3346 files changed, 94589 insertions(+), 35418 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 328 trees (counting Linus' and 86 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 (abb3438d69fb Merge tag 'm68knommu-for-v5.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu)
> Merging fixes/master (9123e3a74ec7 Linux 5.9-rc1)
> Merging kbuild-current/fixes (510bc3cb1ddc kconfig: qconf: replace deprecated QString::sprintf() with QTextStream)
> Merging arc-current/for-curr (37016ab49214 irqchip/eznps: Fix build error for !ARC700 builds)
> Merging arm-current/fixes (5c6360ee4a0e ARM: 8988/1: mmu: fix crash in EFI calls due to p4d typo in create_mapping_late())
> Merging arm64-fixes/for-next/fixes (8d75785a8142 ARM64: vdso32: Install vdso32 from vdso_install)
> Merging arm-soc-fixes/arm/fixes (9c8b0a9c37b7 Merge tag 'imx-fixes-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes)
> Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2)
> Merging drivers-memory-fixes/fixes (7ff3a2a626f7 memory: jz4780_nemc: Fix an error pointer vs NULL check in probe())
> Merging m68k-current/for-linus (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3)
> Merging powerpc-fixes/fixes (64ef8f2c4791 powerpc/perf/hv-24x7: Move cpumask file to top folder of hv-24x7 driver)
> Merging s390-fixes/fixes (b97bf44f9915 s390/pci: fix PF/VF linking on hot plug)
> Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro)
> Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key)
> Merging net/master (2c6500e82e51 net: ethernet: ti: cpsw_new: fix clean up of vlan mc entries for host port)
> Merging bpf/master (7787b6fc938e bpf, sysctl: Let bpf_stats_handler take a kernel pointer buffer)
> Merging ipsec/master (4eb2e1341575 espintcp: restore IP CB before handing the packet to xfrm)
> Merging netfilter/master (3622adb02623 ipv6: ndisc: adjust ndisc_ifinfo_sysctl_change prototype)
> Merging ipvs/master (7c7ab580db49 net: Convert to use the fallthrough macro)
> Merging wireless-drivers/master (9a2a0862d973 brcmfmac: reserve tx credit only when txctl is ready to send)
> Merging mac80211/master (fce2ff728f95 nl80211: fix NL80211_ATTR_HE_6GHZ_CAPABILITY usage)
> Merging rdma-fixes/for-rc (60b1af64eb35 RDMA/rxe: Fix the parent sysfs read when the interface has 15 chars)
> Merging sound-current/for-linus (eed8f88b109a Revert "ALSA: hda: Add support for Loongson 7A1000 controller")
> Merging sound-asoc-fixes/for-linus (d062085d61b1 ASoC: ti: fixup ams_delta_mute() function name)
> Merging regmap-fixes/for-linus (d012a7190fc1 Linux 5.9-rc2)
> Merging regulator-fixes/for-linus (3bec5b6aae83 Merge tag 'v5.9-rc2' into regulator-5.9)
> Merging spi-fixes/for-linus (d1770b49661f Merge remote-tracking branch 'spi/for-5.9' into spi-linus)
> Merging pci-current/for-linus (7c2308f79fc8 PCI/P2PDMA: Fix build without DMA ops)
> Merging driver-core.current/driver-core-linus (9123e3a74ec7 Linux 5.9-rc1)
> Merging tty.current/tty-linus (ea1fc02e12b6 tty: serial: imx: add dependence and build for earlycon)
> Merging usb.current/usb-linus (23e26d057753 usb: typec: tcpm: Fix Fix source hard reset response for TDA 2.3.1.1 and TDA 2.3.1.2 failures)
> Merging usb-gadget-fixes/fixes (bc9a2e226ea9 usb: dwc3: gadget: Handle ZLP for sg requests)
> Merging usb-serial-fixes/usb-linus (6ccc48e0eb2f USB: serial: ftdi_sio: add IDs for Xsens Mti USB converter)
> Merging usb-chipidea-fixes/ci-for-usb-stable (2d79b3360dcc usb: chipidea: core: add wakeup support for extcon)
> Merging phy/fixes (afd55e6d1bd3 phy: qcom-qmp: Use correct values for ipq8074 PCIe Gen2 PHY init)
> Merging staging.current/staging-linus (1dffeb8b8b4c staging: greybus: audio: fix uninitialized value issue)
> Merging char-misc.current/char-misc-linus (9c97cecab0d4 Merge tag 'misc-habanalabs-fixes-2020-08-22' of git://people.freedesktop.org/~gabbayo/linux into char-misc-linus)
> Merging soundwire-fixes/fixes (f8d0168e035f soundwire: bus: fix typo in comment on INTSTAT registers)
> Merging thunderbolt-fixes/fixes (813050e0a9b8 thunderbolt: Use maximum USB3 link rate when reclaiming if link is not up)
> Merging input-current/for-linus (9e8238020c5b Merge branch 'next' into for-linus)
> Merging crypto-current/master (bfe8fe939a04 crypto: sa2ul - add Kconfig selects to fix build error)
> Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer)
> Merging vfio-fixes/for-linus (aae7a75a821a vfio/type1: Add proper error unwind for vfio_iommu_replay())
> Merging kselftest-fixes/fixes (5c1e4f7e9e49 selftests/timers: Turn off timeout setting)
> Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
> Merging dmaengine-fixes/fixes (6d6018fc30be drivers/dma/dma-jz4780: Fix race condition between probe and irq handler)
> Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4)
> Merging mtd-fixes/mtd/fixes (f7e6b19bc764 mtd: properly check all write ioctls for permissions)
> Merging mfd-fixes/for-mfd-fixes (dddf4ddc3971 mfd: mfd-core: Ensure disabled devices are ignored without error)
> Merging v4l-dvb-fixes/fixes (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it")
> Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
> Merging mips-fixes/mips-fixes (91dbd73a1739 mips/oprofile: Fix fallthrough placement)
> Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
> Merging omap-fixes/fixes (6542e2b613c2 ARM: dts: omap5: Fix DSI base address and clocks)
> Merging kvm-fixes/master (b5331379bc62 KVM: arm64: Only reschedule if MMU_NOTIFIER_RANGE_BLOCKABLE is not set)
> Merging kvms390-fixes/master (774911290c58 KVM: s390: reduce number of IO pins to 1)
> Merging hwmon-fixes/hwmon (cecf7560f00a hwmon: (applesmc) check status earlier.)
> Merging nvdimm-fixes/libnvdimm-fixes (c2affe920b0e dax: do not print error message for non-persistent memory block device)
> Merging btrfs-fixes/next-fixes (c9f8e44ec4a5 Merge branch 'misc-5.9' into next-fixes)
> Merging vfs-fixes/fixes (9d682ea6bcc7 vboxsf: Fix the check for the old binary mount-arguments struct)
> Merging dma-mapping-fixes/for-linus (7dc6fd0f3b84 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
> Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
> Merging drivers-x86-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
> Merging samsung-krzk-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
> Merging pinctrl-samsung-fixes/pinctrl-fixes (9123e3a74ec7 Linux 5.9-rc1)
> Merging devicetree-fixes/dt/linus (5cd841d2676a dt-bindings: vendor-prefixes: Remove trailing whitespace)
> Merging scsi-fixes/fixes (75d46c6d15ef scsi: scsi_debug: Remove superfluous close zone in resp_open_zone())
> Merging drm-fixes/drm-fixes (d012a7190fc1 Linux 5.9-rc2)
> Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
> Merging drm-intel-fixes/for-linux-next-fixes (d012a7190fc1 Linux 5.9-rc2)
> Merging mmc-fixes/fixes (710d4d916e6d dt-bindings: mmc: Add missing description for clk_in/out_sd1)
> Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1)
> Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2)
> Merging hyperv-fixes/hyperv-fixes (b46b4a8a57c3 hv_utils: drain the timesync packets on onchannelcallback)
> Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create)
> Merging risc-v-fixes/fixes (0981b50cd6c7 riscv/mm: Simplify retry logic in do_page_fault())
> Merging pidfd-fixes/fixes (bda4c60d02e9 sys: Convert to the new fallthrough notation)
> Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake)
> Merging spdx/spdx-linus (9123e3a74ec7 Linux 5.9-rc1)
> Merging gpio-intel-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
> Merging pinctrl-intel-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
> Merging erofs-fixes/fixes (9ebcfadb0610 Linux 5.8-rc3)
> Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
> Merging kunit-fixes/kunit-fixes (9123e3a74ec7 Linux 5.9-rc1)
> Merging ubifs-fixes/fixes (f37e99aca03f Merge tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into master)
> Merging memblock-fixes/fixes (bd05220c7be3 arch/ia64: Restore arch-specific pgd_offset_k implementation)
> Merging drm-misc-fixes/for-linux-next-fixes (7fd5b25499bc drm/omap: fix incorrect lock state)
> Merging kspp-gustavo/for-next/kspp (df561f6688fe treewide: Use fallthrough pseudo-keyword)
> Merging kbuild/for-next (514bad879fdb Merge branch 'kconfig' into for-next)
> CONFLICT (content): Merge conflict in scripts/kconfig/qconf.h
> Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4)
> Merging dma-mapping/for-next (d7e673ec2c8e dma-pool: Only allocate from CMA when in same memory zone)
> Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates)
> Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
> Merging arm/for-next (4dffbda6a996 Merge branches 'fixes' and 'misc' into for-next)
> Merging arm64/for-next/core (3df14264ad99 recordmcount: Fix build failure on non arm64)
> Merging arm-perf/for-next/perf (55fdc1f44cd6 arm64: perf: Expose some new events via sysfs)
> Merging arm-soc/for-next (2694ca73fa41 ARM: Document merges)
> Merging amlogic/for-next (c943b84fab78 Merge branch 'v5.10/dt64' into tmp/aml-rebuild)
> Merging aspeed/for-next (7c32a9d95c9a ARM: dts: aspeed: wedge40: Update UART4 pin settings)
> Merging at91/at91-next (b68f43873b72 Merge branch 'at91-soc' into at91-next)
> Merging drivers-memory/for-next (f42ae4bbf94c memory: brcmstb_dpfe: fix array index out of bounds)
> Merging imx-mxs/for-next (427954264555 Merge branch 'imx/defconfig' into for-next)
> Merging keystone/next (50c950e2c8b6 Merge branch 'for_5.9/driver-soc' into next)
> Merging mediatek/for-next (647a84d1e4dc Merge branch 'v5.8-next/soc' into for-next)
> Merging mvebu/for-next (29bd9d8c2ac1 Merge branch 'mvebu/dt64' into mvebu/for-next)
> Merging omap/for-next (390f789055a0 Merge branch 'omap-for-v5.10/dt' into for-next)
> Merging qcom/for-next (9123e3a74ec7 Linux 5.9-rc1)
> Merging raspberrypi/for-next (9123e3a74ec7 Linux 5.9-rc1)
> Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next)
> Merging renesas/next (15c95b417a9c Merge branches 'renesas-arm-defconfig-for-v5.10', 'renesas-arm-dt-for-v5.10' and 'renesas-drivers-for-v5.10' into renesas-next)
> Merging reset/reset/next (2983e2385ff6 reset: imx7: add the cm4 reset for i.MX8MQ)
> CONFLICT (content): Merge conflict in drivers/reset/reset-imx7.c
> Merging rockchip/for-next (088d74f51158 Merge branch 'v5.9-clk/next' into for-next)
> Merging samsung-krzk/for-next (f609c46be3ca Merge branch 'next/soc-s3c-cleanup' into for-next)
> Merging scmi/for-linux-next (d012a7190fc1 Linux 5.9-rc2)
> Merging sunxi/sunxi/for-next (9123e3a74ec7 Linux 5.9-rc1)
> Merging tegra/for-next (8617339892a6 Merge branch for-5.9/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 (9123e3a74ec7 Linux 5.9-rc1)
> Merging uniphier/for-next (4f8fb65af529 Merge branch 'dt64' into for-next)
> Merging clk/clk-next (24907ec54702 Merge branch 'clk-fixes' into clk-next)
> Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7)
> Merging csky/linux-next (bdcd93ef9afb csky: Add context tracking support)
> Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>)
> Merging ia64/next (1a9d3c34c593 x86/cpu: Add Lakefield, Alder Lake and Rocket Lake to Intel family)
> Merging m68k/for-next (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3)
> Merging m68knommu/for-next (0fdaa525ea1c binfmt_flat: revert "binfmt_flat: don't offset the data start")
> Merging microblaze/next (b3a9e3b9622a Linux 5.8-rc1)
> Merging mips/mips-next (625326ea9c84 MIPS: Remove PNX833x alias NXP_STB22x)
> Merging nds32/next (0a2e478902c7 nds32: use get_kernel_nofault in dump_mem)
> Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through)
> Merging openrisc/for-next (55b2662ec665 openrisc: uaccess: Add user address space check to access_ok)
> Merging parisc-hd/for-next (bcf876870b95 Linux 5.8)
> Merging powerpc/next (9123e3a74ec7 Linux 5.9-rc1)
> Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
> Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline function qbman_write_eqcr_am_rt_register)
> Merging risc-v/for-next (f75fa0a51b8b efi: Rename arm-init to efi-init common for all arch)
> Merging s390/features (9123e3a74ec7 Linux 5.9-rc1)
> Merging sh/for-next (0c64a0dce51f sh: landisk: Add missing initialization of sh_io_port_base)
> 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 (f6e8c474390b um: virtio: Replace zero-length array with flexible-array)
> Merging xtensa/xtensa-for-next (a0fc1436f1f4 xtensa: add missing exclusive access state management)
> Merging fscrypt/master (55e32c54bbd5 fscrypt: don't load ->i_crypt_info before it's known to be valid)
> Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly)
> Merging btrfs/for-next (e36d3dfd9828 Merge branch 'for-next-next-v5.9-20200824' into for-next-20200824)
> Merging ceph/master (496ceaf12432 ceph: don't allow setlease on cephfs)
> Merging cifs/for-next (d012a7190fc1 Linux 5.9-rc2)
> Merging configfs/for-next (059ccbfff8a8 configfs: use flush file op to commit writes to a binary file)
> Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
> Merging erofs/dev (cfcedfe21820 erofs: avoid duplicated permission check for "trusted." xattrs)
> Merging exfat/dev (34d41dbe5455 exfat: use i_blocksize() to get blocksize)
> Merging ext3/for_next (de575ac602ab Pull reiserfs spelling fixes.)
> Merging ext4/dev (27bc446e2def ext4: limit the length of per-inode prealloc list)
> Merging f2fs/dev (da0815f3bce1 f2fs: Use generic casefolding support)
> Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info)
> Merging fuse/for-next (9e9e23bd2d36 fuse: update project homepage)
> Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member)
> Merging nfs/linux-next (d012a7190fc1 Linux 5.9-rc2)
> Merging nfs-anna/linux-next (65caafd0d214 SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion"))
> Merging nfsd/nfsd-next (9123e3a74ec7 Linux 5.9-rc1)
> Merging cel/cel-next (ad112aa8b1ac SUNRPC: remove duplicate include)
> Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret)
> Merging overlayfs/overlayfs-next (4518dfcf761e ovl: fix lookup of indexed hardlinks with metacopy)
> Merging ubifs/next (798b7347e4f2 jffs2: fix UAF problem)
> Merging v9fs/9p-next (2ed0b7578170 9p: Remove unneeded cast from memory allocation)
> Merging xfs/for-next (96cf2a2c7556 xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init)
> Merging zonefs/for-next (2f4b7462d2fa zonefs: update documentation to reflect zone size vs capacity)
> Merging iomap/iomap-for-next (60263d5889e6 iomap: fall back to buffered writes for invalidation failures)
> Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate())
> Merging file-locks/locks-next (c0842fbc1b18 random32: move the pseudo-random 32-bit definitions to prandom.h)
> Merging vfs/for-next (bcf876870b95 Linux 5.8)
> Merging printk/for-next (20d6ee092831 Merge branch 'for-5.10' into for-next)
> Merging pci/next (9123e3a74ec7 Linux 5.9-rc1)
> Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao)
> CONFLICT (content): Merge conflict in .mailmap
> Merging hid/for-next (de11ec5fedd9 Merge branch 'for-5.9/upstream-fixes' into for-next)
> Merging i2c/i2c/for-next (3f7462407ce3 Merge branch 'i2c/for-current' into i2c/for-next)
> Merging i3c/i3c/next (9da36a7ec421 i3c: master add i3c_master_attach_boardinfo to preserve boardinfo)
> Merging dmi/dmi-for-next (a3d13a0a23ea Replace HTTP links with HTTPS ones: DMI/SMBIOS SUPPORT)
> Merging hwmon-staging/hwmon-next (314119a53803 dt-bindings: hwmon: Add bindings for ADM1266)
> Merging jc_docs/docs-next (92001bc0365a Documentation: laptops: thinkpad-acpi: fix underline length build warning)
> Merging v4l-dvb/master (9a538b83612c media: venus: core: Add support for opp tables/perf voting)
> Merging v4l-dvb-next/master (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it")
> Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
> Merging pm/linux-next (4958dfca3d0f Merge branch 'pm-cpufreq' into linux-next)
> Merging cpufreq-arm/cpufreq/arm/linux-next (99bcfd231280 cpufreq: tegra186: Fix initial frequency)
> Merging cpupower/cpupower (527b7779e5ec cpupower: speed up generating git version string)
> Merging devfreq/devfreq-next (9123e3a74ec7 Linux 5.9-rc1)
> Merging opp/opp/linux-next (8c6269534d00 opp: Set required OPPs in reverse order when scaling down)
> Merging thermal/thermal/linux-next (6f55be9fd5ee Merge branch 'thermal/fixes' into thermal/linux-next)
> Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
> Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
> Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
> Merging dlm/next (fa601a9ebd49 fs: dlm: implement tcp graceful shutdown)
> Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
> CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c
> Merging rdma/for-next (c0f4979e90ea RDMA/cm: Remove unused cm_class)
> Merging net-next/master (ca65a280fb4b sunrpc: Avoid comma separated statements)
> Merging bpf-next/master (cd04b04de119 selftests/bpf: Add set test to resolve_btfids)
> CONFLICT (content): Merge conflict in tools/lib/bpf/libbpf.c
> Merging ipsec-next/master (da7955405fb2 sfc: Fix build with CONFIG_RFS_ACCEL disabled.)
> Merging mlx5-next/mlx5-next (9123e3a74ec7 Linux 5.9-rc1)
> Merging netfilter-next/master (d0a84e1f38d9 ethtool: allow flow-type ether without IP protocol field)
> Merging ipvs-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next)
> Merging wireless-drivers-next/master (eb77802e0daa Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
> Merging bluetooth/master (3b799254cf6f Bluetooth: hci_uart: Cancel init work before unregistering)
> Merging mac80211-next/master (e5b15f5af21a Merge branch 'ptp-Add-generic-helper-functions')
> Merging gfs2/for-next (e28c02b94f9e gfs2: When gfs2_dirty_inode gets a glock error, dump the glock)
> Merging mtd/mtd/next (6a1380271b75 Merge tag 'nand/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next)
> Merging nand/nand/next (da151e3458c8 dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags)
> Merging spi-nor/spi-nor/next (e93a977367b2 mtd: revert "spi-nor: intel: provide a range for poll_timout")
> Merging crypto/master (6779d0e6b0fe crypto: arm/curve25519 - include <linux/scatterlist.h>)
> Merging drm/drm-next (62975d27d647 drm/ttm: revert "drm/ttm: make TT creation purely optional v3")
> Merging amdgpu/drm-next (65ecc6928926 drm/amdgpu: add a wrapper for atom asic_init)
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_link.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/bios/command_table2.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> Merging drm-intel/for-linux-next (ced026e959be drm/i915: Update DRIVER_DATE to 20200824)
> Merging drm-tegra/drm/tegra/for-next (4fba6d22ca9a drm/tegra: plane: Support 180° rotation)
> Merging drm-misc/for-linux-next (ebb21aa1882f drm/ttm: drop bus.size from bus placement.)
> CONFLICT (content): Merge conflict in drivers/video/fbdev/savage/savagefb_driver.c
> CONFLICT (content): Merge conflict in drivers/video/fbdev/atmel_lcdfb.c
> CONFLICT (content): Merge conflict in drivers/video/fbdev/arcfb.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
> Applying: fix interaction with drm-misc-fix commit
> Merging drm-msm/msm-next (5e0c22d4a9dd drm/msm/a6xx: fix frequency not always being restored on GMU resume)
> Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500)
> Merging imx-drm/imx-drm/next (efd5a93d2a89 drm/imx: drop explicit drm_mode_config_cleanup)
> Merging etnaviv/etnaviv/next (c5d5a32ead1e drm/etnaviv: fix ref count leak via pm_runtime_get_sync)
> Merging regmap/for-next (d012a7190fc1 Linux 5.9-rc2)
> Merging sound/for-next (14b51ccd2674 ALSA: usb-audio: Correct wrongly matching entries with audio class)
> Merging sound-asoc/for-next (cd018773c645 Merge remote-tracking branch 'asoc/for-5.10' into asoc-next)
> Merging modules/modules-next (262e6ae7081d modules: inherit TAINT_PROPRIETARY_MODULE)
> Merging input/next (9b5fbad1dcee Input: MT - avoid comma separated statements)
> Merging block/for-next (86cfccb66937 Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
> Merging device-mapper/for-next (a9cb9f4148ef dm: don't call report zones for more than the user requested)
> Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static)
> Merging mmc/next (10a70e0d4edd Merge branch 'fixes' into next)
> Merging mfd/for-mfd-next (c563a66537d2 mfd: rn5t618: Add a power supply subdevice)
> Merging backlight/for-backlight-next (7eb99a39ef76 video: backlight: cr_bllcd: Remove unused variable 'intensity')
> Merging battery/for-next (ef805f217709 dt-bindings: power: reset: Convert reboot-mode to YAML)
> Merging regulator/for-next (79bb4ac46a7f Merge remote-tracking branch 'regulator/for-5.10' into regulator-next)
> Merging security/next-testing (bc62d68e2a0a device_cgroup: Fix RCU list debugging warning)
> Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable)
> Merging integrity/next-integrity (d012a7190fc1 Linux 5.9-rc2)
> Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type)
> Merging safesetid/safesetid-next (0476c865ded6 LSM: SafeSetID: Fix warnings reported by test bot)
> Merging selinux/next (1b8b31a2e612 selinux: convert policy read-write lock to RCU)
> Merging smack/next (42a2df3e829f Smack: prevent underflow in smk_set_cipso())
> Merging tomoyo/master (9123e3a74ec7 Linux 5.9-rc1)
> Merging tpmdd/next (9123e3a74ec7 Linux 5.9-rc1)
> Merging watchdog/master (18445bf405cb Merge tag 'spi-fix-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
> Merging iommu/next (e46b3c0d011e Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next)
> Merging vfio/next (ccd59dce1a21 vfio/type1: Refactor vfio_iommu_type1_ioctl())
> Merging audit/next (265c32072b0c audit: uninitialize variable audit_sig_sid)
> Merging devicetree/for-next (7ba58fff001d dt-bindings: Validate DT binding schema in a single call)
> Merging mailbox/mailbox-for-next (884996986347 mailbox: mediatek: cmdq: clear task in channel before shutdown)
> Merging spi/for-next (410c081be7ac Merge remote-tracking branch 'spi/for-5.10' into spi-next)
> Merging tip/auto-latest (21f294e9c2da Merge branch 'perf/core')
> Merging clockevents/timers/drivers/next (9fba22584e54 clocksource: Ingenic: Add support for the Ingenic X1000 OST.)
> Merging edac/edac-for-next (e9b46cc8e3eb Merge branch 'edac-misc' into edac-for-next)
> Merging irqchip/irq/irqchip-next (821fc9e261f3 irqchip/ingenic: Leave parent IRQ unmasked on suspend)
> Merging ftrace/for-next (38ce2a9e33db tracing: Add trace_array_init_printk() to initialize instance trace_printk() buffers)
> Merging rcu/rcu/next (72cc80705122 rcu: Remove unused "cpu" parameter from rcu_report_qs_rdp())

I've built and run an arm64 allmodconfig kernel where I use the
defconfig as the base, I do this for testing purposes.
I can see the following call trace [1]:

[ 2595.811453][    T1] Running tests on all trace events:
[ 2595.860933][    T1] Testing all events:
[ 4316.066072][    T8] kworker/dying (8) used greatest stack depth:
27056 bytes left
[ 8561.924871][    C0] watchdog: BUG: soft lockup - CPU#0 stuck for
22s! [migration/0:14]
[ 8561.934498][    C0] Modules linked in:
[ 8561.942303][    C0] irq event stamp: 4044
[ 8561.949044][    C0] hardirqs last  enabled at (4043):
[<ffffa000126b530c>] _raw_spin_unlock_irqrestore+0xac/0x138
[ 8561.960848][    C0] hardirqs last disabled at (4044):
[<ffffa000126a89f8>] __schedule+0xf8/0x7e0
[ 8561.971418][    C0] softirqs last  enabled at (3698):
[<ffffa00010001b04>] __do_softirq+0x524/0x5f8
[ 8561.982191][    C0] softirqs last disabled at (3689):
[<ffffa000101216c8>] __irq_exit_rcu+0x128/0x1a0
[ 8561.993068][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
   W         5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
[ 8562.005684][    C0] Hardware name: linux,dummy-virt (DT)
[ 8562.013247][    C0] pstate: 80400005 (Nzcv daif +PAN -UAO BTYPE=--)
[ 8562.021657][    C0] pc : arch_local_irq_enable+0x58/0x80
[ 8562.029323][    C0] lr : _raw_spin_unlock_irq+0x84/0xc0
[ 8562.036739][    C0] sp : ffff0000698efaa0
[ 8562.042984][    C0] x29: ffff0000698efaa0 x28: ffff00006ad0f270
[ 8562.053814][    C0] x27: ffff00006ad0f248 x26: ffff0000698d4718
[ 8562.064687][    C0] x25: ffff00006ad0e798 x24: ffffa000139e3a40
[ 8562.075506][    C0] x23: 0000000000000001 x22: ffffa000154f5000
[ 8562.086425][    C0] x21: ffff00006ad0e798 x20: ffff00006ad0e780
[ 8562.097255][    C0] x19: ffffa000126a905c x18: 00000000000014c0
[ 8562.108071][    C0] x17: 0000000000001500 x16: 0000000000001440
[ 8562.118918][    C0] x15: 00000000f1f1f1f1 x14: 003d090000000000
[ 8562.129739][    C0] x13: 00003d0900000000 x12: ffff80000d31df41
[ 8562.140544][    C0] x11: 1fffe0000d31df40 x10: ffff80000d31df40
[ 8562.151366][    C0] x9 : dfffa00000000000 x8 : ffff0000698efa07
[ 8562.162247][    C0] x7 : 0000000000000001 x6 : 00007ffff2ce20c0
[ 8562.173072][    C0] x5 : ffff0000698d4040 x4 : dfffa00000000000
[ 8562.183954][    C0] x3 : ffffa0001040f904 x2 : 0000000000000007
[ 8562.194811][    C0] x1 : ffffa00014080000 x0 : 00000000000000e0
[ 8562.205858][    C0] Call trace:
[ 8562.211739][    C0]  arch_local_irq_enable+0x58/0x80
[ 8562.219076][    C0]  _raw_spin_unlock_irq+0x84/0xc0
[ 8562.226394][    C0]  __schedule+0x75c/0x7e0
[ 8562.233074][    C0]  preempt_schedule_notrace+0x64/0xc0
[ 8562.268210][    C0]  ftrace_ops_list_func+0x494/0x4e0
[ 8562.275735][    C0]  ftrace_graph_call+0x0/0x4
[ 8562.282647][    C0]  preempt_count_add+0xc/0x240
[ 8562.289686][    C0]  schedule+0xe4/0x160
[ 8562.296187][    C0]  smpboot_thread_fn+0x47c/0x540
[ 8562.303377][    C0]  kthread+0x23c/0x260
[ 8562.309906][    C0]  ret_from_fork+0x10/0x18
[ 8562.316604][    C0] Kernel panic - not syncing: softlockup: hung tasks
[ 8562.325230][    C0] CPU: 0 PID: 14 Comm: migration/0 Tainted: G
   W    L    5.9.0-rc2-next-20200826-00005-g24628bb4c0bf #1
[ 8562.337861][    C0] Hardware name: linux,dummy-virt (DT)
[ 8562.345374][    C0] Call trace:
[ 8562.351228][    C0]  dump_backtrace+0x0/0x320
[ 8562.358070][    C0]  show_stack+0x38/0x60
[ 8562.364728][    C0]  dump_stack+0x1c0/0x280
[ 8562.371447][    C0]  panic+0x32c/0x614
[ 8562.377868][    C0]  watchdog_timer_fn+0x49c/0x560
[ 8562.385076][    C0]  __run_hrtimer+0x1cc/0x360
[ 8562.392021][    C0]  __hrtimer_run_queues+0x1a0/0x220
[ 8562.399500][    C0]  hrtimer_interrupt+0x1f8/0x440
[ 8562.406807][    C0]  arch_timer_handler_virt+0x68/0xa0
[ 8562.414338][    C0]  handle_percpu_devid_irq+0x118/0x2a0
[ 8562.421992][    C0]  __handle_domain_irq+0x150/0x1c0
[ 8562.429315][    C0]  gic_handle_irq+0x98/0x120
[ 8562.436297][    C0]  el1_irq+0xd4/0x1c0
[ 8562.442748][    C0]  arch_local_irq_enable+0x58/0x80
[ 8562.450116][    C0]  _raw_spin_unlock_irq+0x84/0xc0
[ 8562.457360][    C0]  __schedule+0x75c/0x7e0
[ 8562.464142][    C0]  preempt_schedule_notrace+0x64/0xc0
[ 8562.471745][    C0]  ftrace_ops_list_func+0x494/0x4e0
[ 8562.479195][    C0]  ftrace_graph_call+0x0/0x4
[ 8562.486159][    C0]  preempt_count_add+0xc/0x240
[ 8562.493210][    C0]  schedule+0xe4/0x160
[ 8562.499737][    C0]  smpboot_thread_fn+0x47c/0x540
[ 8562.506960][    C0]  kthread+0x23c/0x260
[ 8562.513496][    C0]  ret_from_fork+0x10/0x18
[ 8562.521052][    C0] Kernel Offset: disabled
[ 8562.527725][    C0] CPU features: 0x0240002,20002004
[ 8562.534950][    C0] Memory Limit: none
[ 8562.543830][    C0] ---[ end Kernel panic - not syncing:
softlockup: hung tasks ]---

When I tested to checkout and build e6df9766894d ("Merge remote-tracking branch
'irqchip/irq/irqchip-next' into master") that was merged into today's
tag I was able to
boot [2]. When I checked out 25e6e115dd1d ("Merge remote-tracking
branch 'rcu/rcu/next' into master") and built and tested that I was
able to boot [3] after a
looong time. To clarify, the rcu merge comes after the irqchip merge.

I also tried to only revert the rcu tree from todays next tag like this:
"git diff e6df9766894d..25e6e115dd1d | patch -Rp1". When I built that
I was able to
boot [4] too.

Any idea what's going on here?

Cheers,
Anders
[1] https://people.linaro.org/~anders.roxell/output-next-20200826.log
[2] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-e6df9766894d.log
[3] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-25e6e115dd1d.log
[4] https://people.linaro.org/~anders.roxell/output-next-20200826-bisect-revert-e6df9766894d-25e6e115dd1d.log

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

* linux-next: Tree for Aug 26
@ 2020-08-26  6:33 Stephen Rothwell
  2020-08-26 18:19 ` Anders Roxell
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2020-08-26  6:33 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

News:  There will be no linux-next releases next Monday or Tuesday.

Changes since 20200825:

The bpf-next tree lost its build failure.

The drm-misc tree gained conflicts against Linus' tree and the amdgpu
tree.  It also gained a semantic conflict against the drm-misc-fixes tree.

Non-merge commits (relative to Linus' tree): 2773
 3346 files changed, 94589 insertions(+), 35418 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 328 trees (counting Linus' and 86 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 (abb3438d69fb Merge tag 'm68knommu-for-v5.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu)
Merging fixes/master (9123e3a74ec7 Linux 5.9-rc1)
Merging kbuild-current/fixes (510bc3cb1ddc kconfig: qconf: replace deprecated QString::sprintf() with QTextStream)
Merging arc-current/for-curr (37016ab49214 irqchip/eznps: Fix build error for !ARC700 builds)
Merging arm-current/fixes (5c6360ee4a0e ARM: 8988/1: mmu: fix crash in EFI calls due to p4d typo in create_mapping_late())
Merging arm64-fixes/for-next/fixes (8d75785a8142 ARM64: vdso32: Install vdso32 from vdso_install)
Merging arm-soc-fixes/arm/fixes (9c8b0a9c37b7 Merge tag 'imx-fixes-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes)
Merging uniphier-fixes/fixes (48778464bb7d Linux 5.8-rc2)
Merging drivers-memory-fixes/fixes (7ff3a2a626f7 memory: jz4780_nemc: Fix an error pointer vs NULL check in probe())
Merging m68k-current/for-linus (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3)
Merging powerpc-fixes/fixes (64ef8f2c4791 powerpc/perf/hv-24x7: Move cpumask file to top folder of hv-24x7 driver)
Merging s390-fixes/fixes (b97bf44f9915 s390/pci: fix PF/VF linking on hot plug)
Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro)
Merging fscrypt-current/for-stable (2b4eae95c736 fscrypt: don't evict dirty inodes after removing key)
Merging net/master (2c6500e82e51 net: ethernet: ti: cpsw_new: fix clean up of vlan mc entries for host port)
Merging bpf/master (7787b6fc938e bpf, sysctl: Let bpf_stats_handler take a kernel pointer buffer)
Merging ipsec/master (4eb2e1341575 espintcp: restore IP CB before handing the packet to xfrm)
Merging netfilter/master (3622adb02623 ipv6: ndisc: adjust ndisc_ifinfo_sysctl_change prototype)
Merging ipvs/master (7c7ab580db49 net: Convert to use the fallthrough macro)
Merging wireless-drivers/master (9a2a0862d973 brcmfmac: reserve tx credit only when txctl is ready to send)
Merging mac80211/master (fce2ff728f95 nl80211: fix NL80211_ATTR_HE_6GHZ_CAPABILITY usage)
Merging rdma-fixes/for-rc (60b1af64eb35 RDMA/rxe: Fix the parent sysfs read when the interface has 15 chars)
Merging sound-current/for-linus (eed8f88b109a Revert "ALSA: hda: Add support for Loongson 7A1000 controller")
Merging sound-asoc-fixes/for-linus (d062085d61b1 ASoC: ti: fixup ams_delta_mute() function name)
Merging regmap-fixes/for-linus (d012a7190fc1 Linux 5.9-rc2)
Merging regulator-fixes/for-linus (3bec5b6aae83 Merge tag 'v5.9-rc2' into regulator-5.9)
Merging spi-fixes/for-linus (d1770b49661f Merge remote-tracking branch 'spi/for-5.9' into spi-linus)
Merging pci-current/for-linus (7c2308f79fc8 PCI/P2PDMA: Fix build without DMA ops)
Merging driver-core.current/driver-core-linus (9123e3a74ec7 Linux 5.9-rc1)
Merging tty.current/tty-linus (ea1fc02e12b6 tty: serial: imx: add dependence and build for earlycon)
Merging usb.current/usb-linus (23e26d057753 usb: typec: tcpm: Fix Fix source hard reset response for TDA 2.3.1.1 and TDA 2.3.1.2 failures)
Merging usb-gadget-fixes/fixes (bc9a2e226ea9 usb: dwc3: gadget: Handle ZLP for sg requests)
Merging usb-serial-fixes/usb-linus (6ccc48e0eb2f USB: serial: ftdi_sio: add IDs for Xsens Mti USB converter)
Merging usb-chipidea-fixes/ci-for-usb-stable (2d79b3360dcc usb: chipidea: core: add wakeup support for extcon)
Merging phy/fixes (afd55e6d1bd3 phy: qcom-qmp: Use correct values for ipq8074 PCIe Gen2 PHY init)
Merging staging.current/staging-linus (1dffeb8b8b4c staging: greybus: audio: fix uninitialized value issue)
Merging char-misc.current/char-misc-linus (9c97cecab0d4 Merge tag 'misc-habanalabs-fixes-2020-08-22' of git://people.freedesktop.org/~gabbayo/linux into char-misc-linus)
Merging soundwire-fixes/fixes (f8d0168e035f soundwire: bus: fix typo in comment on INTSTAT registers)
Merging thunderbolt-fixes/fixes (813050e0a9b8 thunderbolt: Use maximum USB3 link rate when reclaiming if link is not up)
Merging input-current/for-linus (9e8238020c5b Merge branch 'next' into for-linus)
Merging crypto-current/master (bfe8fe939a04 crypto: sa2ul - add Kconfig selects to fix build error)
Merging ide/master (6800cd8cbc6e ide-acpi: use %*ph to print small buffer)
Merging vfio-fixes/for-linus (aae7a75a821a vfio/type1: Add proper error unwind for vfio_iommu_replay())
Merging kselftest-fixes/fixes (5c1e4f7e9e49 selftests/timers: Turn off timeout setting)
Merging modules-fixes/modules-linus (57baec7b1b04 scripts/nsdeps: make sure to pass all module source files to spatch)
Merging dmaengine-fixes/fixes (6d6018fc30be drivers/dma/dma-jz4780: Fix race condition between probe and irq handler)
Merging backlight-fixes/for-backlight-fixes (219d54332a09 Linux 5.4)
Merging mtd-fixes/mtd/fixes (f7e6b19bc764 mtd: properly check all write ioctls for permissions)
Merging mfd-fixes/for-mfd-fixes (dddf4ddc3971 mfd: mfd-core: Ensure disabled devices are ignored without error)
Merging v4l-dvb-fixes/fixes (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it")
Merging reset-fixes/reset/fixes (b460e0a9e240 reset: intel: add unspecified HAS_IOMEM dependency)
Merging mips-fixes/mips-fixes (91dbd73a1739 mips/oprofile: Fix fallthrough placement)
Merging at91-fixes/at91-fixes (54ecb8f7028c Linux 5.4-rc1)
Merging omap-fixes/fixes (6542e2b613c2 ARM: dts: omap5: Fix DSI base address and clocks)
Merging kvm-fixes/master (b5331379bc62 KVM: arm64: Only reschedule if MMU_NOTIFIER_RANGE_BLOCKABLE is not set)
Merging kvms390-fixes/master (774911290c58 KVM: s390: reduce number of IO pins to 1)
Merging hwmon-fixes/hwmon (cecf7560f00a hwmon: (applesmc) check status earlier.)
Merging nvdimm-fixes/libnvdimm-fixes (c2affe920b0e dax: do not print error message for non-persistent memory block device)
Merging btrfs-fixes/next-fixes (c9f8e44ec4a5 Merge branch 'misc-5.9' into next-fixes)
Merging vfs-fixes/fixes (9d682ea6bcc7 vboxsf: Fix the check for the old binary mount-arguments struct)
Merging dma-mapping-fixes/for-linus (7dc6fd0f3b84 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
Merging drivers-x86-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging samsung-krzk-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging devicetree-fixes/dt/linus (5cd841d2676a dt-bindings: vendor-prefixes: Remove trailing whitespace)
Merging scsi-fixes/fixes (75d46c6d15ef scsi: scsi_debug: Remove superfluous close zone in resp_open_zone())
Merging drm-fixes/drm-fixes (d012a7190fc1 Linux 5.9-rc2)
Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue)
Merging drm-intel-fixes/for-linux-next-fixes (d012a7190fc1 Linux 5.9-rc2)
Merging mmc-fixes/fixes (710d4d916e6d dt-bindings: mmc: Add missing description for clk_in/out_sd1)
Merging rtc-fixes/rtc-fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging gnss-fixes/gnss-linus (48778464bb7d Linux 5.8-rc2)
Merging hyperv-fixes/hyperv-fixes (b46b4a8a57c3 hv_utils: drain the timesync packets on onchannelcallback)
Merging soc-fsl-fixes/fix (fe8fe7723a3a soc: fsl: dpio: register dpio irq handlers after dpio create)
Merging risc-v-fixes/fixes (0981b50cd6c7 riscv/mm: Simplify retry logic in do_page_fault())
Merging pidfd-fixes/fixes (bda4c60d02e9 sys: Convert to the new fallthrough notation)
Merging fpga-fixes/fixes (8614afd689df fpga: dfl: fix bug in port reset handshake)
Merging spdx/spdx-linus (9123e3a74ec7 Linux 5.9-rc1)
Merging gpio-intel-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging pinctrl-intel-fixes/fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging erofs-fixes/fixes (9ebcfadb0610 Linux 5.8-rc3)
Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc())
Merging kunit-fixes/kunit-fixes (9123e3a74ec7 Linux 5.9-rc1)
Merging ubifs-fixes/fixes (f37e99aca03f Merge tag 's390-5.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into master)
Merging memblock-fixes/fixes (bd05220c7be3 arch/ia64: Restore arch-specific pgd_offset_k implementation)
Merging drm-misc-fixes/for-linux-next-fixes (7fd5b25499bc drm/omap: fix incorrect lock state)
Merging kspp-gustavo/for-next/kspp (df561f6688fe treewide: Use fallthrough pseudo-keyword)
Merging kbuild/for-next (514bad879fdb Merge branch 'kconfig' into for-next)
CONFLICT (content): Merge conflict in scripts/kconfig/qconf.h
Merging compiler-attributes/compiler-attributes (98d54f81e36b Linux 5.6-rc4)
Merging dma-mapping/for-next (d7e673ec2c8e dma-pool: Only allocate from CMA when in same memory zone)
Merging asm-generic/master (060dc911501f nds32: fix build failure caused by page table folding updates)
Merging arc/for-next (def9d2780727 Linux 5.5-rc7)
Merging arm/for-next (4dffbda6a996 Merge branches 'fixes' and 'misc' into for-next)
Merging arm64/for-next/core (3df14264ad99 recordmcount: Fix build failure on non arm64)
Merging arm-perf/for-next/perf (55fdc1f44cd6 arm64: perf: Expose some new events via sysfs)
Merging arm-soc/for-next (2694ca73fa41 ARM: Document merges)
Merging amlogic/for-next (c943b84fab78 Merge branch 'v5.10/dt64' into tmp/aml-rebuild)
Merging aspeed/for-next (7c32a9d95c9a ARM: dts: aspeed: wedge40: Update UART4 pin settings)
Merging at91/at91-next (b68f43873b72 Merge branch 'at91-soc' into at91-next)
Merging drivers-memory/for-next (f42ae4bbf94c memory: brcmstb_dpfe: fix array index out of bounds)
Merging imx-mxs/for-next (427954264555 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (50c950e2c8b6 Merge branch 'for_5.9/driver-soc' into next)
Merging mediatek/for-next (647a84d1e4dc Merge branch 'v5.8-next/soc' into for-next)
Merging mvebu/for-next (29bd9d8c2ac1 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (390f789055a0 Merge branch 'omap-for-v5.10/dt' into for-next)
Merging qcom/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging raspberrypi/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging realtek/for-next (486f29df6941 Merge branch 'v5.8/dt' into next)
Merging renesas/next (15c95b417a9c Merge branches 'renesas-arm-defconfig-for-v5.10', 'renesas-arm-dt-for-v5.10' and 'renesas-drivers-for-v5.10' into renesas-next)
Merging reset/reset/next (2983e2385ff6 reset: imx7: add the cm4 reset for i.MX8MQ)
CONFLICT (content): Merge conflict in drivers/reset/reset-imx7.c
Merging rockchip/for-next (088d74f51158 Merge branch 'v5.9-clk/next' into for-next)
Merging samsung-krzk/for-next (f609c46be3ca Merge branch 'next/soc-s3c-cleanup' into for-next)
Merging scmi/for-linux-next (d012a7190fc1 Linux 5.9-rc2)
Merging sunxi/sunxi/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging tegra/for-next (8617339892a6 Merge branch for-5.9/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 (9123e3a74ec7 Linux 5.9-rc1)
Merging uniphier/for-next (4f8fb65af529 Merge branch 'dt64' into for-next)
Merging clk/clk-next (24907ec54702 Merge branch 'clk-fixes' into clk-next)
Merging clk-samsung/for-next (3d77e6a8804a Linux 5.7)
Merging csky/linux-next (bdcd93ef9afb csky: Add context tracking support)
Merging h8300/h8300-next (8808515be0ed h8300: Replace <linux/clk-provider.h> by <linux/of_clk.h>)
Merging ia64/next (1a9d3c34c593 x86/cpu: Add Lakefield, Alder Lake and Rocket Lake to Intel family)
Merging m68k/for-next (382f429bb559 m68k: defconfig: Update defconfigs for v5.8-rc3)
Merging m68knommu/for-next (0fdaa525ea1c binfmt_flat: revert "binfmt_flat: don't offset the data start")
Merging microblaze/next (b3a9e3b9622a Linux 5.8-rc1)
Merging mips/mips-next (625326ea9c84 MIPS: Remove PNX833x alias NXP_STB22x)
Merging nds32/next (0a2e478902c7 nds32: use get_kernel_nofault in dump_mem)
Merging nios2/for-next (6b57fa4d374b nios2: signal: Mark expected switch fall-through)
Merging openrisc/for-next (55b2662ec665 openrisc: uaccess: Add user address space check to access_ok)
Merging parisc-hd/for-next (bcf876870b95 Linux 5.8)
Merging powerpc/next (9123e3a74ec7 Linux 5.9-rc1)
Merging fsl/next (a76bea0287ce powerpc/kmcent2: add ranges to the pci bridges)
Merging soc-fsl/next (e9e4ef9116b1 soc: fsl: dpio: Remove unused inline function qbman_write_eqcr_am_rt_register)
Merging risc-v/for-next (f75fa0a51b8b efi: Rename arm-init to efi-init common for all arch)
Merging s390/features (9123e3a74ec7 Linux 5.9-rc1)
Merging sh/for-next (0c64a0dce51f sh: landisk: Add missing initialization of sh_io_port_base)
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 (f6e8c474390b um: virtio: Replace zero-length array with flexible-array)
Merging xtensa/xtensa-for-next (a0fc1436f1f4 xtensa: add missing exclusive access state management)
Merging fscrypt/master (55e32c54bbd5 fscrypt: don't load ->i_crypt_info before it's known to be valid)
Merging afs/afs-next (8409f67b6437 afs: Adjust the fileserver rotation algorithm to reprobe/retry more quickly)
Merging btrfs/for-next (e36d3dfd9828 Merge branch 'for-next-next-v5.9-20200824' into for-next-20200824)
Merging ceph/master (496ceaf12432 ceph: don't allow setlease on cephfs)
Merging cifs/for-next (d012a7190fc1 Linux 5.9-rc2)
Merging configfs/for-next (059ccbfff8a8 configfs: use flush file op to commit writes to a binary file)
Merging ecryptfs/next (8b614cb8f1dc Merge tag '5.6-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6)
Merging erofs/dev (cfcedfe21820 erofs: avoid duplicated permission check for "trusted." xattrs)
Merging exfat/dev (34d41dbe5455 exfat: use i_blocksize() to get blocksize)
Merging ext3/for_next (de575ac602ab Pull reiserfs spelling fixes.)
Merging ext4/dev (27bc446e2def ext4: limit the length of per-inode prealloc list)
Merging f2fs/dev (da0815f3bce1 f2fs: Use generic casefolding support)
Merging fsverity/fsverity (f3db0bed4583 fs-verity: use smp_load_acquire() for ->i_verity_info)
Merging fuse/for-next (9e9e23bd2d36 fuse: update project homepage)
Merging jfs/jfs-next (7aba5dcc2346 jfs: Replace zero-length array with flexible-array member)
Merging nfs/linux-next (d012a7190fc1 Linux 5.9-rc2)
Merging nfs-anna/linux-next (65caafd0d214 SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct IO compeletion"))
Merging nfsd/nfsd-next (9123e3a74ec7 Linux 5.9-rc1)
Merging cel/cel-next (ad112aa8b1ac SUNRPC: remove duplicate include)
Merging orangefs/for-next (e848643b524b orangefs: remove unnecessary assignment to variable ret)
Merging overlayfs/overlayfs-next (4518dfcf761e ovl: fix lookup of indexed hardlinks with metacopy)
Merging ubifs/next (798b7347e4f2 jffs2: fix UAF problem)
Merging v9fs/9p-next (2ed0b7578170 9p: Remove unneeded cast from memory allocation)
Merging xfs/for-next (96cf2a2c7556 xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init)
Merging zonefs/for-next (2f4b7462d2fa zonefs: update documentation to reflect zone size vs capacity)
Merging iomap/iomap-for-next (60263d5889e6 iomap: fall back to buffered writes for invalidation failures)
Merging djw-vfs/vfs-for-next (e4f9ba20d3b8 fs/xfs: Update xfs_ioctl_setattr_dax_invalidate())
Merging file-locks/locks-next (c0842fbc1b18 random32: move the pseudo-random 32-bit definitions to prandom.h)
Merging vfs/for-next (bcf876870b95 Linux 5.8)
Merging printk/for-next (20d6ee092831 Merge branch 'for-5.10' into for-next)
Merging pci/next (9123e3a74ec7 Linux 5.9-rc1)
Merging pstore/for-next/pstore (137c6236aeec mailmap: Add WeiXiong Liao)
CONFLICT (content): Merge conflict in .mailmap
Merging hid/for-next (de11ec5fedd9 Merge branch 'for-5.9/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (3f7462407ce3 Merge branch 'i2c/for-current' into i2c/for-next)
Merging i3c/i3c/next (9da36a7ec421 i3c: master add i3c_master_attach_boardinfo to preserve boardinfo)
Merging dmi/dmi-for-next (a3d13a0a23ea Replace HTTP links with HTTPS ones: DMI/SMBIOS SUPPORT)
Merging hwmon-staging/hwmon-next (314119a53803 dt-bindings: hwmon: Add bindings for ADM1266)
Merging jc_docs/docs-next (92001bc0365a Documentation: laptops: thinkpad-acpi: fix underline length build warning)
Merging v4l-dvb/master (9a538b83612c media: venus: core: Add support for opp tables/perf voting)
Merging v4l-dvb-next/master (0d6db85131e0 Revert "media: atomisp: keep the ISP powered on when setting it")
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (4958dfca3d0f Merge branch 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (99bcfd231280 cpufreq: tegra186: Fix initial frequency)
Merging cpupower/cpupower (527b7779e5ec cpupower: speed up generating git version string)
Merging devfreq/devfreq-next (9123e3a74ec7 Linux 5.9-rc1)
Merging opp/opp/linux-next (8c6269534d00 opp: Set required OPPs in reverse order when scaling down)
Merging thermal/thermal/linux-next (6f55be9fd5ee Merge branch 'thermal/fixes' into thermal/linux-next)
Merging thermal-rzhang/next (54ecb8f7028c Linux 5.4-rc1)
Merging thermal-soc/next (6c375eccded4 thermal: db8500: Rewrite to be a pure OF sensor)
Merging ieee1394/for-next (67f8e65e4fc1 firewire: net: remove set but not used variable 'guid')
Merging dlm/next (fa601a9ebd49 fs: dlm: implement tcp graceful shutdown)
Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
CONFLICT (content): Merge conflict in drivers/xen/swiotlb-xen.c
Merging rdma/for-next (c0f4979e90ea RDMA/cm: Remove unused cm_class)
Merging net-next/master (ca65a280fb4b sunrpc: Avoid comma separated statements)
Merging bpf-next/master (cd04b04de119 selftests/bpf: Add set test to resolve_btfids)
CONFLICT (content): Merge conflict in tools/lib/bpf/libbpf.c
Merging ipsec-next/master (da7955405fb2 sfc: Fix build with CONFIG_RFS_ACCEL disabled.)
Merging mlx5-next/mlx5-next (9123e3a74ec7 Linux 5.9-rc1)
Merging netfilter-next/master (d0a84e1f38d9 ethtool: allow flow-type ether without IP protocol field)
Merging ipvs-next/master (bfdd5aaa54b0 Merge tag 'Smack-for-5.9' of git://github.com/cschaufler/smack-next)
Merging wireless-drivers-next/master (eb77802e0daa Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (3b799254cf6f Bluetooth: hci_uart: Cancel init work before unregistering)
Merging mac80211-next/master (e5b15f5af21a Merge branch 'ptp-Add-generic-helper-functions')
Merging gfs2/for-next (e28c02b94f9e gfs2: When gfs2_dirty_inode gets a glock error, dump the glock)
Merging mtd/mtd/next (6a1380271b75 Merge tag 'nand/for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next)
Merging nand/nand/next (da151e3458c8 dt-bindings: mtd: fsl-upm-nand: Deprecate chip-delay and fsl, upm-wait-flags)
Merging spi-nor/spi-nor/next (e93a977367b2 mtd: revert "spi-nor: intel: provide a range for poll_timout")
Merging crypto/master (6779d0e6b0fe crypto: arm/curve25519 - include <linux/scatterlist.h>)
Merging drm/drm-next (62975d27d647 drm/ttm: revert "drm/ttm: make TT creation purely optional v3")
Merging amdgpu/drm-next (65ecc6928926 drm/amdgpu: add a wrapper for atom asic_init)
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu_v11_0.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/inc/smu11_driver_if_sienna_cichlid.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc_link.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/bios/command_table2.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Merging drm-intel/for-linux-next (ced026e959be drm/i915: Update DRIVER_DATE to 20200824)
Merging drm-tegra/drm/tegra/for-next (4fba6d22ca9a drm/tegra: plane: Support 180° rotation)
Merging drm-misc/for-linux-next (ebb21aa1882f drm/ttm: drop bus.size from bus placement.)
CONFLICT (content): Merge conflict in drivers/video/fbdev/savage/savagefb_driver.c
CONFLICT (content): Merge conflict in drivers/video/fbdev/atmel_lcdfb.c
CONFLICT (content): Merge conflict in drivers/video/fbdev/arcfb.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
Applying: fix interaction with drm-misc-fix commit
Merging drm-msm/msm-next (5e0c22d4a9dd drm/msm/a6xx: fix frequency not always being restored on GMU resume)
Merging mali-dp/for-upstream/mali-dp (f634c6a80287 dt/bindings: display: Add optional property node define for Mali DP500)
Merging imx-drm/imx-drm/next (efd5a93d2a89 drm/imx: drop explicit drm_mode_config_cleanup)
Merging etnaviv/etnaviv/next (c5d5a32ead1e drm/etnaviv: fix ref count leak via pm_runtime_get_sync)
Merging regmap/for-next (d012a7190fc1 Linux 5.9-rc2)
Merging sound/for-next (14b51ccd2674 ALSA: usb-audio: Correct wrongly matching entries with audio class)
Merging sound-asoc/for-next (cd018773c645 Merge remote-tracking branch 'asoc/for-5.10' into asoc-next)
Merging modules/modules-next (262e6ae7081d modules: inherit TAINT_PROPRIETARY_MODULE)
Merging input/next (9b5fbad1dcee Input: MT - avoid comma separated statements)
Merging block/for-next (86cfccb66937 Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
Merging device-mapper/for-next (a9cb9f4148ef dm: don't call report zones for more than the user requested)
Merging pcmcia/pcmcia-next (46d079790663 pcmcia: make pccard_loop_tuple() static)
Merging mmc/next (10a70e0d4edd Merge branch 'fixes' into next)
Merging mfd/for-mfd-next (c563a66537d2 mfd: rn5t618: Add a power supply subdevice)
Merging backlight/for-backlight-next (7eb99a39ef76 video: backlight: cr_bllcd: Remove unused variable 'intensity')
Merging battery/for-next (ef805f217709 dt-bindings: power: reset: Convert reboot-mode to YAML)
Merging regulator/for-next (79bb4ac46a7f Merge remote-tracking branch 'regulator/for-5.10' into regulator-next)
Merging security/next-testing (bc62d68e2a0a device_cgroup: Fix RCU list debugging warning)
Merging apparmor/apparmor-next (e37986097ba6 apparmor: Use true and false for bool variable)
Merging integrity/next-integrity (d012a7190fc1 Linux 5.9-rc2)
Merging keys/keys-next (b6f61c314649 keys: Implement update for the big_key type)
Merging safesetid/safesetid-next (0476c865ded6 LSM: SafeSetID: Fix warnings reported by test bot)
Merging selinux/next (1b8b31a2e612 selinux: convert policy read-write lock to RCU)
Merging smack/next (42a2df3e829f Smack: prevent underflow in smk_set_cipso())
Merging tomoyo/master (9123e3a74ec7 Linux 5.9-rc1)
Merging tpmdd/next (9123e3a74ec7 Linux 5.9-rc1)
Merging watchdog/master (18445bf405cb Merge tag 'spi-fix-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi)
Merging iommu/next (e46b3c0d011e Merge tag 'arm-smmu-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next)
Merging vfio/next (ccd59dce1a21 vfio/type1: Refactor vfio_iommu_type1_ioctl())
Merging audit/next (265c32072b0c audit: uninitialize variable audit_sig_sid)
Merging devicetree/for-next (7ba58fff001d dt-bindings: Validate DT binding schema in a single call)
Merging mailbox/mailbox-for-next (884996986347 mailbox: mediatek: cmdq: clear task in channel before shutdown)
Merging spi/for-next (410c081be7ac Merge remote-tracking branch 'spi/for-5.10' into spi-next)
Merging tip/auto-latest (21f294e9c2da Merge branch 'perf/core')
Merging clockevents/timers/drivers/next (9fba22584e54 clocksource: Ingenic: Add support for the Ingenic X1000 OST.)
Merging edac/edac-for-next (e9b46cc8e3eb Merge branch 'edac-misc' into edac-for-next)
Merging irqchip/irq/irqchip-next (821fc9e261f3 irqchip/ingenic: Leave parent IRQ unmasked on suspend)
Merging ftrace/for-next (38ce2a9e33db tracing: Add trace_array_init_printk() to initialize instance trace_printk() buffers)
Merging rcu/rcu/next (72cc80705122 rcu: Remove unused "cpu" parameter from rcu_report_qs_rdp())
Merging kvm/linux-next (e792415c5d3e KVM: MIPS/VZ: Fix build error caused by 'kvm_run' cleanup)
Merging kvm-arm/next (16314874b12b Merge branch 'kvm-arm64/misc-5.9' into kvmarm-master/next)
Merging kvm-ppc/kvm-ppc-next (81ab595ddd3c KVM: PPC: Book3S HV: Rework secure mem slot dropping)
Merging kvms390/next (23a60f834406 s390/kvm: diagnose 0x318 sync and reset)
Merging xen-tip/linux-next (ee87e1557c42 Fix build error when CONFIG_ACPI is not set/enabled:)
Merging percpu/for-next (4fa640dc5230 Merge tag 'vfio-v5.8-rc7' of git://github.com/awilliam/linux-vfio into master)
Merging workqueues/for-next (10cdb1575954 workqueue: use BUILD_BUG_ON() for compile time test instead of WARN_ON())
Merging drivers-x86/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging chrome-platform/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging hsi/for-next (bb6d3fb354c5 Linux 5.6-rc1)
Merging leds/for-next (242b81170fb8 leds: lp50xx: Add the LP50XX family of the RGB LED driver)
Merging ipmi/for-next (83dea1285672 char: ipmi: convert tasklets to use new tasklet_setup() API)
Merging driver-core/driver-core-next (9123e3a74ec7 Linux 5.9-rc1)
Merging usb/usb-next (28157b8c7d9a USB: Better name for __check_usb_generic())
Merging usb-gadget/next (f5e46aa4a124 usb: dwc3: gadget: when the started list is empty stop the active xfer)
Merging usb-serial/usb-next (9123e3a74ec7 Linux 5.9-rc1)
Merging usb-chipidea-next/ci-for-usb-next (58a3cefb3840 usb: chipidea: imx: add two samsung picophy parameters tuning implementation)
Merging phy-next/next (c42dcb195b2f phy: ti: j721e-wiz: Remove duplicate include)
Merging tty/tty-next (52c3c3a59234 Revert "vc_screen: extract vcs_read_buf_header")
Merging char-misc/char-misc-next (d162219c655c mei: virtio: virtualization frontend driver)
Merging extcon/extcon-next (57a3706b02e2 extcon: Replace HTTP links with HTTPS ones)
Merging soundwire/next (08abad9f45f1 soundwire: intel: refine runtime pm for SDW_INTEL_CLK_STOP_BUS_RESET)
Merging thunderbolt/next (d012a7190fc1 Linux 5.9-rc2)
Merging staging/staging-next (bc752d2f345b staging: hikey9xx: Kconfig: add regulator dependency)
Merging mux/for-next (05f19f7f8944 mux: adgs1408: Add mod_devicetable.h and remove of_match_ptr)
Merging icc/icc-next (12a400b016ab interconnect: Mark all dummy functions as static inline)
Merging dmaengine/next (78a2f92e4c4a dmaengine: axi-dmac: add support for reading bus attributes from registers)
Merging cgroup/for-next (936f2a70f207 cgroup: add cpu.stat file to root cgroup)
Merging scsi/for-next (7b08f25e38ce Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (32417d7844ab scsi: esas2r: Remove unnecessary casts)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
Merging vhost/linux-next (8a7c3213db06 vdpa/mlx5: fix up endian-ness for mtu)
Merging rpmsg/for-next (ca69dba7f13a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (22cc422070d9 gpio: wcove: Request IRQ after all initialisation done)
Merging gpio-brgl/gpio/for-next (01e8d85b68fd gpio: aggregator: Refactor ->{get, set}_multiple() to make Sparse happy)
Merging gpio-intel/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging pinctrl/for-next (fc80c51fd4b2 Merge tag 'kbuild-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging pinctrl-intel/for-next (04d53068508e pinctrl: intel: Update header block to reflect direct dependencies)
Merging pinctrl-samsung/for-next (9123e3a74ec7 Linux 5.9-rc1)
Merging pwm/for-next (6ced5ff0be8e pwm: bcm-iproc: handle clk_get_rate() return)
Merging userns/for-next (7fce69dff8db Implement kernel_execve)
Merging ktest/for-next (ff131efff141 ktest.pl: Fix spelling mistake "Cant" -> "Can't")
Merging random/dev (ab9a7e27044b random: avoid warnings for !CONFIG_NUMA builds)
Merging kselftest/next (9123e3a74ec7 Linux 5.9-rc1)
Merging y2038/y2038 (c4e71212a245 Revert "drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC")
Merging livepatching/for-next (bf14b015bf51 Merge branch 'for-5.9/selftests-cleanup' into for-next)
Merging coresight/next (ff1304be0a05 coresight: etm4x: Add Support for HiSilicon ETM device)
Merging rtc/rtc-next (9123e3a74ec7 Linux 5.9-rc1)
Merging nvdimm/libnvdimm-for-next (03b68d5d7d4b Merge branch 'for-5.9/copy_mc' into libnvdimm-for-next)
Merging at24/at24/for-next (99363d1c26c8 eeprom: at24: Tidy at24_read())
Merging ntb/ntb-next (b8e2c8bbdf77 NTB: Use struct_size() helper in devm_kzalloc())
Merging seccomp/for-next/seccomp (16b89f695313 net/scm: Fix typo in SCM_RIGHTS compat refactoring)
Merging kspp/for-next/kspp (55dde35fdb7f overflow: Add __must_check attribute to check_*() helpers)
Merging gnss/gnss-next (48778464bb7d Linux 5.8-rc2)
Merging fsi/next (4ca8b73f16f0 fsi: aspeed: Support CFAM reset GPIO)
Merging slimbus/for-next (b3a9e3b9622a Linux 5.8-rc1)
Merging nvmem/for-next (a24ef5be460b nvmem: qcom-spmi-sdam: Enable multiple devices)
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml
Merging xarray/xarray (27586ca786a7 XArray: Handle retry entries within xas_find_marked)
Merging hyperv/hyperv-next (49971e6bad2d drivers: hv: remove cast from hyperv_die_event)
Merging auxdisplay/auxdisplay (46d4a403a04c auxdisplay: Replace HTTP links with HTTPS ones)
Merging kgdb/kgdb/for-next (2c308ef41351 kgdb: Make "kgdbcon" work properly with "kgdb_earlycon")
Merging pidfd/for-next (da83d0cb9237 Merge branch 'cap_checkpoint_restore' into for-next)
Merging hmm/hmm (9123e3a74ec7 Linux 5.9-rc1)
Merging fpga/for-next (8a5de2de0339 fpga: dfl: change data type of feature id to u16)
Merging kunit/test (9123e3a74ec7 Linux 5.9-rc1)
Merging generic-ioremap/for-next (4bdc0d676a64 remove ioremap_nocache and devm_ioremap_nocache)
Merging cfi/cfi/next (11399346ac39 mtd: Replace zero-length array with flexible-array)
Merging kunit-next/kunit (9123e3a74ec7 Linux 5.9-rc1)
Merging trivial/for-next (c1a371cf80fb printk: fix global comment)
Merging zx2c4/for-next (16fbf79b0f83 Linux 5.6-rc7)
Merging mhi/mhi-next (18e9533ac877 bus: mhi: core: Introduce APIs to allocate and free the MHI controller)
Merging notifications/notifications-pipe-core (841a0dfa5113 watch_queue: sample: Display mount tree change notifications)
Merging memblock/for-next (762d4d1a174c arch/ia64: Restore arch-specific pgd_offset_k implementation)
Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy)
Merging akpm-current/current (e1df8eee6374 ROMFS: support inode blocks calculation)
$ git checkout -b akpm remotes/origin/akpm/master
$ git rebase --onto master remotes/origin/akpm/master-base
Merging akpm/master (47218ce75033 mm/mmap: add inline munmap_vma_range() for code readability)

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

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

* linux-next: Tree for Aug 26
@ 2019-08-26 13:44 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2019-08-26 13:44 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

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

Hi all,

Changes since 20190823:

The mips tree gained a conflict against the kbuild tree.

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

The drm tree gained conflicts against Linus' and the drm-misc-fixes trees.

The clockevents tree gained a conflict against the tip tree.

The gpio-brgl tree gained a conflict against the gpio tree.

The pinctrl tree gained a conflict against the gpio tree.

Non-merge commits (relative to Linus' tree): 8397
 8546 files changed, 418536 insertions(+), 239036 deletions(-)

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

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

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

Below is a summary of the state of the merge.

I am currently merging 309 trees (counting Linus' and 77 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 (a55aa89aab90 Linux 5.3-rc6)
Merging fixes/master (609488bc979f Linux 5.3-rc2)
Merging kbuild-current/fixes (451577f3e3a9 Merge tag 'kbuild-fixes-v5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
Merging arc-current/for-curr (e86d94fdda8e ARC: unwind: Mark expected switch fall-throughs)
Merging arm-current/fixes (693898371711 ARM: 8897/1: check stmfd instruction using right shift)
Merging arm-soc-fixes/arm/fixes (305cd70ec311 Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes)
Merging arm64-fixes/for-next/fixes (b6143d10d23e arm64: ftrace: Ensure module ftrace trampoline is coherent with I-side)
Merging m68k-current/for-linus (f28a1f16135c m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire)
Merging powerpc-fixes/fixes (b9ee5e04fd77 powerpc/64e: Drop stale call to smp_processor_id() which hangs SMP startup)
Merging s390-fixes/fixes (d45331b00ddb Linux 5.3-rc4)
Merging sparc/master (038029c03e21 sparc: remove unneeded uapi/asm/statfs.h)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (803f3e22ae10 ipv4: mpls: fix mpls_xmit for iptunnel)
Merging bpf/master (2c238177bd7f bpf: allow narrow loads of some sk_reuseport_md fields with offset > 0)
Merging ipsec/master (769a807d0b41 xfrm: policy: avoid warning splat when merging nodes)
Merging netfilter/master (211c46245215 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf)
Merging ipvs/master (58e8b37069ff Merge branch 'net-phy-dp83867-add-some-fixes')
Merging wireless-drivers/master (5a8c31aa6357 iwlwifi: pcie: fix recognition of QuZ devices)
Merging mac80211/master (0d31d4dbf384 Revert "cfg80211: fix processing world regdomain when non modular")
Merging rdma-fixes/for-rc (c536277e0db1 RDMA/siw: Fix 64/32bit pointer inconsistency)
Merging sound-current/for-linus (75545304eba6 ALSA: seq: Fix potential concurrent access to the deleted pool)
Merging sound-asoc-fixes/for-linus (f1ae2996ca31 Merge branch 'asoc-5.3' into asoc-linus)
Merging regmap-fixes/for-linus (0161b8716465 Merge branch 'regmap-5.3' into regmap-linus)
Merging regulator-fixes/for-linus (df932f9af7b2 Merge branch 'regulator-5.3' into regulator-linus)
Merging spi-fixes/for-linus (0fb2637a974f Merge branch 'spi-5.3' into spi-linus)
Merging pci-current/for-linus (7bafda88de20 Documentation PCI: Fix pciebus-howto.rst filename typo)
Merging driver-core.current/driver-core-linus (d45331b00ddb Linux 5.3-rc4)
Merging tty.current/tty-linus (d45331b00ddb Linux 5.3-rc4)
Merging usb.current/usb-linus (08d676d1685c usb-storage: Add new JMS567 revision to unusual_devs)
Merging usb-gadget-fixes/fixes (4a56a478a525 usb: gadget: mass_storage: Fix races between fsg_disable and fsg_set_alt)
Merging usb-serial-fixes/usb-linus (d1abaeb3be7b Linux 5.3-rc5)
Merging usb-chipidea-fixes/ci-for-usb-stable (16009db47c51 usb: chipidea: udc: workaround for endpoint conflict issue)
Merging phy/fixes (609488bc979f Linux 5.3-rc2)
Merging staging.current/staging-linus (d1abaeb3be7b Linux 5.3-rc5)
Merging char-misc.current/char-misc-linus (d1abaeb3be7b Linux 5.3-rc5)
Merging soundwire-fixes/fixes (d1abaeb3be7b Linux 5.3-rc5)
Merging thunderbolt-fixes/fixes (d1abaeb3be7b Linux 5.3-rc5)
Merging input-current/for-linus (849f5ae3a513 Input: iforce - add sanity checks)
Merging crypto-current/master (5871cd93692c crypto: ccp - Ignore unconfigured CCP device on suspend/resume)
Merging ide/master (baf6722aa0cb ide: Use dev_get_drvdata where possible)
Merging vfio-fixes/for-linus (5715c4dd66a3 vfio/mdev: Synchronize device create/remove with parent removal)
Merging kselftest-fixes/fixes (fbb01c52471c selftests/livepatch: push and pop dynamic debug config)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
Merging slave-dma-fixes/fixes (962411b05a6d dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe())
Merging backlight-fixes/for-backlight-fixes (e93c9c99a629 Linux 5.1)
Merging mtd-fixes/mtd/fixes (834de5c1aa76 mtd: spi-nor: Fix the disabling of write protection at init)
Merging mfd-fixes/for-mfd-fixes (63b2de12b7ee mfd: stmfx: Fix an endian bug in stmfx_irq_handler())
Merging v4l-dvb-fixes/fixes (92f5b0313e37 media: vivid: fix missing cec adapter name)
Merging reset-fixes/reset/fixes (a71dcd3757e2 reset: remove redundant null check on pointer dev)
Merging mips-fixes/mips-fixes (74034a09267c MIPS: BCM63XX: Mark expected switch fall-through)
Merging at91-fixes/at91-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging omap-fixes/fixes (4a65bbb9109e soc: ti: pm33xx: Make two symbols static)
Merging kvm-fixes/master (e4427372398c selftests/kvm: make platform_info_test pass on AMD)
Merging kvms390-fixes/master (a86cb413f4bf KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID)
Merging hwmon-fixes/hwmon (c4bd7a9ca612 hwmon (coretemp) Fix a memory leak bug)
Merging nvdimm-fixes/libnvdimm-fixes (06282373ff57 mm/memremap: Fix reuse of pgmap instances with internal references)
Merging btrfs-fixes/next-fixes (2384eefd74b8 Merge branch 'misc-5.3' into next-fixes)
Merging vfs-fixes/fixes (e272d4fb74d6 configfs: fix a deadlock in configfs_symlink())
Merging dma-mapping-fixes/for-linus (33dcb37cef74 dma-mapping: fix page attributes for dma_mmap_*)
Merging i3c-fixes/master (6fbc7275c7a9 Linux 5.2-rc7)
Merging drivers-x86-fixes/fixes (d45331b00ddb Linux 5.3-rc4)
Merging samsung-krzk-fixes/fixes (5f9e832c1370 Linus 5.3-rc1)
Merging pinctrl-samsung-fixes/pinctrl-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging devicetree-fixes/dt/linus (83f82d7a4258 of: irq: fix a trivial typo in a doc comment)
Merging scsi-fixes/fixes (77ffd3465ba8 scsi: lpfc: Mitigate high memory pre-allocation by SCSI-MQ)
Merging drm-fixes/drm-fixes (7837951a12fd drm/mediatek: include dma-mapping header)
Merging amdgpu-fixes/drm-fixes (664be84b22f1 drm/amdgpu: fix dma_fence_wait without reference)
Merging drm-intel-fixes/for-linux-next-fixes (ed19e3035c5a drm/i915: Fix HW readout for crtc_clock in HDMI mode)
Merging mmc-fixes/fixes (7871aa60ae00 mmc: sdhci-of-at91: add quirk for broken HS200)
Merging rtc-fixes/rtc-fixes (5f9e832c1370 Linus 5.3-rc1)
Merging gnss-fixes/gnss-linus (f2c7c76c5d0a Linux 5.2-rc3)
Merging hyperv-fixes/hyperv-fixes (a9fc4340aee0 Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE)
Merging soc-fsl-fixes/fix (5674a92ca4b7 soc/fsl/qe: Fix an error code in qe_pin_request())
Merging risc-v-fixes/fixes (69703eb9a8ae riscv: Make __fstate_clean() work correctly.)
Merging pidfd-fixes/fixes (d45331b00ddb Linux 5.3-rc4)
Merging fpga-fixes/fixes (dec43da46f63 fpga: altera-ps-spi: Fix getting of optional confd gpio)
Merging spdx/spdx-linus (d1abaeb3be7b Linux 5.3-rc5)
Merging gpio-intel-fixes/fixes (5f9e832c1370 Linus 5.3-rc1)
Merging pinctrl-intel-fixes/fixes (5f9e832c1370 Linus 5.3-rc1)
Merging drm-misc-fixes/for-linux-next-fixes (51a44a28eefd drm/komeda: Add missing of_node_get() call)
Merging kspp-gustavo/for-next/kspp (b8bff75a934c usb: udc: lpc32xx: Silence fall-through warning)
Merging kbuild/for-next (3e4c6948e78b kbuild: remove unneeded '+' marker from kselftest-merge)
Merging compiler-attributes/compiler-attributes (6c4d6bc54864 auxdisplay: Fix a typo in cfag12864b-example.c)
Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1)
Merging dma-mapping/for-next (90ae409f9eb3 dma-direct: fix zone selection after an unaddressable CMA allocation)
Merging asm-generic/master (7f3a8dff1219 asm-generic: remove ptrace.h)
Merging arc/for-next (6fbc7275c7a9 Linux 5.2-rc7)
Merging arm/for-next (693898371711 ARM: 8897/1: check stmfd instruction using right shift)
Merging arm64/for-next/core (0b9b00029758 Merge branch 'for-next/rng' into for-next/core)
Merging arm-perf/for-next/perf (d91cc2f46ad5 arm64: perf_event: Add missing header needed for smp_processor_id())
Merging arm-soc/for-next (50e5bf56ba2f arm-soc: document merges)
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
Merging amlogic/for-next (ee3a3568256e Merge branch 'v5.4/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (ba0fdbb07d05 Merge branch 'dt-for-v5.4' into for-next)
Merging at91/at91-next (1069a5a3f3d8 Merge branches 'at91-soc' and 'at91-dt' into at91-next)
Merging bcm2835/for-next (c165c01bb6f7 Merge branch 'bcm2835-dt-next' into for-next)
Merging imx-mxs/for-next (d26d83e3e1fc Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (78145dbeaea1 Merge branch 'for_5.3/driver-soc' into next)
Merging mediatek/for-next (4ae1ce88e9a0 Merge branch 'v5.3-next/soc' into for-next)
Merging mvebu/for-next (e1b0b32a5ad6 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (29baae1e8b9d Merge branch 'omap-for-v5.4/dt' into for-next)
Merging qcom/for-next (0145244b7ab9 Merge branches 'arm64-for-5.4', 'arm64-defconfig-for-5.4' and 'drivers-for-5.4' into for-next)
Merging renesas/next (45f5d5a9e34d arm64: dts: renesas: r8a77995: draak: Fix backlight regulator name)
Merging renesas-geert/next (542934456db5 Merge branch 'renesas-drivers-for-v5.4' into renesas-next)
Merging reset/reset/next (ea651ffd4f7f reset: Add DesignWare IP support to simple reset)
Merging rockchip/for-next (f1c4b612a23c Merge branch 'v5.4-armsoc/dts64' into for-next)
Merging samsung-krzk/for-next (b2ee857b8174 Merge branch 'next/soc' into for-next)
Merging scmi/for-linux-next (d1abaeb3be7b Linux 5.3-rc5)
Merging sunxi/sunxi/for-next (15ea63583bfb Merge branch 'sunxi/dt-for-5.4' into sunxi/for-next)
Merging tegra/for-next (6290ae1fb7e2 Merge branch for-5.4/firmware into for-next)
Merging clk/clk-next (4c1fc2c811fb Merge branch 'clk-doc' into clk-next)
Merging clk-samsung/for-next (a188339ca5a3 Linux 5.2-rc1)
Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging csky/linux-next (4ad35c1f5638 csky: Fixup 610 vipt cache flush mechanism)
Merging h8300/h8300-next (a5de8865cb3e h8300: move definition of __kernel_size_t etc. to posix_types.h)
Merging ia64/next (0d3d343560ba genirq: remove the is_affinity_mask_valid hook)
Merging m68k/for-next (49ff824a028a m68k: defconfig: Update defconfigs for v5.3-rc2)
Merging m68knommu/for-next (25585842f0ab m68k: coldfire: Include the GPIO driver header)
Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
Merging mips/mips-next (b4742e6682d5 MIPS: dts: mscc: describe the PTP ready interrupt)
CONFLICT (content): Merge conflict in arch/mips/include/asm/vdso/vdso.h
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (content): Merge conflict in Documentation/index.rst
Merging nds32/next (932296120543 nds32: add new emulations for floating point instruction)
Merging nios2/for-next (f017da5c7077 nios2: configs: Remove useless UEVENT_HELPER_PATH)
Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
Merging parisc-hd/for-next (a5ff2130a4d9 parisc: speed up flush_tlb_all_local with qemu)
Merging powerpc/next (42ac26d253eb powerpc: add machine check safe copy_to_user)
Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
Merging soc-fsl/next (eadf0b17b43d bus: fsl-mc: remove explicit device_link_del)
Merging risc-v/for-next (f51edcec5288 MAINTAINERS: Add an entry for generic architecture topology)
Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
Merging s390/features (416f79c23dbe s390/paes: Prepare paes functions for large key blobs)
Merging sh/sh-next (baf58858e8b6 sh: prefer __section from compiler_attributes.h)
CONFLICT (modify/delete): arch/sh/include/uapi/asm/types.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/types.h left in tree.
CONFLICT (modify/delete): arch/sh/include/uapi/asm/setup.h deleted in sh/sh-next and modified in HEAD. Version HEAD of arch/sh/include/uapi/asm/setup.h left in tree.
$ git rm -f arch/sh/include/uapi/asm/setup.h arch/sh/include/uapi/asm/types.h
Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging uml/linux-next (e0917f879536 um: fix time travel mode)
Merging xtensa/xtensa-for-next (fa4b55813b1e Merge branch 'xtensa-5.3' into xtensa-for-next)
Merging fscrypt/master (ba13f2c8d7a0 fscrypt: document the new ioctls and policy version)
Merging afs/afs-next (986d1c7de75a afs: Fix possible oops in afs_lookup trace event)
Merging btrfs/next (29dcea88779c Linux 4.17)
Merging btrfs-kdave/for-next (a668d8d6543c Merge branch 'cleanup/sysfs-refactoring' into for-next-20190805)
CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c
CONFLICT (content): Merge conflict in fs/btrfs/ctree.h
Applying: btrfs: merge fix up for "Btrfs: fix sysfs warning and missing raid sysfs directories"
Merging ceph/master (a561372405cf libceph: fix PG split vs OSD (re)connect race)
Merging cifs/for-next (0c219f5799c7 cifs: set domainName when a domain-key is used in multiuser)
Merging configfs/for-next (f6122ed2a4f9 configfs: Fix use-after-free when accessing sd->s_dentry)
Merging ecryptfs/next (b4a81b87a4cf ecryptfs: fix a memory leak bug in ecryptfs_init_messaging())
Merging ext3/for_next (56db1991690f udf: prevent allocation beyond UDF partition)
Merging ext4/dev (c747f2a0aa5e ext4: fix potential use after free after remounting with noblock_validity)
CONFLICT (content): Merge conflict in fs/ext4/ioctl.c
Merging f2fs/dev (f29beaf87a06 f2fs: Fix indefinite loop in f2fs_gc())
Merging fsverity/fsverity (95ae251fe828 f2fs: add fs-verity support)
CONFLICT (content): Merge conflict in fs/f2fs/inode.c
CONFLICT (content): Merge conflict in fs/f2fs/file.c
CONFLICT (content): Merge conflict in fs/ext4/ioctl.c
Merging fuse/for-next (e7d6cd694383 fuse: cleanup fuse_wait_on_page_writeback)
Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization)
Merging nfs/linux-next (aefb623c422e NFS: Fix writepage(s) error handling to not report errors twice)
Merging nfs-anna/linux-next (f836b27ecad9 NFS: Have nfs4_proc_get_lease_time() call nfs4_call_sync_custom())
Merging nfsd/nfsd-next (bb13f35b96f4 nfsd: remove duplicated include from filecache.c)
Merging orangefs/for-next (e65682b55956 orangefs: eliminate needless variable assignments)
Merging overlayfs/overlayfs-next (0be0bfd2de9d ovl: fix regression caused by overlapping layers detection)
Merging ubifs/linux-next (0af83abbd4a6 ubifs: Limit the number of pages in shrink_liability)
Merging v9fs/9p-next (80a316ff1627 9p/xen: Add cleanup path in p9_trans_xen_init)
Merging xfs/for-next (1fb254aa983b xfs: fix missing ILOCK unlock when xfs_setattr_nonsize fails due to EDQUOT)
Merging iomap/iomap-for-next (791ee52eb10b iomap: Fix trivial typo)
Merging djw-vfs/vfs-for-next (dc617f29dbe5 vfs: don't allow writes to swap files)
Merging file-locks/locks-next (cfddf9f4c9f0 locks: fix a memory leak bug in __break_lease())
Merging vfs/for-next (dad5ea4bac62 ceph_real_mount(): missing initialization)
CONFLICT (content): Merge conflict in fs/ubifs/super.c
CONFLICT (content): Merge conflict in fs/gfs2/super.c
CONFLICT (content): Merge conflict in fs/ceph/super.c
CONFLICT (modify/delete): Documentation/filesystems/vfs.txt deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of Documentation/filesystems/vfs.txt left in tree.
$ git rm -f Documentation/filesystems/vfs.txt
Applying: docs: filesystems: vfs: update for "vfs: Kill mount_single()"
Merging printk/for-next (ba174ef6d224 Merge branch 'for-5.3-fixes' into for-next)
Merging pci/next (01c06bce49c0 Merge branch 'pci/trivial')
Merging pstore/for-next/pstore (609488bc979f Linux 5.3-rc2)
Merging hid/for-next (04db301da38e Merge branch 'for-5.4/logitech' into for-next)
Merging i2c/i2c/for-next (cf254eed8bd5 Merge branch 'i2c/for-5.4' into i2c/for-next)
Merging i3c/i3c/next (7afe9a4e5665 i3c: master: fix a memory leak bug)
Merging dmi/master (57361846b52b Linux 4.19-rc2)
Merging hwmon-staging/hwmon-next (5d0bd5d101dc dt-bindings: Add ipsps1 as a trivial device)
Merging jc_docs/docs-next (5aff7c46172b docs: process: fix broken link)
CONFLICT (add/add): Merge conflict in Documentation/mips/index.rst
CONFLICT (content): Merge conflict in Documentation/admin-guide/cifs/todo.rst
Merging v4l-dvb/master (577bbf23b758 media: sunxi: Add A10 CSI driver)
Merging v4l-dvb-next/master (5f9e832c1370 Linus 5.3-rc1)
Merging fbdev/fbdev-for-next (732146a3f1dc video: fbdev: imxfb: fix a typo in imxfb_probe())
Merging pm/linux-next (563a965beb53 Merge branch 'pm-cpufreq' into linux-next)
Merging cpufreq-arm/cpufreq/arm/linux-next (793d1adff3b7 Merge branch 'cpufreq/qcom-updates' into cpufreq/arm/linux-next)
Merging cpupower/cpupower (04507c0a9385 cpupower : frequency-set -r option misses the last cpu in related cpu list)
Merging opp/opp/linux-next (0203c0343a1f Merge branch 'opp/qcom-updates' into opp/linux-next)
Merging thermal/next (a640c5c90f12 Merge branches 'thermal-core' and 'thermal-intel' into next)
CONFLICT (content): Merge conflict in Documentation/driver-api/thermal/index.rst
Merging thermal-soc/next (4cb9f043447e thermal: thermal_mmio: remove some dead code)
Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs)
Merging dlm/next (a48f9721e6db dlm: no need to check return value of debugfs_create functions)
Merging swiotlb/linux-next (4cdfb27ba80d xen/swiotlb: remember having called xen_create_contiguous_region())
Merging rdma/for-next (868df536f5e8 Merge branch 'odp_fixes' into rdma.git for-next)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mlx5_ib.h
Merging net-next/master (c1236979b4d2 net: phy: sfp: Add labels to hwmon sensors)
CONFLICT (content): Merge conflict in scripts/link-vmlinux.sh
CONFLICT (content): Merge conflict in drivers/pci/controller/pci-hyperv.c
CONFLICT (content): Merge conflict in drivers/pci/Kconfig
CONFLICT (content): Merge conflict in drivers/net/ethernet/realtek/r8169_main.c
Merging bpf-next/master (0bb52b0dfc88 tools: bpftool: add "bpftool map freeze" subcommand)
Merging ipsec-next/master (c7b37c769d2a xfrm: remove get_mtu indirection from xfrm_type)
Merging mlx5-next/mlx5-next (e6806e9a63a7 net/mlx5: Create bypass and loopback flow steering namespaces for RDMA RX)
Merging netfilter-next/master (20e79a0a2cfd net: hns: add phy_attached_info() to the hns driver)
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
CONFLICT (content): Merge conflict in drivers/nfc/st21nfca/se.c
Merging ipvs-next/master (1b0b807dd746 Merge branch 'r8169-fw')
Merging wireless-drivers-next/master (932630fa9028 Merge tag 'wireless-drivers-next-for-davem-2019-08-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next)
Merging bluetooth/master (cf80618a8402 Bluetooth: hci_qca: Use kfree_skb() instead of kfree())
Merging mac80211-next/master (48cb39522a9d mac80211: minstrel_ht: improve rate probing for devices with static fallback)
Merging gfs2/for-next (1e5227a3a98b gfs2: Fix possible fs name overflows)
Merging mtd/mtd/next (5f9e832c1370 Linus 5.3-rc1)
Merging nand/nand/next (80107e764846 mtd: rawnand: remove redundant assignment to variable ret)
Merging spi-nor/spi-nor/next (913787ca40b9 mtd: spi-nor: intel-spi: Whitelist 4B read commands)
Merging crypto/master (e31b791fae32 crypto: talitos - Fix build warning in aead_des3_setkey)
CONFLICT (content): Merge conflict in arch/x86/purgatory/Makefile
Merging drm/drm-next (34044cd2955b Merge branch 'linux-5.4' of git://github.com/skeggsb/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/mediatek/mtk_drm_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/arm/display/komeda/komeda_dev.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
Merging amdgpu/drm-next (39d334c12477 drm/amdkfd: Remove GPU ID in GWS queue creation)
CONFLICT (content): Merge conflict in include/uapi/linux/kfd_ioctl.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
Merging drm-intel/for-linux-next (529880098431 drm/i915: to make vgpu ppgtt notificaiton as atomic operation)
Merging drm-tegra/drm/tegra/for-next (2a6fc3cb5cb6 drm/tegra: Fix gpiod_get_from_of_node() regression)
Merging drm-misc/for-linux-next (6dbe0c4b0fc0 drm/panel: Initialise panel dev and funcs through drm_panel_init())
Merging drm-msm/msm-next (ddc73f32ba95 drm/msm: drop use of drmP.h)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_atomic.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
Merging mali-dp/for-upstream/mali-dp (4cf643a39221 Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next)
Merging imx-drm/imx-drm/next (4d24376370fb gpu: ipu-v3: image-convert: only sample into the next tile if necessary)
Merging etnaviv/etnaviv/next (088880ddc0b2 drm/etnaviv: implement softpin)
Merging regmap/for-next (1bd4584626a9 Merge branch 'regmap-5.4' into regmap-next)
Merging sound/for-next (e0ccdef92653 ALSA: usb-audio: Clean up check_input_term())
Merging sound-asoc/for-next (6830feb69669 Merge branch 'asoc-5.4' into asoc-next)
Merging modules/modules-next (3b5be16c7e90 modules: page-align module section allocations only for arches supporting strict module rwx)
Merging input/next (e95656ea15e5 Input: add support for polling to input devices)
Merging block/for-next (fcf75acca7b3 Merge branch 'for-5.4/block' into for-next)
Merging device-mapper/for-next (88cd3e6cfac9 dm verity: add root hash pkcs#7 signature verification)
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
Merging mmc/next (09eed7fffd33 mmc: Add support for the ASPEED SD controller)
Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c
Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
Merging mfd/for-mfd-next (5cd690a308e8 mfd: asic3: Include the right header)
Merging backlight/for-backlight-next (73fbfc499448 backlight: pwm_bl: Fix heuristic to determine number of brightness levels)
Merging battery/for-next (5f9e832c1370 Linus 5.3-rc1)
Merging regulator/for-next (019dcb803859 Merge branch 'regulator-5.4' into regulator-next)
Merging security/next-testing (b602614a8107 lockdown: Print current->comm in restriction messages)
CONFLICT (content): Merge conflict in security/integrity/ima/Kconfig
CONFLICT (content): Merge conflict in kernel/trace/trace_kprobe.c
CONFLICT (content): Merge conflict in fs/tracefs/inode.c
CONFLICT (modify/delete): arch/s390/configs/performance_defconfig deleted in HEAD and modified in security/next-testing. Version security/next-testing of arch/s390/configs/performance_defconfig left in tree.
CONFLICT (content): Merge conflict in arch/s390/configs/defconfig
CONFLICT (content): Merge conflict in arch/s390/configs/debug_defconfig
$ git rm -f arch/s390/configs/performance_defconfig
Merging apparmor/apparmor-next (136db994852a apparmor: increase left match history buffer size)
Merging integrity/next-integrity (70433f67ec3a MODSIGN: make new include file self contained)
CONFLICT (content): Merge conflict in arch/s390/kernel/machine_kexec_file.c
Merging keys/keys-next (8cf8684e0d24 Merge branch 'keys-acl' into keys-next)
CONFLICT (content): Merge conflict in include/linux/key.h
CONFLICT (modify/delete): fs/crypto/keyinfo.c deleted in HEAD and modified in keys/keys-next. Version keys/keys-next of fs/crypto/keyinfo.c left in tree.
CONFLICT (content): Merge conflict in fs/afs/security.c
$ git rm -f fs/crypto/keyinfo.c
Applying: fsverity: merge fix for keyring_alloc API change
Applying: fscrypt: merge resolution for "keys: Replace uid/gid/perm permissions checking with an ACL"
Applying: dm verity: merge fix for "keys: Replace uid/gid/perm permissions checking with an ACL"
Merging selinux/next (ac5656d8a4cd fanotify, inotify, dnotify, security: add security hook for fs notifications)
Merging tpmdd/next (d1abaeb3be7b Linux 5.3-rc5)
Merging watchdog/master (194108705c9e watchdog: remove w90x900 driver)
Merging iommu/next (b912da3e6f22 Merge branches 'arm/omap', 'arm/exynos', 'x86/amd' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/panfrost/panfrost_mmu.c
Merging vfio/next (e6c5d727db0a Merge branches 'v5.4/vfio/alexey-tce-memory-free-v1', 'v5.4/vfio/connie-re-arrange-v2', 'v5.4/vfio/hexin-pci-reset-v3', 'v5.4/vfio/parav-mtty-uuid-v2' and 'v5.4/vfio/shameer-iova-list-v8' into v5.4/vfio/next)
Merging audit/next (5f9e832c1370 Linus 5.3-rc1)
Merging devicetree/for-next (f981322804ca dt-bindings: rng: mtk-rng: Add documentation for MT8516)
CONFLICT (add/add): Merge conflict in Documentation/devicetree/writing-schema.rst
Merging mailbox/mailbox-for-next (25777e5784a7 mailbox: handle failed named mailbox channel request)
Merging spi/for-next (0d74f1aadc37 Merge branch 'spi-5.4' into spi-next)
Merging tip/auto-latest (02c12a148262 Merge branch 'WIP.timers/core')
CONFLICT (content): Merge conflict in arch/ia64/include/asm/sn/sn_sal.h
Merging clockevents/clockevents/next (befd04abfbe4 clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated)
CONFLICT (content): Merge conflict in kernel/time/posix-timers.c
Merging edac/edac-for-next (81f5090db843 EDAC/amd64: Support asymmetric dual-rank DIMMs)
Merging irqchip/irq/irqchip-next (6c9050a73469 irqchip: Remove dev_err() usage after platform_get_irq())
CONFLICT (content): Merge conflict in drivers/pci/controller/pci-hyperv.c
Merging ftrace/for-next (6d54ceb539aa tracing: Fix user stack trace "??" output)
Merging rcu/rcu/next (07f038a408fb Merge LKMM and RCU commits)
Merging kvm/linux-next (b6852ae75d4b KVM: VMX: Fix and tweak the comments for VM-Enter)
Merging kvm-arm/next (3109741a8d77 KVM: arm/arm64: vgic: Use a single IO device per redistributor)
Merging kvm-ppc/kvm-ppc-next (d22deab6960a KVM: PPC: Book3S HV: Define usage types for rmap array in guest memslot)
Merging kvms390/next (a049a377164c KVM: selftests: Enable dirty_log_test on s390x)
Merging xen-tip/linux-next (b877ac9815a8 xen/swiotlb: remember having called xen_create_contiguous_region())
Merging percpu/for-next (03ed70fb0e5e Merge branch 'for-5.3' into for-next)
Merging workqueues/for-next (be69d00d9769 workqueue: Remove GPF argument from alloc_workqueue_attrs())
Merging drivers-x86/for-next (109e8adfbc66 platform/x86: asus-wmi: Remove unnecessary blank lines)
Merging chrome-platform/for-next (5f9e832c1370 Linus 5.3-rc1)
Merging hsi/for-next (c1030cd45619 HSI: Remove dev_err() usage after platform_get_irq())
Merging leds/for-next (192263c576ef leds: Allow to call led_classdev_unregister() unconditionally)
Merging ipmi/for-next (383035211c79 ipmi: move message error checking to avoid deadlock)
Merging driver-core/driver-core-next (2a77eec0d3ca devcoredump: fix typo in comment)
CONFLICT (content): Merge conflict in drivers/base/power/runtime.c
Merging usb/usb-next (cdfee5623290 driver core: initialize a default DMA mask for platform device)
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
Merging usb-gadget/next (b2357839c56a usb: renesas_usbhs: add a workaround for a race condition of workqueue)
Merging usb-serial/usb-next (e21a712a9685 Linux 5.3-rc3)
Merging usb-chipidea-next/ci-for-usb-next (034252e37b31 usb: chipidea: msm: Use devm_platform_ioremap_resource())
Merging phy-next/next (24673db15999 phy-rockchip-inno-hdmi: Fix RK3328_TERM_RESISTOR_CALIB_SPEED_7_0's third value)
Merging tty/tty-next (591f4ea2ed61 serial: 8250_pci: Add F81504A series Support)
Merging char-misc/char-misc-next (3b420aeb7525 misc: xilinx_sdfec: fix spelling mistake: "Schdule" -> "Schedule")
Merging extcon/extcon-next (a3fc57233977 extcon: adc-jack: Remove dev_err() usage after platform_get_irq())
Merging soundwire/next (395713d8ca43 soundwire: intel: handle disabled links)
Merging thunderbolt/next (04f7745300ed thunderbolt: Show key using %*pE not %*pEp)
Merging staging/staging-next (cadcc6b20d97 staging: rtl8192u: Add space around binary operators)
Merging mux/for-next (05fb8284a417 Merge branch 'i2c-mux/for-next' into for-next)
Merging icc/icc-next (6311b6521bcc drivers: qcom: Add BCM vote macro to header)
Merging slave-dma/next (d071fd294f24 dmaengine: change alignment of mux_configure32 and fsl_edma_chan_mux)
Merging cgroup/for-next (653a23ca7e1e Use kvmalloc in cgroups-v1)
Merging scsi/for-next (e2e73febeae8 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (c54591a3c8b8 Merge branch '5.4/scsi-queue' into 5.4/scsi-next)
Merging vhost/linux-next (73f628ec9e6b vhost: disable metadata prefetch optimization)
Merging rpmsg/for-next (7f1345e9efcc Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (7afb6b237bb5 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-ixp4xx.c
Merging gpio-brgl/gpio/for-next (f2ee73147a3f gpio: lpc32xx: allow building on non-lpc32xx targets)
CONFLICT (content): Merge conflict in include/linux/gpio/driver.h
Merging gpio-intel/for-next (a7db285664dd gpio: pch: Use dev_get_drvdata)
Merging pinctrl/for-next (7c772bed431c Merge tag 'sh-pfc-for-v5.4-tag2' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel)
CONFLICT (content): Merge conflict in drivers/pinctrl/bcm/pinctrl-bcm2835.c
Merging pinctrl-intel/for-next (6cb0880f0822 pinctrl: intel: remap the pin number to gpio offset for irq enabled pin)
Merging pinctrl-samsung/for-next (10971e2ab6eb pinctrl: samsung: Fix device node refcount leaks in init code)
Merging pwm/for-next (6cf9481b440d pwm: Fallback to the static lookup-list when acpi_pwm_get fails)
Merging userns/for-next (318759b4737c signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus)
Merging ktest/for-next (aecea57f84b0 ktest: Fix some typos in config-bisect.pl)
Merging random/dev (58be0106c530 random: fix soft lockup when trying to read from an uninitialized blocking pool)
Merging kselftest/next (49435c478386 MAINTAINERS: add proc sysctl KUnit test to PROC SYSCTL section)
Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI)
CONFLICT (content): Merge conflict in arch/riscv/include/uapi/asm/unistd.h
Merging livepatching/for-next (1cfe141e1715 Merge branch 'for-5.4-core' into for-next)
Merging coresight/next (ac8bd58d7f44 coresight: tmc-etr: Fix perf_data check)
Merging rtc/rtc-next (36180aed4cd2 rtc: pcf2127: add tamper detection support)
Merging nvdimm/libnvdimm-for-next (cb3110f7452d Merge branch 'for-5.3/dax' into libnvdimm-for-next)
Merging at24/at24/for-next (10742fee98eb eeprom: at24: remove unneeded include)
Merging ntb/ntb-next (5f9e832c1370 Linus 5.3-rc1)
Merging kspp/for-next/kspp (60f2c82ed20b randstruct: Check member structs in is_pure_ops_struct())
Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1)
Merging gnss/gnss-next (f2c7c76c5d0a Linux 5.2-rc3)
Merging fsi/next (799e064cc79e fsi: scom: Don't abort operations for minor errors)
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
Merging slimbus/for-next (0a43bffb7e21 slimbus: fix slim_tid_txn())
Merging nvmem/for-next (8555b95dbd8b nvmem: imx: add i.MX8QM platform support)
Merging xarray/xarray (91abab83839a XArray: Fix xas_next() with a single entry at 0)
Merging hyperv/hyperv-next (9b5434196529 Tools: hv: move to tools buildsystem)
Merging auxdisplay/auxdisplay (a180d023ec7b auxdisplay: ht16k33: Make ht16k33_fb_fix and ht16k33_fb_var constant)
Merging kgdb-dt/kgdb/for-next (ca976bfb3154 kdb: Fix bound check compiler warning)
Merging pidfd/for-next (590ef0128b42 waitid: Add support for waiting for the current process group)
Merging devfreq/for-next (0ef7c7cce43f PM / devfreq: passive: Use non-devm notifiers)
Merging hmm/hmm (6869b7b20659 memremap: provide a not device managed memremap_pages)
Merging fpga/for-next (e58915179f3f fpga: altera-cvp: Add Stratix10 (V2) Support)
Merging akpm-current/current (4d7b1ed2501f ipc/msg.c: consolidate all xxxctl_down() functions)
CONFLICT (content): Merge conflict in include/linux/memremap.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h
CONFLICT (content): Merge conflict in arch/arm/Kconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: pinctrl: fix pxa2xx.c build warnings
Applying: lib: untag user pointers in strn*_user
Applying: mm: untag user pointers passed to memory syscalls
Applying: mm: untag user pointers in mm/gup.c
Applying: mm: untag user pointers in get_vaddr_frames
Applying: fs/namespace: untag user pointers in copy_mount_options
Applying: userfaultfd: untag user pointers
Applying: drm/amdgpu: untag user pointers
Applying: drm/radeon: untag user pointers in radeon_gem_userptr_ioctl
Applying: media/v4l2-core: untag user pointers in videobuf_dma_contig_user_get
Applying: tee/shm: untag user pointers in tee_shm_register
Applying: vfio/type1: untag user pointers in vaddr_get_pfn
Applying: mm: untag user pointers in mmap/munmap/mremap/brk
Applying: hexagon: drop empty and unused free_initrd_mem
Applying: mm: treewide: clarify pgtable_page_{ctor,dtor}() naming
Applying: drivers/tty/serial/sh-sci.c: suppress warning
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
Merging akpm/master (5ad8ab5eb246 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)

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

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

* linux-next: Tree for Aug 26
@ 2015-08-26  7:46 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2015-08-26  7:46 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

Hi all,

Changes since 20150825:

The nfs tree lost its build failure.

The i2c tree still had its build failure so I applied a supplied patch.

The mmc-uh tree gained a build failure so I used the version from
next-20150825.

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

Non-merge commits (relative to Linus' tree): 9773
 8505 files changed, 515801 insertions(+), 202147 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 (b1713b135fb1 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
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 (1214c525484c m68k: Use for_each_sg())
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 (f7644cbfcdf0 Linux 4.2-rc6)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave)
Merging net/master (8b63ec1837fa phylib: Make PHYs children of their MDIO bus, not the bus' parent.)
Merging ipsec/master (158cd4af8ded packet: missing dev_put() in packet_do_bind())
Merging sound-current/for-linus (c7cd0ef66aad ALSA: hda - Fix path power activation)
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 (1ae5ddb6f883 Input: gpio_keys_polled - request GPIO pin as input.)
Merging crypto-current/master (b310c178e6d8 crypto: caam - fix memory corruption in ahash_final_ctx)
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 (5a005d77a906 ARC: perf: cap the number of counters to hardware max of 32)
Merging arm/for-next (2a3639fea519 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 (fd28024bf82e 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/boot/dts/imx6qdl-gw54xx.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
$ 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 (4ae93a64be4f soc: qcom: smem: Fix errant private access)
Merging renesas/next (078e7cdb7497 Merge branch 'heads/fixes-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 (5166c20ef95b arm64: makefile: fix perf_callchain.o kconfig dependency)
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 (82aa0de56d35 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 (5d53be7d8c7c powerpc/powernv: Fix mis-merge of OPAL support for LEDS driver)
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 (42cfc6b590c5 s390/dcssblk: correct out of bounds array indexes)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (ff3e9a7307db tile/vdso: emit a GNU hash as well)
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 (b01548919c33 f2fs: handle f2fs_truncate error correctly)
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 (e3b1df2dbd7b NFSv4.1/flexfile: ff_layout_remove_mirror can be static)
Merging nfsd/nfsd-next (a8bd5e23a345 nfsd: Add Jeff Layton as co-maintainer)
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 (1845f79c5eb6 Merge branch 'pci/enumeration' 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 (8e433b666751 Merge branch 'for-4.3/upstream' into for-next)
Merging i2c/i2c/for-next (9639dd22e79d Merge branch 'i2c/for-4.3' into i2c/for-next)
Applying: of/irq: export of_get_irq_byname()
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 (ccf2dc51bc4a hwmon: (ltc2978) Add support for LTM4675)
Merging v4l-dvb/master (5d26c12b70e9 Merge branch 'v4l_for_linus' into to_next)
Merging kbuild/for-next (afa50c336d92 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (4c1742135690 Merge branch 'for-4.3' into for-next)
Merging pm/linux-next (ece1fdfc4b9b Merge branch 'pm-tools' 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 (b96f465035f9 dlm: fix lvb copy for user locks)
Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function)
Merging slave-dma/next (98a4a1a3ba23 Merge branch 'for-linus' into next)
Merging net-next/master (b635f0901a44 Merge branch 'dsa-docs')
Merging ipsec-next/master (e69948a0a530 net: Document xfrm4_gc_thresh and xfrm6_gc_thresh)
Merging wireless-drivers-next/master (a8b9774571d4 rsi: Fix possible leak when loading firmware)
Merging bluetooth/master (c0c700240d9a Bluetooth: hci_intel: Add Intel baudrate configuration support)
Merging rdma/for-next (153b7306b7c6 Merge branch 'hfi1-v4' into to-be-rebased/for-4.3)
Merging mtd/master (5f867db63473 mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict)
Merging l2-mtd/master (cc7fce802290 mtd: blkdevs: fix switch-bool compilation warning)
Merging crypto/master (bf433416e675 crypto: algif_aead - fix for multiple operations on AF_ALG sockets)
CONFLICT (content): Merge conflict in arch/arm/configs/imx_v6_v7_defconfig
Merging drm/drm-next (db56176025ce Revert "drm/atomic: Call ww_acquire_done after check phase is complete")
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 (e2d6cf7f3696 drm/i915: Allow parsing of variable size child device entries from VBT)
Merging drm-tegra/drm/tegra/for-next (459cc2c6800b drm/tegra: sor: Add HDMI support)
Merging drm-misc/topic/drm-misc (faebc1e2c933 drm/atomic-helper: properly annotate functions in kerneldoc)
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 (654e2751c9f0 ALSA: ppc: Add missing inclusion of linux/module.h)
Merging sound-asoc/for-next (0ce784a96f21 Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8983', 'asoc/topic/wm8996' and 'asoc/topic/xtensa' into asoc-next)
Merging modules/modules-next (5cfb203a304d modpost: abort if a module symbol is too long)
Merging input/next (534fcb3bdaab Input: elan_i2c - enable ELAN0100 acpi panels)
Merging block/for-next (e34a5b3c2f88 Merge branch 'for-4.3/sg' into for-next)
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 (bd49784fd1e8 dm stats: report precise_timestamps and histogram in @stats_list output)
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 (cf7565369868 mmc: sdhci-of-at91: fix platform_no_drv_owner.cocci warnings)
$ git reset --hard HEAD^
Merging next-20150825 version of mmc-uh
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (8f4a806e5c12 md-cluster: remove inappropriate try_module_get from join())
CONFLICT (content): Merge conflict in drivers/md/raid5.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 (2795987874ec Merge remote-tracking branches 'regulator/topic/stub', 'regulator/topic/tol' and 'regulator/topic/tps6586x' into regulator-next)
Merging security/next (3e5f206c00f7 Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next)
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 (c13dcf9f2d6f Linux 4.2-rc8)
Merging iommu/next (4d400e71a1ee 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 (0fe0965e63c8 Documentation/x86: Rename IRQSTACKSIZE to IRQ_STACK_SIZE)
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
$ 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 (055be9c4b07c Merge remote-tracking branch 'spi/topic/xcomm' into spi-next)
Merging tip/auto-latest (9cc8370f6130 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 (b44754d8262d ring_buffer: Allow to exit the ring buffer benchmark immediately)
Merging rcu/rcu/next (3c969095a3cc percpu-rwsem: cleanup the lockdep annotations in percpu_down_read())
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 (0ac7a1841284 xen/xenbus: Rename the variable xen_store_mfn to xen_store_gfn)
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 (6d212b8adce4 ideapad-laptop: add alternative representation for Yoga 2 to DMI table)
Merging chrome-platform/for-next (1d95e6f10fd8 platform/chrome: cros_ec: Fix possible leak in led_rgb_store())
Merging regmap/for-next (579657f2e1ed Merge remote-tracking branches 'regmap/topic/lockdep', 'regmap/topic/raw' 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 (5f414dd632fd leds: Export OF module alias information in missing drivers)
Merging ipmi/for-next (119242d12e43 ipmi: Compensate for BMCs that wont set the irq enable bit)
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 (6713819bd866 Merge branch 'fixes' into for-next)
Merging target-updates/for-next (109e2381749c target: Drop iSCSI use of mutex around max_cmd_sn increment)
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 (b28a960c42fc Linux 3.14-rc2)
Merging pinctrl/for-next (3ab897d2113c Merge branch 'devel' into for-next)
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 (929550b9f9f8 gpio: mxc: fix section mismatch warning)
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 (1c4b4b0eb190 clk: qcom: Fix MSM8916 prng clock enable bit)
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 (d770e558e219 Linux 4.2-rc1)
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 (395855d956ed coresight: Fix implicit inclusion of linux/sched.h)
Merging rtc/rtc-next (69a22e39111e rtc: s5m: fix to update ctrl register)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (6f3d528ae9cf Merge branch 'pmem-api' into libnvdimm-for-next)
Merging akpm-current/current (0931fbd 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 (1f3bd50 drivers/w1/w1_int.c: call put_device if device_register fails)

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

* linux-next: Tree for Aug 26
@ 2014-08-26  7:34 Stephen Rothwell
  0 siblings, 0 replies; 24+ messages in thread
From: Stephen Rothwell @ 2014-08-26  7:34 UTC (permalink / raw)
  To: linux-next; +Cc: linux-kernel

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

Hi all,

Changes since 20140825:

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

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

The trivial tree gained a conflict against Linus' tree.

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

The rd-docs tree gained a conflict against the trivial tree.

The akpm-current tree gained a build failure for which I reverted
2 commits.

The akpm tree gained a build failure for which I reverted 3 commits.

Non-merge commits (relative to Linus' tree): 1973
 2042 files changed, 55360 insertions(+), 34839 deletions(-)

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

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

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

Below is a summary of the state of the merge.

I am currently merging 220 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 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 (52addcf9d666 Linux 3.17-rc2)
Merging fixes/master (23cf8d3ca0fd powerpc: Fix "attempt to move .org backwards" error)
Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1)
Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4)
Merging arm-current/fixes (e57e41931134 ARM: wire up memfd_create syscall)
Merging m68k-current/for-linus (9117710a5997 m68k/sun3: Remove define statement no longer needed)
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash)
Merging sparc/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm)
Merging net/master (e24f8191cc35 xen-netback: move netif_napi_add before binding interrupt)
[master d06679aa3754] Revert "mvneta: Fix TSO and checksum for non-acceleration vlan traffic"
Merging ipsec/master (21009686662f net: phy: smsc: move smsc_phy_config_init reset part in a soft_reset function)
Merging sound-current/for-linus (94a988a8ab91 ALSA: pcm: Fix the silence data for DSD formats)
Merging pci-current/for-linus (8d7004a6904c PCI: spear: Remove module option)
Merging wireless/master (c66517165610 rtlwifi: rtl8192cu: Add new ID)
Merging driver-core.current/driver-core-linus (7d1311b93e58 Linux 3.17-rc1)
Merging tty.current/tty-linus (7d1311b93e58 Linux 3.17-rc1)
Merging usb.current/usb-linus (9b2667f1f30e usb: dwc2: gadget: Set the default EP max packet value as 8 bytes)
Merging usb-gadget-fixes/fixes (5d19703822da usb: gadget: remove $(PWD) in ccflags-y)
Merging usb-serial-fixes/usb-linus (646907f5bfb0 USB: ftdi_sio: Added PID for new ekey device)
Merging staging.current/staging-linus (a2fa6721c723 staging: r8188eu: Add new USB ID)
Merging char-misc.current/char-misc-linus (8e8248b1369c mei: nfc: fix memory leak in error path)
Merging input-current/for-linus (fb92be7ba8ca Input: sparc - i8042-sparcio.h: fix unused kbd_res warning)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
Merging crypto-current/master (ce5481d01f67 crypto: drbg - fix failure of generating multiple of 2**16 bytes)
Merging ide/master (a53dae49b2fe ide: use module_platform_driver())
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree fixup machine function)
Merging rr-fixes/fixes (ff7e0055bb5d module: Clean up ro/nx after early module load failures)
Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
Merging drm-intel-fixes/for-linux-next-fixes (1a125d8a2c22 drm/i915: don't try to retrain a DP link on an inactive CRTC)
Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
Merging arc/for-next (2a5e95d4181c mm, arc: remove obsolete pagefault oom killer comment)
Merging arm/for-next (e57e41931134 ARM: wire up memfd_create syscall)
Merging arm-perf/for-next/perf (7d1311b93e58 Linux 3.17-rc1)
Merging arm-soc/for-next (ee328331f134 Merge branch 'fixes' into for-next)
Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
Merging berlin/berlin/for-next (7d1311b93e58 Linux 3.17-rc1)
Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
Merging imx-mxs/for-next (db8ddc19e438 Merge branch 'imx/dt' into for-next)
Merging ixp4xx/next (19f949f52599 Linux 3.8)
Merging keystone/next (c9eaa447e77e Linux 3.15-rc1)
Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
Merging mvebu/for-next (74328d67b001 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging renesas/next (e31799eba978 Merge branch 'r8a7740-ccf-and-timers' into next)
Merging samsung/for-next (213e1f6f5f0b Merge branch 'v3.18-next/dt-samsung' into for-next)
Merging sunxi/sunxi/for-next (779b646c8102 Merge branch 'sunxi/dt-for-3.18' into sunxi/for-next)
Merging tegra/for-next (1cd10a0c0733 Merge branch for-3.18/dt into for-next)
Merging arm64/for-next/core (ea1719672f59 arm64: add newline to I-cache policy string)
Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header)
Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
Merging ia64/next (6b15075c2c36 [IA64] sn: Do not needlessly convert between pointers and integers)
Merging m68k/for-next (9117710a5997 m68k/sun3: Remove define statement no longer needed)
Merging m68knommu/for-next (8ab25ce231d5 m68k: fix crufty 68000 and 68360 intro comments)
Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check)
Merging microblaze/next (83c43c498a0a microblaze: Wire-up memfd_create syscall)
Merging mips/mips-for-linux-next (de7e76446283 Merge branch '3.17-fixes' into mips-for-linux-next)
Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
Merging parisc-hd/for-next (64aa90f26c06 Linux 3.16-rc7)
Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
Merging fsl/next (78eb9094ca08 powerpc/t2080rdb: Add T2080RDB board support)
Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
Merging s390/features (b8a2bbdf02b8 s390/sclp: remove unnecessary XTABS flag)
Merging sparc-next/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm)
Merging tile/master (ed93567c6fbc tile: Remove tile-specific _sinitdata and _einitdata)
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (e792290be763 Merge tag 'xtensa-for-next-20140815' into for_next)
Merging btrfs/next (8d875f95da43 btrfs: disable strict file flushes for renames and truncates)
Merging ceph/master (5f740d7e1531 libceph: set last_piece in ceph_msg_data_pages_cursor_init() correctly)
Merging cifs/for-next (7139f8cf07c8 CIFS: Fix wrong filename length for SMB2)
Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (04ec5f5c0022 ecryptfs: remove unnecessary break after goto)
Merging ext3/for_next (e6d8fb340f20 ext3: Count internal journal as bsddf overhead in ext3_statfs)
Merging ext4/dev (ded7e156bcb6 ext4: update i_disksize coherently with block allocation)
Merging f2fs/dev (c2e69583a478 f2fs: truncate stale block for inline_data)
Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT)
Merging gfs2/master (2ddfbdd6848d GFS2: Request demote when a "try" flock fails)
Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr)
Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found)
Merging nfs/linux-next (852a8b2904c1 SUNRPC: Fix memory reclaim deadlocks in rpciod)
Merging nfsd/nfsd-next (e40ee075fa7f SUNRPC: current_task should be current)
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
Merging ubifs/linux-next (25601a3c9737 UBIFS: Add log overlap assertions)
Merging xfs/for-next (645f98572134 Merge branch 'xfs-misc-fixes-3.17-2' into for-next)
Merging file-locks/linux-next (24b496fa31b8 locks: remove lock_may_read and lock_may_write)
Merging vfs/for-next (ef115d4d3296 fs: Fix theoretical division by 0 in super_cache_scan().)
Applying: vfs: initialize m_list to fix crash in mnt_set_mountpoint
Merging pci/next (981c191778a4 Merge branches 'pci/host-designware', 'pci/host-mvebu' and 'pci/host-tegra' into next)
Merging hid/for-next (8ca6b5db57f8 Merge branch 'for-3.18/uhid' into for-next)
Merging i2c/i2c/for-next (4560d6772281 MAINTAINERS: add maintainer for ACPI parts of I2C)
Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7)
Merging hwmon-staging/hwmon-next (69e8527dfb75 hwmon: (k10temp) Convert to devm_hwmon_device_register_with_groups)
Merging v4l-dvb/master (d1352f268415 Merge two fixes from branch 'patchwork' into to_next)
Merging kbuild/for-next (a16f7ed72bb9 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
Merging libata/for-next (db9786224b85 Merge branch 'for-3.18' into for-next)
Merging pm/linux-next (52addcf9d666 Linux 3.17-rc2)
Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
Merging thermal/next (47d104ba5879 Merge branches 'exynos-fix', 'for-rc', 'int3403-fix', 'misc', 'rcar-thermal' and 'sti-thermal' of .git into next)
Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again)
Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode)
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
Merging slave-dma/next (f6f9d109cc0e Merge branch 'for-linus' into next)
Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup())
Merging net-next/master (a3d1214688d5 neigh: document gc_thresh2)
Merging ipsec-next/master (c9d26423e56c Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging wireless-next/master (7bb75da17172 orinoco_usb: use USB API functions rather than constants)
Merging bluetooth/master (cf0ba860a91e Bluetooth: Move clock offset reading into hci_disconnect())
CONFLICT (content): Merge conflict in net/bluetooth/hci_event.c
CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
CONFLICT (content): Merge conflict in net/bluetooth/hci_conn.c
Merging infiniband/for-next (d087f6ad724d Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', 'mlx5', 'ocrdma' and 'srp' into for-next)
Merging mtd/master (b25046b1e5e3 mtd: nand: fix DocBook warnings on nand_sdr_timings doc)
Merging l2-mtd/master (5b49ab3e03f6 Merge l2-mtd/next into l2-mtd/master)
Merging crypto/master (84693d87a6d7 crypto: drbg - remove unnecessary sanity check for shadow state)
Merging drm/drm-next (484048db6b48 Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next)
Merging drm-panel/drm/panel/for-next (9746c61960b6 drm/panel: simple: Use devm_gpiod_get_optional())
Merging drm-intel/for-linux-next (be71eabebaf9 Revert "drm/i915: Enable semaphores on BDW")
Merging drm-tegra/drm/tegra/for-next (ef70728c7a65 drm/tegra: add MODULE_DEVICE_TABLEs)
Merging sound/for-next (57f2d8b797c4 ALSA: ctxfi: ctpcm.c: printk replacement)
Merging sound-asoc/for-next (2853b8d53196 Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next)
Merging modules/modules-next (480cadc2b7e0 scsi: Fix qemu boot hang problem)
Merging virtio/virtio-next (480cadc2b7e0 scsi: Fix qemu boot hang problem)
Merging input/next (7132fe4f5687 Input: drv260x - add TI drv260x haptics driver)
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
Merging block/for-next (de4d4600c5ab Merge branch 'for-linus' into for-next)
Merging device-mapper/for-next (465a3d61c229 dm crypt: sort writes)
Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (f2ce5ee41e8c mmc: atmel-mci: add 0x600 IP version)
Merging kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging clean-up)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
Merging md/for-next (90c25a429b62 md/raid5: fix init_stripe() inconsistencies)
Merging mfd/for-mfd-next (ba7dde5eb53e mfd: lpc_ich: Add PCI ID for Intel Braswell)
$ git reset --hard HEAD^
Merging next-20140822 version of mfd
Merging backlight/for-backlight-next (87464cdba2ae backlight: ipaq_micro: Fix sparse non static symbol warning)
Merging battery/master (5e37195f30cc ipaq_micro_battery: fix sparse non static symbol warning)
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (be92abea827b Merge branch '3.17/hdmi-infoframe' into for-next)
Merging regulator/for-next (2f0a7bf5130b Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/samsung', 'regulator/topic/sky81452' and 'regulator/topic/tps65910' into regulator-next)
Merging security/next (478d085524c5 Merge tag 'keys-next-20140805' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging integrity/next (e27319cdf468 ima: provide double buffering for hash calculation)
CONFLICT (content): Merge conflict in include/linux/key.h
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/x509_public_key.c
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging selinux/next (aa9e0de81b5b Merge tag 'v3.16' into next)
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
Merging watchdog/master (8083baba5e9c wdt: sunxi: Move restart code to the watchdog driver)
Merging iommu/next (0fdb6739098d Merge branches 'iommu/fixes', 'arm/exynos' and 'x86/vt-d' into next)
Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
Merging vfio/next (9b936c960f22 drivers/vfio: Enable VFIO if EEH is not supported)
Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6)
Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
Merging trivial/for-next (13b8e61008ef MIPS: fix comment spelling)
CONFLICT (content): Merge conflict in mm/memcontrol.c
Merging audit/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm)
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
Merging devicetree/devicetree/next (a9ecdc0fdc54 of/irq: Fix lookup to use 'interrupts-extended' property first)
Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root)
Merging spi/for-next (6031a60799bc Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/rspi', 'spi/topic/sh-msiof' and 'spi/topic/xilinx' into spi-next)
Merging tip/auto-latest (a7653f5e0570 Merge branch 'x86/uv')
Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible)
Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems)
Merging edac-amd/for-next (eba4bfb34d45 EDAC, MCE, AMD: Add MCE decoding for F15h M60h)
Merging irqchip/irqchip/for-next (289eb96601f3 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (39b5552cd509 ftrace: Use current addr when converting to nop in __ftrace_replace_code())
Merging rcu/rcu/next (1c91efb24799 rcutorture: Specify CONFIG_CPUMASK_OFFSTACK=y for TREE07)
Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kvm/linux-next (54ad89b05ec4 kvm: x86: fix tracing for 32-bit)
Merging kvm-arm/next (dedf97e8ff2c arm64: KVM: fix 64bit CP15 VM access for 32bit guests)
Merging kvm-ppc/kvm-ppc-next (c77dcacb3975 KVM: Move more code under CONFIG_HAVE_KVM_IRQFD)
Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
Merging xen-tip/linux-next (e38230eb3789 xen/pciback: Remove tons of dereferences)
Merging percpu/for-next (3189eddbcafc percpu: free percpu allocation info for uniprocessor system)
Merging workqueues/for-next (ebb48ccd98d1 Merge branch 'for-3.17' into for-next)
Merging drivers-x86/linux-next (770235f68ab6 platform/x86: Enable build support for toshiba_haps)
Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries)
Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (baa3e257c8ab Merge remote-tracking branch 'regmap/topic/dt-endian' into regmap-next)
Merging hsi/for-next (3fd276e9c0d7 HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl())
Merging leds/for-next (3f6815f711ef leds: lp3944: fix sparse warning)
Merging driver-core/driver-core-next (7d1311b93e58 Linux 3.17-rc1)
Merging tty/tty-next (7d1311b93e58 Linux 3.17-rc1)
Merging usb/usb-next (7d1311b93e58 Linux 3.17-rc1)
Merging usb-gadget/next (8913dc0bb913 usb: gadget: document a usb_ep_dequeue() requirement)
CONFLICT (content): Merge conflict in drivers/usb/phy/phy-samsung-usb.h
Merging usb-serial/usb-next (7d1311b93e58 Linux 3.17-rc1)
Merging staging/staging-next (29a9e8954840 staging: unisys: fix indentation of uisutil_copy_fragsinfo_from_skb())
Applying: staging: rtl8188eu: using unique names is good
Merging char-misc/char-misc-next (7d1311b93e58 Linux 3.17-rc1)
Merging cgroup/for-next (549cb2747e0f Merge branch 'for-3.18' into for-next)
Merging scsi/for-next (0d409610d597 Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-next)
Merging target-updates/for-next (4ca7ea3ceeb9 iscsi-target: Ignore ICF_GOT_LAST_DATAOUT during Data-Out ITT lookup)
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (0252d6a2ac2a pinctrl: qcom: apq8064: Correct interrupts in example)
Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs)
CONFLICT (content): Merge conflict in drivers/vhost/net.c
Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6)
Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
Merging gpio/for-next (24f5796e7881 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (58fe586a50e6 dma-mapping: Provide write-combine allocations)
Merging pwm/for-next (137fd45ffec1 pwm: imx: Avoid sample FIFO overflow for i.MX PWM version2)
Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning)
Merging userns/for-next (a1998908ba46 nfs: fix kernel warning when removing proc entry)
Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect)
Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging clk/clk-next (b11a6face1b6 clk: Add missing of_clk_set_defaults export)
Merging random/dev (e02b87659777 hwrng: Pass entropy to add_hwgenerator_randomness() in bits, not bytes)
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
Merging aio/master (7be141d05549 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging llvmlinux/for-next (7380100aa7ce arm64: LLVMLinux: Use current_stack_pointer in kernel/traps.c)
Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states)
Merging rd-docs/master (d9f386343e04 new page link in SubmittingPatches)
CONFLICT (content): Merge conflict in Documentation/this_cpu_ops.txt
Merging signal-cleanup/signal_v4 (b9f0fb2d4a7a powerpc: Use sigsp())
Merging akpm-current/current (1b16511b9035 scripts/headers_install.sh: fix error handling)
[master d220dcfee642] Revert "prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v3-fix"
[master 55e2a11b5806] Revert "prctl: PR_SET_MM -- introduce PR_SET_MM_MAP operation"
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/gpio/gpio-zevio.c: fix build
Applying: x86, vdso: fix vdso2c's special_pages error checking
Applying: drivers/staging/unisys: fix build
Applying: include/linux: remove strict_strto* definitions
Applying: mm: replace remap_file_pages() syscall with emulation
Applying: fat: add i_disksize to represent uninitialized size
Applying: fat: add fat_fallocate operation
Applying: fat: zero out seek range on _fat_get_block
Applying: fat: fallback to buffered write in case of fallocated region on direct IO
Applying: fat: permit to return phy block number by fibmap in fallocated region
Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: softlockup: make detector be aware of task switch of processes hogging cpu
Applying: kernel/watchdog.c: control hard lockup detection default
Applying: watchdog-control-hard-lockup-detection-default-fix
Applying: kvm: ensure hard lockup detection is disabled by default
Applying: mm: add strictlimit knob
Merging akpm/master (fad2e3b79bb5 mm: add strictlimit knob)
[master 991d2b63f656] Revert "kvm: ensure hard lockup detection is disabled by default"
[master 564a6c7c45bf] Revert "watchdog-control-hard-lockup-detection-default-fix"
[master 96b7d2874e29] Revert "kernel/watchdog.c: control hard lockup detection default"

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

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

end of thread, other threads:[~2022-08-26  7:46 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-26  5:00 linux-next: Tree for Aug 26 Stephen Rothwell
2011-08-26  8:07 ` linux-next: Tree for Aug 26 (i7core_edac) Randy Dunlap
2011-08-26 14:16   ` Sedat Dilek
2011-08-26 14:48     ` Borislav Petkov
2011-08-26 17:40     ` Randy Dunlap
2011-08-26 17:54       ` Sedat Dilek
2011-08-26 18:06 ` [PATCH -next] staging: fix rts5139 depends & build Randy Dunlap
2014-08-26  7:34 linux-next: Tree for Aug 26 Stephen Rothwell
2015-08-26  7:46 Stephen Rothwell
2019-08-26 13:44 Stephen Rothwell
2020-08-26  6:33 Stephen Rothwell
2020-08-26 18:19 ` Anders Roxell
2020-08-26 19:39   ` Paul E. McKenney
2020-08-28  7:37     ` Anders Roxell
2020-08-28 13:29       ` Paul E. McKenney
2020-08-28 19:24         ` Anders Roxell
2020-08-28 22:59           ` Paul E. McKenney
2020-09-03  8:39             ` Anders Roxell
2020-09-03 16:14               ` Paul E. McKenney
2020-09-07  8:55                 ` Anders Roxell
2020-09-10  4:14                   ` Stephen Rothwell
2020-09-10  5:44                     ` Paul E. McKenney
2021-08-26 10:42 Stephen Rothwell
2022-08-26  7:46 Stephen Rothwell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.