linux-next: manual merge of the risc-v tree with Linus' tree

2020-10-25 Thread Stephen Rothwell
o want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/riscv/kernel/vdso/Makefile index 7d6a94d45ec9,a8ecf102e09b.. --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/

Re: linux-next: manual merge of the sunxi tree with the arm-soc tree

2020-10-25 Thread Stephen Rothwell
Hi Maxime, On Thu, 8 Oct 2020 15:20:17 +0200 Maxime Ripard wrote: > > On Tue, Oct 06, 2020 at 02:56:37PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the sunxi tree got a conflict in: > > > > arch/arm64/boot/dts/al

linux-next: Tree for Oct 23

2020-10-22 Thread Stephen Rothwell
y 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.

linux-next: build warning after merge of the block tree

2020-10-22 Thread Stephen Rothwell
d __user *) req->rw.addr; | ^ Introduced by commit a5371db1e38d ("io_uring: make loop_rw_iter() use original user supplied pointers") -- Cheers, Stephen Rothwell pgpByYOw5brcs.pgp Description: OpenPGP digital signature

linux-next: Tree for Oct 22

2020-10-21 Thread Stephen Rothwell
s. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (f804b3159482 Merge tag 'linux-watchdog-5.10-rc1' of git://www.linux-watchdog.org/linux-watchdog) Merging fixes/fixes (9123e3a74ec7 Linux 5

linux-next: manual merge of the pci tree with the origin tree

2020-10-21 Thread Stephen Rothwell
upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/pci/controller/vmd.c index aa1b12bac9a1,c8d46bd01e87..0

linux-next: Signed-off-by missing for commit in the jc_docs tree

2020-10-21 Thread Stephen Rothwell
Hi all, Commit 9467739c239d ("docs: Add two missing entries in vm sysctl index") is missing a Signed-off-by from its author. -- Cheers, Stephen Rothwell pgpef_7V2Nsx7.pgp Description: OpenPGP digital signature

Re: linux-next: manual merge of the notifications tree with Linus' tree

2020-10-21 Thread Stephen Rothwell
Hi all, On Wed, 21 Oct 2020 18:02:55 +1100 Stephen Rothwell wrote: > > Hi all, > > On Wed, 21 Oct 2020 12:47:33 +1100 Stephen Rothwell > wrote: > > > > diff --cc include/uapi/asm-generic/unistd.h > > index 2056318988f7,fcdca8c7d30a.. > >

Re: linux-next: manual merge of the notifications tree with Linus' tree

2020-10-21 Thread Stephen Rothwell
Hi all, On Wed, 21 Oct 2020 12:47:33 +1100 Stephen Rothwell wrote: > > diff --cc include/uapi/asm-generic/unistd.h > index 2056318988f7,fcdca8c7d30a.. > --- a/include/uapi/asm-generic/unistd.h > +++ b/include/uapi/asm-generic/unistd.h > @@@ -857,8 -857,8 +85

Re: arm64 build broken on linux next 20201021 - include/uapi/asm-generic/unistd.h:862:26: error: array index in initializer exceeds array bounds

2020-10-20 Thread Stephen Rothwell
e __NR_syscalls in include/uapi/asm-generic/unistd.h needed to be fixed up in the notifications tree merge to be 442. Sorry about that, I will use the correct merge resolution tomorrow. -- Cheers, Stephen Rothwell pgpyidW4vGuHm.pgp Description: OpenPGP digital signature

linux-next: Tree for Oct 21

2020-10-20 Thread Stephen Rothwell
f 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 Mergi

linux-next: manual merge of the notifications tree with Linus' tree

2020-10-20 Thread Stephen Rothwell
s linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, St

linux-next: manual merge of the pm tree with the arm-soc tree

2020-10-20 Thread Stephen Rothwell
may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/soc/ti/Makefile index 18129aa557df,5463431ec96c.. --- a/drivers/soc/ti/Makefile +++ b/drivers/soc/ti/Makefile @@@

linux-next: manual merge of the ext4 tree with Linus' tree

2020-10-20 Thread Stephen Rothwell
intainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc fs/ext4/ialloc.c index 698ca4a4db5f,2400a8200435.. --- a/fs/ext4/ial

linux-next: Signed-off-by missing for commit in the gfs2 tree

2020-10-20 Thread Stephen Rothwell
Hi all, Commit 955584707816 ("gfs2: Fix comments to glock_hash_walk") is missing a Signed-off-by from its committer. -- Cheers, Stephen Rothwell pgpod69Vj66aU.pgp Description: OpenPGP digital signature

linux-next: Fixes tag needs some work in the ext4 tree

2020-10-20 Thread Stephen Rothwell
v to 12 (or more) or (for git v2.11 or later) just making sure it is not set (or set to "auto"). -- Cheers, Stephen Rothwell pgpazxz2zan3K.pgp Description: OpenPGP digital signature

linux-next: Tree for Oct 16

2020-10-15 Thread Stephen Rothwell
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 (c48b75b7271d Merge tag 'sound-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai

linux-next: build failure after merge of the akpm-current tree

2020-10-15 Thread Stephen Rothwell
ree. I have added the following merge fix patch. From: Stephen Rothwell Date: Fri, 16 Oct 2020 15:39:09 +1100 Subject: [PATCH] mm/readahead: fix up for "readahead: use limited read-ahead to satisfy read" Signed-off-by: Stephen Rothwell --- mm/readahead.c | 2 +- 1 file changed, 1 insertio

linux-next: manual merge of the amdgpu tree with Linus' tree

2020-10-15 Thread Stephen Rothwell
hen your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpZVn8dcifWA.pgp Description: OpenPGP digital signature

linux-next: manual merge of the djw-vfs tree with Linus' tree

2020-10-15 Thread Stephen Rothwell
ing with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc fs/Makefile index 7bb2a05fda1f,7173350739c5.. --- a/fs/Makefile +++ b/fs/Makefile @@@ -14,7 -14,7 +14,7 @@@ obj-y := open.o read_write.o file

Re: linux-next: manual merge of the char-misc tree with the powerpc tree

2020-10-15 Thread Stephen Rothwell
Hi all, On Tue, 6 Oct 2020 18:35:06 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/misc/ocxl/Kconfig > > between commit: > > dde6f18a8779 ("ocxl: Don't return trigger page when all

Re: [PATCH v2] net: usb: rtl8150: don't incorrectly assign random MAC addresses

2020-10-15 Thread Stephen Rothwell
Hi Greg, On Mon, 12 Oct 2020 09:14:28 +1100 Stephen Rothwell wrote: > > On Sun, 11 Oct 2020 23:00:30 +0530 Anant Thazhemadam > wrote: > > > > In set_ethernet_addr(), if get_registers() succeeds, the ethernet address > > that was read must be copied over. Otherwise

Re: linux-next: manual merge of the usb tree with the pci tree

2020-10-15 Thread Stephen Rothwell
Hi all, On Mon, 21 Sep 2020 15:18:07 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/pci/controller/pcie-brcmstb.c > > between commit: > > 1cf1b0a6dd95 ("PCI: brcmstb: Add bcm7278 register info&q

linux-next: manual merge of the wireless-drivers tree with the net tree

2020-10-15 Thread Stephen Rothwell
ntainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc tools/testing/selftests/net/Makefile index 3e7fb1e70c77,4773ce72edbd..000

Re: linux-next: build failure after merge of the hmm tree

2020-10-15 Thread Stephen Rothwell
Hi all, On Mon, 12 Oct 2020 15:19:48 +1100 Stephen Rothwell wrote: > > On Tue, 6 Oct 2020 13:41:20 -0300 Jason Gunthorpe wrote: > > > > On Tue, Oct 06, 2020 at 08:35:08PM +1100, Stephen Rothwell wrote: > > > Hi all, > > > > > > After mergin

linux-next: Tree for Oct 15

2020-10-15 Thread Stephen Rothwell
ays 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 (4da9af0014b5 Merge tag 'threads-v5.10' of git:

Re: linux-next: build warning after merge of the pm tree

2020-10-15 Thread Stephen Rothwell
Hi all, On Thu, 8 Oct 2020 20:35:59 +1100 Stephen Rothwell wrote: > > On Thu, 1 Oct 2020 19:43:37 +1000 Stephen Rothwell > wrote: > > > > On Tue, 22 Sep 2020 18:11:26 +1000 Stephen Rothwell > > wrote: > > > > > > After merging the pm t

linux-next: manual merge of the akpm-current tree with the block tree

2020-10-14 Thread Stephen Rothwell
hould be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc mm/readahead.c index e5975f4e0ee5,c6ffb76827da

Re: linux-next: manual merge of the counters tree with the ipmi tree

2020-10-14 Thread Stephen Rothwell
Hi all, On Mon, 12 Oct 2020 19:13:40 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the counters tree got a conflict in: > > drivers/char/ipmi/ipmi_msghandler.c > > between commit: > > f8910ffa81b0 ("ipmi:msghandler: retry to get device i

Re: linux-next: manual merge of the akpm-current tree with the counters tree

2020-10-14 Thread Stephen Rothwell
Hi all, On Mon, 12 Oct 2020 19:48:21 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > lib/Makefile > > between commit: > > 37a0dbf631f6 ("counters: Introduce counter_atomic* counters")

Re: linux-next: manual merge of the akpm-current tree with the kunit-next tree

2020-10-14 Thread Stephen Rothwell
Hi all, On Mon, 12 Oct 2020 19:56:49 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > lib/kunit/test.c > > between commit: > > 45dcbb6f5ef7 ("kunit: test: add test plan to KUnit TAP format&q

linux-next: build warnings after merge of the kunit-next tree

2020-10-14 Thread Stephen Rothwell
on] 129 | static void __init test_bitfields_compile(struct kunit *context) |^~ Introduced by commit d2585f5164c2 ("lib: kunit: add bitfield test conversion to KUnit") -- Cheers, Stephen Rothwell pgpDUcJdsD0UO.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of the rpmsg tree

2020-10-14 Thread Stephen Rothwell
Add support for mt8192 SCP") I have reverted that commit for today. -- Cheers, Stephen Rothwell pgpXgi25fWrnf.pgp Description: OpenPGP digital signature

Re: linux-next: manual merge of the tip tree with the dma-mapping tree

2020-10-14 Thread Stephen Rothwell
Hi all, On Tue, 6 Oct 2020 17:11:35 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/kernel/setup.c > > between commit: > > f47e22d65d08 ("dma-mapping: split ") > > from the dma

linux-next: manual merge of the devicetree tree with Linus' tree

2020-10-14 Thread Stephen Rothwell
You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc Documentation/x86/index.rst index 740ee7f87898,1faf44f551bd.. --- a/Documentation/x86/index.rst +++ b/Documentation/x8

Re: linux-next: build failure after merge of the iommu tree

2020-10-14 Thread Stephen Rothwell
Hi all, On Tue, 13 Oct 2020 18:31:07 +1100 Stephen Rothwell wrote: > > On Mon, 21 Sep 2020 14:09:01 +1000 Stephen Rothwell > wrote: > > > > After merging the iommu tree, today's linux-next build (arm > > multi_v7_defconfig) failed like this: > > &

Re: linux-next: manual merge of the tip tree with the kbuild tree

2020-10-14 Thread Stephen Rothwell
Hi all, On Fri, 25 Sep 2020 15:25:45 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/arm/Makefile > > between commit: > > 596b0474d3d9 ("kbuild: preprocess module linker script"

Re: linux-next: build warning after merge of the tip tree

2020-10-14 Thread Stephen Rothwell
this > direct to Linus, though it makes more sense that it come through Ingo > (as he'd done the orphan tree pull request). Thanks. -- Cheers, Stephen Rothwell pgpoXXlPOZarl.pgp Description: OpenPGP digital signature

Re: [GIT PULL v2] objtool changes for v5.10

2020-10-14 Thread Stephen Rothwell
;objtool: Allow nested externs to enable BUILD_BUG()") > > > > I'll send a v2 pull request in an hour or two. Thanks for that. -- Cheers, Stephen Rothwell pgpNYrRHMr7OL.pgp Description: OpenPGP digital signature

Re: [GIT PULL] Btrfs updates for 5.10

2020-10-14 Thread Stephen Rothwell
Tuesday (and what would still be there today except I dropped it because of several conflicts) ... it looks like it was rebased a week ago, but then never included in your "for-next" branch. So I supposed it has had your internal testing, at least. -- Cheers, Stephen Rothwell pgpo4GaGWyXIl.pgp Description: OpenPGP digital signature

Re: linux-next: build failure after merge of the vfio tree

2020-10-14 Thread Stephen Rothwell
that branch. That way, it doesn't matter what order the tress are merged (by me or Linus). -- Cheers, Stephen Rothwell pgpBocWdENpig.pgp Description: OpenPGP digital signature

linux-next: manual merge of the btrfs tree with Linus' tree

2020-10-14 Thread Stephen Rothwell
-next today. -- Cheers, Stephen Rothwell pgpFSo4GbrmJU.pgp Description: OpenPGP digital signature

Re: [PATCH -next] Revert "powerpc/pci: unmap legacy INTx interrupts when a PHB is removed"

2020-10-14 Thread Stephen Rothwell
gt; I was going to post this along with a fix for Cedric's original bug, > but I can do that separately so: > > Acked-by: Oliver O'Halloran I added that to linux-next today. -- Cheers, Stephen Rothwell pgpNa5oljUaz7.pgp Description: OpenPGP digital signature

linux-next: manual merge of the risc-v and vfs trees with Linus' tree

2020-10-14 Thread Stephen Rothwell
o want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/x86/lib/getuser.S index 2cd902e06062,2f052bc96866.. --- a/arch/x86/lib/getuser.S +++ b/arch/x86/lib/getuser.S @@@ -35,1

Re: linux-next: build warning after merge of the tip tree

2020-10-14 Thread Stephen Rothwell
Hi Kees, On Sun, 4 Oct 2020 19:44:52 -0700 Kees Cook wrote: > > On Sun, Oct 04, 2020 at 09:00:18PM +1100, Stephen Rothwell wrote: > > Hi Kees, > > > > On Sun, 4 Oct 2020 01:27:01 -0700 Kees Cook wrote: > > > > > > I assume CONFIG_CONSTRUCTORS i

linux-next: Fixes tag needs some work in the f2fs tree

2020-10-14 Thread Stephen Rothwell
ore.abbrev to 12 (or more) or (for git v2.11 or later) just making sure it is not set (or set to "auto"). -- Cheers, Stephen Rothwell pgpt3HYQFMpsM.pgp Description: OpenPGP digital signature

Re: linux-next: build failure after merge of the vfio tree

2020-10-13 Thread Stephen Rothwell
rivers/vfio/fsl-mc/vfio_fsl_mc.c:576:2: error: implicit declaration of function 'dprc_remove_devices' [-Werror=implicit-function-declaration] 576 | dprc_remove_devices(mc_dev, NULL, 0); | ^~~ drivers/vfio/fsl-mc/vfio_fsl_mc.c:577:2: error: implicit declaration of function 'dprc_cleanup' [-Werror=implicit-function-declaration] 577 | dprc_cleanup(mc_dev); | ^~~~ -- Cheers, Stephen Rothwell pgpashWGkQyKb.pgp Description: OpenPGP digital signature

Re: [GIT PULL] Documentation for 5.10

2020-10-13 Thread Stephen Rothwell
lt with Sphinx 2.x, That would be nice. I am still getting about 35-40 each day. -- Cheers, Stephen Rothwell pgpqPS4aMS29S.pgp Description: OpenPGP digital signature

Re: [GIT PULL] objtool changes for v5.10

2020-10-13 Thread Stephen Rothwell
ik (1): > objtool: Allow nested externs to enable BUILD_BUG() This seems to be missing https://lore.kernel.org/lkml/patch-1.thread-251403.git-2514037e9477.your-ad-here.call-01602244460-ext-7088@work.hours/ or did that get sent in a previous pull request? -- Cheers, Stephen Rothwell pgp2rE23zxMoV.pgp Description: OpenPGP digital signature

linux-next: Tree for Oct 13

2020-10-13 Thread Stephen Rothwell
er for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (13cb73490f47 Merge tag 'x86-entry-2020-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) Merging fixes/fixes (9123e3a74ec7 Linux 5

Re: linux-next: manual merge of the akpm-current tree with the arm64 tree

2020-10-13 Thread Stephen Rothwell
Hi all, On Mon, 21 Sep 2020 18:03:53 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/arm64/mm/mmu.c > > between commit: > > 0178dc761368 ("arm64: mte: Use Normal Tagged attributes for th

Re: linux-next: build failure after merge of the iommu tree

2020-10-13 Thread Stephen Rothwell
Hi all, On Mon, 21 Sep 2020 14:09:01 +1000 Stephen Rothwell wrote: > > After merging the iommu tree, today's linux-next build (arm > multi_v7_defconfig) failed like this: > > drivers/gpu/drm/msm/msm_iommu.c: In function 'msm_iommu_pagetable_unmap': > drivers/gp

Re: linux-next: manual merge of the m68knommu tree with the m68k tree

2020-10-13 Thread Stephen Rothwell
Hi all, On Thu, 10 Sep 2020 09:34:37 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the m68knommu tree got a conflict in: > > arch/m68k/Kconfig > > between commit: > > dc072012bc94 ("m68k: Sort selects in main Kconfig&qu

Re: linux-next: manual merge of the mmc tree with the samsung-krzk tree

2020-10-13 Thread Stephen Rothwell
Hi all, On Tue, 8 Sep 2020 14:46:22 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the mmc tree got a conflict in: > > drivers/mmc/host/Kconfig > > between commits: > > cb6c03019cdd ("ARM: exynos: stop selecting PLAT_SAMSUNG") >

linux-next: manual merge of the akpm-current tree with the tip tree

2020-10-13 Thread Stephen Rothwell
consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/linux/sched.h index 1695d45c2d7a,a360da173c32.. --- a/include/linux/sched.h +++ b/include/linux/sched.h @@@ -1322,10 -13

linux-next: manual merge of the tty tree with the parisc-hd tree

2020-10-12 Thread Stephen Rothwell
any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpLyA1TCxg

Re: linux-next: manual merge of the tip tree with the amdgpu tree

2020-10-12 Thread Stephen Rothwell
Hi all, On Mon, 12 Oct 2020 15:15:27 +1100 Stephen Rothwell wrote: > > On Wed, 23 Sep 2020 15:13:36 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the tip tree got a conflict in: > > > > drivers/gpu/drm/amd/amd

Re: linux-next: manual merge of the tip tree with the iommu tree

2020-10-12 Thread Stephen Rothwell
Hi all, On Fri, 2 Oct 2020 15:22:24 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > include/linux/iommu.h > > between commits: > > 23cc3493b5e1 ("iommu/uapi: Rename uapi functions") > d90573

Re: linux-next: manual merge of the tip tree with the pci tree

2020-10-12 Thread Stephen Rothwell
Hi all, On Fri, 25 Sep 2020 15:35:10 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/kernel/apic/msi.c > > between commit: > > 2705b8e4d46f ("x86/apic/msi: Use Real PCI DMA device when configu

Re: linux-next: manual merge of the tip tree with the pci tree

2020-10-12 Thread Stephen Rothwell
Hi all, On Fri, 25 Sep 2020 15:21:18 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/pci/controller/vmd.c > > between commit: > > 42443f036042 ("PCI: vmd: Create IRQ Domain configuration helper&q

linux-next: build failure after merge of the vfio tree

2020-10-12 Thread Stephen Rothwell
ee from next-20201012 for today. -- Cheers, Stephen Rothwell pgpNWyudAdAjW.pgp Description: OpenPGP digital signature

linux-next: manual merge of the fuse tree with Linus' tree

2020-10-12 Thread Stephen Rothwell
rating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc fs/fuse/file.c index 43c165e796da,53d4dd1ab992.. --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@@ -3120,17 -3156,10 +3146,18 @@@ fuse_direct_IO(struct kiocb

linux-next: Tree for Oct 12

2020-10-12 Thread Stephen Rothwell
y 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 Ro

linux-next: manual merge of the akpm-current tree with the kunit-next tree

2020-10-12 Thread Stephen Rothwell
ith the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc lib/kunit/test.c index de07876b6601,dcc35fd30d95.. --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@@ -15,11 -16,16 +16,6 @@@ #include "string-s

linux-next: manual merge of the akpm-current tree with the counters tree

2020-10-12 Thread Stephen Rothwell
ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc lib/Makefile index 95b357bb5f3c,1c7577b2e86a.. --- a/lib/Makefile +++ b/lib/Makefile @@@ -99,7 -101,7 +101,8 @@@ obj-$(CONFIG_TEST_BL

linux-next: manual merge of the counters tree with the ipmi tree

2020-10-12 Thread Stephen Rothwell
ng. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/char/ipmi/ipmi_msghandler.c index 8774a3b8ff95,36c0b1be22fb.. --- a/drivers/char/ipmi/ipmi_msghandler.

linux-next: manual merge of the irqchip tree with the mfd tree

2020-10-11 Thread Stephen Rothwell
t to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/irqchip/Makefile index db5e37d2db11,f1525149b7a2.. --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@@ -11

Re: [PATCH RESEND 1/1] perf build: Allow nested externs to enable BUILD_BUG() usage

2020-10-11 Thread Stephen Rothwell
Hi all, On Mon, 12 Oct 2020 08:59:36 +1100 Stephen Rothwell wrote: > > On Fri, 9 Oct 2020 14:41:11 +0200 Jiri Olsa wrote: > > > > On Fri, Oct 09, 2020 at 02:25:23PM +0200, Vasily Gorbik wrote: > > > Currently BUILD_BUG() macro is expanded to smth like

Re: linux-next: build failure after merge of the drm-misc tree

2020-10-11 Thread Stephen Rothwell
Hi all, [Just adding Dave to cc's] On Mon, 12 Oct 2020 15:24:52 +1100 Stephen Rothwell wrote: > > Hi all, > > On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell > wrote: > > > > On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell > > wrote: >

Re: linux-next: build failure after merge of the drm-misc tree

2020-10-11 Thread Stephen Rothwell
Hi all, On Thu, 8 Oct 2020 15:42:02 +1100 Stephen Rothwell wrote: > > On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell > wrote: > > > > After merging the drm-misc tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > In fil

Re: linux-next: build failure after merge of the hmm tree

2020-10-11 Thread Stephen Rothwell
Hi all, On Tue, 6 Oct 2020 13:41:20 -0300 Jason Gunthorpe wrote: > > On Tue, Oct 06, 2020 at 08:35:08PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > After merging the hmm tree, today's linux-next build (arm > > multi_v7_defconfig) failed like t

Re: linux-next: manual merge of the tip tree with the amdgpu tree

2020-10-11 Thread Stephen Rothwell
Hi all, On Wed, 23 Sep 2020 15:13:36 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/gpu/drm/amd/amdkfd/kfd_priv.h > > between commit: > > 59d7115dae02 ("drm/amdkfd: Move process doorbell allocat

linux-next: manual merge of the net-next tree with the net tree

2020-10-11 Thread Stephen Rothwell
ith the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/mptcp/protocol.h index 972463642690,aa0ab18d2e57.. --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@@ -203,9 -211,10 +212,11 @@@ struct

linux-next: manual merge of the arm64 tree with the asm-generic tree

2020-10-11 Thread Stephen Rothwell
or merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm64/include/asm/mmu_context.h index fe2862aa1dad,0672236e1aea.. --- a/arch/arm64/include/asm

Re: [PATCH v2] net: usb: rtl8150: don't incorrectly assign random MAC addresses

2020-10-11 Thread Stephen Rothwell
if (!ret) { > ether_addr_copy(dev->netdev->dev_addr, node_id); > } else { > eth_hw_addr_random(dev->netdev); > -- > 2.25.1 > I will apply the above patch to the merge of the usb tree today to fix up a semantic conflict between the usb tree and Linus' tree. -- Cheers, Stephen Rothwell pgpE8MQ9jmF8y.pgp Description: OpenPGP digital signature

Re: [PATCH RESEND 1/1] perf build: Allow nested externs to enable BUILD_BUG() usage

2020-10-11 Thread Stephen Rothwell
-Wnested-externs and -Werror. > > > > To enable BUILD_BUG() usage in tools/arch/x86/lib/insn.c which perf > > includes in intel-pt-decoder, build perf without -Wnested-externs. > > > > Reported-by: Stephen Rothwell > > Signed-off-by: Vasily Gorbik > > th

Re: [PATCH v3 00/23] Use asm-generic for mmu_context no-op functions

2020-10-10 Thread Stephen Rothwell
Hi Arnd, On Sat, 10 Oct 2020 10:25:11 +0200 Arnd Bergmann wrote: > > On Sat, Oct 10, 2020 at 4:02 AM Stephen Rothwell > wrote: > > On Fri, 9 Oct 2020 16:01:22 +0200 Arnd Bergmann wrote: > > > > > Are there other changes that depend on this? If not, I would

Re: arm-smmu 5000000.iommu: Cannot accommodate DMA offset for IOMMU page tables

2020-10-10 Thread Stephen Rothwell
-UAO -TCO BTYPE=--) > [1.882483] pc : nand_scan_with_ids+0x1450/0x1470 > [1.887183] lr : nand_scan_with_ids+0x1450/0x1470 > > full test log, > https://qa-reports.linaro.org/lkft/linux-next-master/build/next-20201009/testrun/3284876/suite/linux-log-parser/test/check-kernel-warning-92014/log > > > > > > > Okay, alright then. > > > > > - Naresh -- Cheers, Stephen Rothwell pgpvghNXseEPS.pgp Description: OpenPGP digital signature

Re: [PATCH v3 00/23] Use asm-generic for mmu_context no-op functions

2020-10-09 Thread Stephen Rothwell
ssary testing. If it is useful enough (or important enough), then put in in your linux-next included branch, but don't ask Linus to merge it until the second week of the merge window ... no worse than some other stuff I see :-( -- Cheers, Stephen Rothwell pgpd9jmV4C_T0.pgp Description: OpenPGP digital signature

linux-next: Tree for Oct 9

2020-10-09 Thread Stephen Rothwell
ing 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 (3d006ee42dde Merge tag 'drm-fixes-2020-10-08' of git://anongit.freedesktop.org/drm/drm) Merging fixes/fixes (

linux-next: manual merge of the kspp tree with Linus' tree

2020-10-08 Thread Stephen Rothwell
ner when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpRvmJNMpDhD.pgp Description: OpenPGP digital signature

linux-next: manual merge of the rcu tree with the tip tree

2020-10-08 Thread Stephen Rothwell
r of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/linux/lockdep.h index f5594879175a,8555fd128ebf.. --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@@ -580,

linux-next: build failure after merge of the tip tree

2020-10-08 Thread Stephen Rothwell
compiles 317664a7fcc9 objtool: Fix reloc generation on big endian cross compiles 2a522b53c470 x86/insn: Support big endian cross-compiles 2486baae2cf6 objtool: Allow nested externs to enable BUILD_BUG() for today. This is a PowerPC LE native build of tools/perf. -- Cheers, Stephen Rothwell pgpW4NysEpBgh.pgp Description: OpenPGP digital signature

linux-next: Fixes tag needs some work in the powerpc tree

2020-10-08 Thread Stephen Rothwell
digits long Can be fixed by setting core.abbrev to 12 (or more) or (for git v2.11 or later) just making sure it is not set (or set to "auto"). -- Cheers, Stephen Rothwell pgpMlh0GLqqhz.pgp Description: OpenPGP digital signature

linux-next: Tree for Oct 8

2020-10-08 Thread Stephen Rothwell
y 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, Step

Re: linux-next: build warning after merge of the pm tree

2020-10-08 Thread Stephen Rothwell
Hi all, On Thu, 1 Oct 2020 19:43:37 +1000 Stephen Rothwell wrote: > > On Tue, 22 Sep 2020 18:11:26 +1000 Stephen Rothwell > wrote: > > > > After merging the pm tree, today's linux-next build (i386 defconfig) > > produced this warning: > > > >

linux-next: build failure after merge of the xarray tree

2020-10-07 Thread Stephen Rothwell
have added the following hack for today: From: Stephen Rothwell Date: Thu, 8 Oct 2020 17:52:11 +1100 Subject: [PATCH] XArray: export xa_delete_node() Signed-off-by: Stephen Rothwell --- lib/xarray.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/xarray.c b/lib/xarray.c index 3f0b143b

linux-next: build failure after merge of the xarray tree

2020-10-07 Thread Stephen Rothwell
ation] 305 | assert(1); | ^~ lib/test_xarray.c:11:1: note: 'assert' is defined in header ''; did you forget to '#include '? 10 | #include +++ |+#include 11 | Caused by commit 5c8052d7925b ("XArray test: Add new test") I have added th

Re: linux-next: build failure after merge of the drm-misc tree

2020-10-07 Thread Stephen Rothwell
Hi all, On Thu, 8 Oct 2020 14:09:03 +1100 Stephen Rothwell wrote: > > After merging the drm-misc tree, today's linux-next build (x86_64 > allmodconfig) failed like this: In file included from include/linux/clk.h:13, from drivers/gpu/drm/ingenic/ingenic-drm-drv

linux-next: build warning after merge of the tip tree

2020-10-07 Thread Stephen Rothwell
x86, powerpc: Rename memcpy_mcsafe() to copy_mc_to_{user, kernel}()") -- Cheers, Stephen Rothwell pgp_n7zVbctPr.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of the drm-misc tree

2020-10-07 Thread Stephen Rothwell
arked it BROKEN again. -- Cheers, Stephen Rothwell pgpf39fK0pSrS.pgp Description: OpenPGP digital signature

linux-next: manual merge of the risc-v tree with the risc-v-fixes tree

2020-10-07 Thread Stephen Rothwell
t to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/riscv/kernel/vmlinux.lds.S index 34d00d9e6eac,9795359cb9da.. --- a/arch/riscv/kernel/vmlinux.lds.S +++ b/arch/riscv/kerne

linux-next: Fixes tag needs some work in the gpio tree

2020-10-07 Thread Stephen Rothwell
;Documentation: gpio: add documentation for gpio-mockup") -- Cheers, Stephen Rothwell pgppBDeDzG55g.pgp Description: OpenPGP digital signature

linux-next: Tree for Oct 7

2020-10-07 Thread Stephen Rothwell
.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 maste

linux-next: manual merge of the net-next tree with the net tree

2020-10-06 Thread Stephen Rothwell
ou may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/rxrpc/conn_event.c index 64ace2960ecc,0628dad2bdea.. --- a/net/rxrpc/conn_event.c +++ b/net/rxrpc/conn_even

Re: linux-next: build warnings after merge of the akpm-current tree

2020-10-06 Thread Stephen Rothwell
Hi all, On Tue, 6 Oct 2020 16:01:38 -0400 Peter Xu wrote: > > On Tue, Oct 06, 2020 at 11:05:16PM +1100, Stephen Rothwell wrote: > > > > After merging the akpm-current tree, today's linux-next build (sparc > > defconfig) produced this warning: > > > > mm

Re: linux-next: build failure after merge of the vfs tree

2020-10-06 Thread Stephen Rothwell
an immediate. And the argument *is* an unsigned long > > after all. > > > > Stephen, can you confirm this fixes it? > > Still traveling, I didn't see an update on this. Any objections to the > below? I assume it fixes Stephen's build issue. Yes, it does fix my x86_64 allnoconfig build. -- Cheers, Stephen Rothwell pgpWJSjxfb9J9.pgp Description: OpenPGP digital signature

linux-next: Fixes tag needs some work in the powerpc tree

2020-10-06 Thread Stephen Rothwell
setting core.abbrev to 12 (or more) or (for git v2.11 or later) just making sure it is not set (or set to "auto"). Since Michael doesn't generally rebase his tree, this is more to be remebered for next time. -- Cheers, Stephen Rothwell pgpAKJESNnTAm.pgp Description: OpenPGP digital signature

linux-next: Tree for Oct 6

2020-10-06 Thread Stephen Rothwell
any randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (7575fdda569b Merge tag 'platform-drivers-x86-v5.9-2' of git://git.infradead.org/linux-platform-drivers-x86) Me

linux-next: build warnings after merge of the akpm-current tree

2020-10-06 Thread Stephen Rothwell
uot;mm-remove-src-dst-mm-parameter-in-copy_page_range-v2") -- Cheers, Stephen Rothwell pgpbOAgUhK3qi.pgp Description: OpenPGP digital signature

<    7   8   9   10   11   12   13   14   15   16   >