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

is is worth rebasing for, but in the future it 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 pgpvAu3VqLCXb.pgp Description: OpenPGP digital signature

linux-next: Tree for Feb 25

isskb.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 checkou

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

Hi all, On Mon, 15 Feb 2021 08:54:41 +1100 Stephen Rothwell wrote: > > On Wed, 27 Jan 2021 22:43:51 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the akpm-current tree got a conflict in: > > > > fs/hugetlbfs/inode.c > > >

Re: linux-next: manual merge of the fscache tree with the pidfd tree

Hi all, On Mon, 15 Feb 2021 08:14:39 +1100 Stephen Rothwell wrote: > > On Wed, 27 Jan 2021 10:00:38 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the fscache tree got a conflict in: > > > > include/linux/fs.h > > > > be

Re: linux-next: manual merge of the pidfd tree with the vfs tree

Hi all, On Mon, 15 Feb 2021 07:55:14 +1100 Stephen Rothwell wrote: > > On Mon, 25 Jan 2021 16:17:06 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > fs/coredump.c > > > > betwe

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

Hi all, Commits 557fb5faf4ca ("PCI: qcom: Add support for ddrss_sf_tbu clock") 3d0e5cf9c062 ("dt-bindings: PCI: qcom: Document ddrss_sf_tbu clock for sm8250") are missing a Signed-off-by from their committer. -- Cheers, Stephen Rothwell pgpBSOHTylBBZ.pgp Descript

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

Hi Chaitanya, On Wed, 24 Feb 2021 05:38:06 + Chaitanya Kulkarni wrote: > > On 2/23/21 21:33, Stephen Rothwell wrote: > >> I've failed to understand this warning as rwbs is present in the doc header > >> and in the function parameter :- > > I presume it

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

Hi Chaitanya, On Wed, 24 Feb 2021 05:25:49 + Chaitanya Kulkarni wrote: > > On 2/23/21 18:31, Stephen Rothwell wrote: > > Hi all, > > > > After merging the block tree, today's linux-next build (htmldocs) > > produced this warning: > > > > kerne

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

Hi all, Commit 67cbb9c55759 ("Makefile: reuse CC_VERSION_TEXT") is missing a Signed-off-by from its committer. -- Cheers, Stephen Rothwell pgppTMxG8uhn4.pgp Description: OpenPGP digital signature

linux-next: Tree for Feb 24

ndy 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 (5cf0fd591f2e Kbuild: disable TRIM_UNUSED_KSYMS option) Merging fixes/fixes (e71ba9452f0b Linux 5.11

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

mment") -- Cheers, Stephen Rothwell pgpk2XbuNI0x1.pgp Description: OpenPGP digital signature

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

/amdgpu_dm.h:380: warning: Function parameter or member 'vblank_workqueue' not described in 'amdgpu_display_manager' Introduced by commit 3cfd14b67b2c ("drm/amd/display: Fix system hang after multiple hotplugs (v2)") -- Cheers, Stephen Rothwell pgpuqW2vGYSW9.pgp Description: OpenP

Re: linux-next: Signed-off-by missing for commits in Linus' tree

Hi Linus, On Tue, 23 Feb 2021 16:33:47 -0800 Linus Torvalds wrote: > > On Tue, Feb 23, 2021 at 4:31 PM Stephen Rothwell > wrote: > > > > are missing a Signed-off-by from their committer. > > Gaah. Maybe I should do some pre-pull hook or something to notice thi

linux-next: Signed-off-by missing for commits in Linus' tree

neration with Clang's assembler") 99d0021569c7 ("objtool: Add a pass for generating __mcount_loc") are missing a Signed-off-by from their committer. -- Cheers, Stephen Rothwell pgp82vBBoZI2K.pgp Description: OpenPGP digital signature

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

'dm' [-Wunused-variable] 5439 | struct amdgpu_display_manager *dm = >dm; | ^~ Introduced by commit 3cfd14b67b2c ("drm/amd/display: Fix system hang after multiple hotplugs (v2)") -- Cheers, Stephen Rothwell pgpK6vZ3eWTWN.pgp Description: Op

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

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 drivers/soc/Makefile index 9bceb12b291d,34b23645be14.. --- a/drivers/soc/Makefile +++ b/drivers/soc/

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

Hi all, On Fri, 19 Feb 2021 17:01:13 +0100 Paolo Bonzini wrote: > > On 19/02/21 16:33, Vitaly Kuznetsov wrote: > > Stephen Rothwell writes: > >> > >> Building Linus' tree, today's linux-next build (htmldocs) produced > >> these warnings: > >> &

Re: linux-next: build warning in Linus' tree

t; > > > c159376490ee ("x86/platform/uv: Update ABI documentation of > > /sys/firmware/sgi_uv/") > > > > Or maybe an ealier one. > > > > This has been around for some time. I am still seeing this warning. -- Cheers, Stephen Rothwell pgpKCMxfUNDwK.pgp Description: OpenPGP digital signature

linux-next: Tree for Feb 23

isskb.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 checkou

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

-- Cheers, Stephen Rothwell pgpk40n6cKye0.pgp Description: OpenPGP digital signature

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

Hi all, On Mon, 15 Feb 2021 07:44:31 +1100 Stephen Rothwell wrote: > > On Mon, 11 Jan 2021 13:08:51 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the char-misc tree got conflicts in: > > > > include/linux/mod_devicetable.h > &

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

| io_ctx_disable_sqo_submit(ctx); | ^ Caused by commit a6afa091d06a ("io_uring: move SQPOLL thread io-wq forked worker") I have used the block tree from next-20210222 for today. -- Cheers, Stephen Rothwell pgp9JL1ZXush0.pgp Description: OpenPGP digital signature

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

tiple hotplugs") I have used the amdgpu tree from next-20210222 for today. -- Cheers, Stephen Rothwell pgpFRieHPjpC9.pgp Description: OpenPGP digital signature

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

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/pci.c index b67c4327d307,13b89b1e29ed.. --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@@ -1434,6

Re: linux-next: manual merge of the pidfd tree with the integrity tree

Hi all, On Mon, 15 Feb 2021 08:07:17 +1100 Stephen Rothwell wrote: > > On Mon, 25 Jan 2021 17:18:18 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > security/integrity/ima/

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

Hi Stephen, On Fri, 12 Feb 2021 15:31:42 +1100 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the spi tree got a conflict in: > > drivers/spi/spi-mpc52xx.c > > between commit: > > e10656114d32 ("spi: mpc52xx: Avoid using get

Re: linux-next: manual merge of the kspp tree with the mips tree

Hi all, On Mon, 15 Feb 2021 07:47:26 +1100 Stephen Rothwell wrote: > > On Mon, 18 Jan 2021 15:08:04 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the kspp tree got a conflict in: > > > > include/asm-generic/vmlin

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

Hi all, On Mon, 15 Feb 2021 09:32:02 +1100 Stephen Rothwell wrote: > > On Fri, 5 Feb 2021 14:45:40 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the devicetree tree got a conflict in: > > > > scripts/Makefile.lib > > >

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

. 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/mips/kernel/syscalls/Makefile index a1ce8b7dbcfa,ed22b711ccb7.. --- a/arch/mips/kernel/syscalls/Make

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

Hi Grygorii, On Mon, 22 Feb 2021 12:35:10 +0200 Grygorii Strashko wrote: > > Sorry for inconvenience, is there anything I can do to help resolve it? > (Changes went through a different trees) No, it is fine. -- Cheers, Stephen Rothwell pgpKLoMTrD3Vl.pgp Description: OpenPG

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

Just use git log -1 --format='Fixes: %h ("%s")' -- Cheers, Stephen Rothwell pgpmLofDQ3EHa.pgp Description: OpenPGP digital signature

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

e) or (for git v2.11 or later) just making sure it is not set (or set to "auto"). -- Cheers, Stephen Rothwell pgpGtWOQNxr6z.pgp Description: OpenPGP digital signature

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

bbrev 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 pgp8_mJXCk_HZ.pgp Description: OpenPGP digital signature

linux-next: Tree for Feb 22

onfigs 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 (5bbb336ba75d Merge tag 'for-5.12

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

Hi all, On Mon, 15 Feb 2021 11:39:39 +1100 Stephen Rothwell wrote: > > Hi all, > > After merging the pm tree, today's linux-next build (x86_64 allmodconfig) > produced this warning: > > In file included from drivers/gpu/drm/gma500/mdfld_output.c:28: > arch/x86/includ

Re: linux-next: manual merge of the gpio-brgl tree with the net-next tree

Hi all, On Tue, 16 Feb 2021 18:19:38 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the gpio-brgl tree got a conflict in: > > MAINTAINERS > > between commit: > > df53e4f48e8d ("MAINTAINERS: Add entries for Toshiba Visconti ethernet > con

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

Hi all, On Mon, 15 Feb 2021 07:53:21 +1100 Stephen Rothwell wrote: > > On Thu, 21 Jan 2021 13:26:45 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the devicetree tree got a conflict in: > > > > Documentation/devicetree/bindin

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

Presumably introduced by commit 520615e1f5b2 ("sparc64: switch defconfig from the legacy ide driver to libata") or commit a57cdeb369ef ("sparc: sparc64_defconfig: add necessary configs for qemu") -- Cheers, Stephen Rothwell pgpE8kyip6QAs.pgp Description: OpenPGP digital signature

linux-next: manual merge of the devicetree tree with the arm64-fixes tree

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 pgpYV2qmee0a5.pgp Description: OpenPGP digital signature

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

Hi all, On Wed, 17 Feb 2021 16:07:14 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/x86/platform/intel-mid/device_libs/platform_bt.c > > between commit: > > 4590d98f5a4f ("sfi: Remove framework for de

Re: linux-next: manual merge of the xfs tree with the pidfd tree

Hi all, On Mon, 15 Feb 2021 09:41:31 +1100 Stephen Rothwell wrote: > > On Mon, 8 Feb 2021 10:33:48 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the xfs tree got a conflict in: > > > > fs/xfs/xfs_ioctl.c > > > > between c

Re: linux-next: manual merge of the pidfd tree with the xfs tree

Hi all, On Mon, 15 Feb 2021 08:42:43 +1100 Stephen Rothwell wrote: > > On Wed, 27 Jan 2021 11:24:41 +1100 Stephen Rothwell > wrote: > > > > On Mon, 25 Jan 2021 17:14:14 +1100 Stephen Rothwell > > wrote: > > > > > > Today's linu

Re: linux-next: manual merge of the pidfd tree with the vfs tree

Hi all, On Mon, 15 Feb 2021 08:05:21 +1100 Stephen Rothwell wrote: > > On Mon, 25 Jan 2021 17:00:54 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > fs/namei.c > > > > betwe

Re: linux-next: manual merge of the pidfd tree with the f2fs tree

Hi all, On Mon, 15 Feb 2021 08:01:44 +1100 Stephen Rothwell wrote: > > On Mon, 25 Jan 2021 16:48:06 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > fs/f2fs/file.c > > > > between

Re: linux-next: manual merge of the pidfd tree with the f2fs tree

Hi all, On Mon, 15 Feb 2021 07:58:06 +1100 Stephen Rothwell wrote: > > Hi all, > > On Mon, 25 Jan 2021 16:32:55 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > fs/f2fs/acl.c > >

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

Hi all, On Mon, 15 Feb 2021 09:14:44 +1100 Stephen Rothwell wrote: > > On Tue, 2 Feb 2021 09:01:35 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the arm-soc tree got a conflict in: > > > > arch/arm/Kconfig.debug > > > > b

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

anged work") I have used the kbuild tree from next-20210219 for today. -- Cheers, Stephen Rothwell pgpSx9mm6li_Y.pgp Description: OpenPGP digital signature

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgp2ao3vU_NgA.pgp Description: OpenPGP digital signature

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

Hi Alain, On Sat, 20 Feb 2021 20:45:25 +0100 Alain Volmat wrote: > > sorry for the delay, is there anything I should do concerning this issue > ? No, it should be taken care of my the maintainers when they get Linus to merge their trees. -- Cheers, Stephen Rothwell pgp6n6zD

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

quot;io_uring: don't hold uring_lock when calling io_run_task_work*") -- Cheers, Stephen Rothwell pgpOB8SLSghjl.pgp Description: OpenPGP digital signature

linux-next: Tree for Feb 19

g fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (f40ddce88593 Linux 5.11) Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) Merging kbuild-current/fixes (fe968c41ac4f scripts: set proper OpenSSL include dir also for sign-file) Merging

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

Hi all, On Fri, 19 Feb 2021 07:52:56 +1100 Stephen Rothwell wrote: > > After merging the net-next tree, today's linux-next build (htmldocs) > produced these warnings: > > Documentation/networking/filter.rst:1053: WARNING: Inline emphasis > start-string without end-strin

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

c21d54f0307f ("KVM: x86: hyper-v: allow KVM_GET_SUPPORTED_HV_CPUID as a system ioctl") These have been around for some time. -- Cheers, Stephen Rothwell pgpchDfXKjASL.pgp Description: OpenPGP digital signature

linux-next: build warning in Linus' tree

Or maybe an ealier one. This has been around for some time. -- Cheers, Stephen Rothwell pgpt2guL9e9VU.pgp Description: OpenPGP digital signature

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

other atomics in .imm") Sorry that I missed these earlier. -- Cheers, Stephen Rothwell pgpAVuGRrrYP1.pgp Description: OpenPGP digital signature

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

Hi all, On Thu, 18 Feb 2021 07:52:52 -0600 Rob Herring wrote: > > On Thu, Feb 18, 2021 at 5:34 AM Stephen Rothwell > wrote: > > > > On Thu, 18 Feb 2021 21:44:37 +1100 Michael Ellerman > > wrote: > > > > > > I think it just needs this? > >

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

ze_ppc64() also includes fdt_totalsize(initial_boot_params) so I was not sure. Maybe kexec_fdt_totalsize_ppc64() needs modification as well? -- Cheers, Stephen Rothwell pgpHi192JCAyQ.pgp Description: OpenPGP digital signature

linux-next: Tree for Feb 18

ests 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, Ste

linux-next: build failure after merge of the gpio-brgl tree

io-brgl tree from next-20210217 for today. -- Cheers, Stephen Rothwell pgptGG7rc1eFP.pgp Description: OpenPGP digital signature

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

Hi all, On Mon, 15 Feb 2021 09:11:24 +1100 Stephen Rothwell wrote: > > On Mon, 1 Feb 2021 14:42:59 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the irqchip tree got a conflict in: > > > > > > Documentation/devicetree/bindings/i

linux-next: manual merge of the devicetree tree with the powerpc tree

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 pgpkJa02HZ4y3.pgp Description: OpenPGP digital signature

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

Hi all, Commit bc5d1d0f8b38 ("Revert "powerpc: Move ima buffer fields to struct kimage"") is missing a Signed-off-by from its author and committer. Reverts are commits as well. -- Cheers, Stephen Rothwell pgpmBJNVYyA2w.pgp Description: OpenPGP digital signature

linux-next: Tree for Feb 17

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.

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

ubmitted 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 pgppcBkiaaYcx.pgp Description: OpenPGP digital signature

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

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 drivers/net/ethernet/ibm/ibmvnic.c i

linux-next: manual merge of the pm tree with the i3c tree

the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc MAINTAINERS index fdb32f96ede9,f7ec274a3e5a.. --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -16221,21 -16235,6 +16218,14 @@@ S: Maintaine F:Documentation/fb/sm712fb.rst F:drive

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

Hi Yoshihiro, On Tue, 16 Feb 2021 11:53:56 + Yoshihiro Shimoda wrote: > > > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM > > > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts > > index 2407b2d89c1e,48fa8776e36f.. >

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

Hi all, Commit f204a0ab8c4f ("cifs: update internal version number") is missing a Signed-off-by from its author and committer. -- Cheers, Stephen Rothwell pgpuAzNQ0vXCs.pgp Description: OpenPGP digital signature

linux-next: Tree for Feb 16

g fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (f40ddce88593 Linux 5.11) Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) Merging kbuild-current/fixes (fe968c41ac4f scripts: set proper OpenSSL include dir also for sign-file) Merging

Re: [PATCH v2] fs: ubifs: set s_uuid in super block to support ima/evm uuid options

Hi Andy, On Tue, 16 Feb 2021 11:11:08 +0200 Andy Shevchenko wrote: > > Stephen, do you have a check in Linux Next to catch the problem that > Co-developed-by is not being accompanied by a corresponding SoB? No, but I will see about adding one. Thanks fo rthe heads up. -- Cheers

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

:112: /home/sfr/next/next/drivers/cxl/mem.c:474: WARNING: Inline literal start-string without end-string. Introduced by commit b754ffbbc0ee ("cxl/mem: Add basic IOCTL interface") -- Cheers, Stephen Rothwell pgpEz6j3jkgeH.pgp Description: OpenPGP digital signature

linux-next: manual merge of the gpio-brgl tree with the arm-soc, net-next trees

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpnzXM19cg5x.pgp Description: OpenPGP digital signature

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

. 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 MAINTAINERS index 9a8285485f0d,656ae6685430.. --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2615,13 -2641,11 +2615,15 @@

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

complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts index 2407b2d89c1e,48fa8776e36f.. --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts @@@ -42,11 -42,20 +42,29 @@@

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

2 ("lib/cmdline: Update documentation to reflect behaviour") d3c7cfc6d3dc ("lib/cmdline_kunit: add a new test case for get_options()") 1d10243dc295 ("gpio: merrifield: Make bias configuration available for GPIOs") are missing a Signed-off-by from their committer. One of the hazards of rebasing :-( -- Cheers, Stephen Rothwell pgpkYpFRxsZ7Q.pgp Description: OpenPGP digital signature

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

rdering is not set in stone yet (I have only done the merge in the linux-next tree), just make sure that Dave knows what it should look like when he merges the net and net-next trees. -- Cheers, Stephen Rothwell pgp2Bll3CeKtr.pgp Description: OpenPGP digital signature

Re: linux-next: qemu boot failure after merge of the tip tree

Hi Ingo, On Mon, 15 Feb 2021 10:56:51 +0100 Ingo Molnar wrote: > > * Stephen Rothwell wrote: > > > > This fix has not reached the tip auto-latest branch yet and so is not in > > linux-next. > > This fix should be there now as: > >

linux-next: Tree for Feb 15

r for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (358feceebbf6 Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux) Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2) Merging

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

' not described in 'cxl_send_command' Introduced by commit 7e20cad0a205 ("cxl/mem: Add basic IOCTL interface") -- Cheers, Stephen Rothwell pgpTfQ7W415gO.pgp Description: OpenPGP digital signature

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc kernel/trace/trace.c index b5815a022ecc,b79bcacdd6f9.. --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@@ -27

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

by commit 09cf6ee6d21c ("mtd: parsers: ofpart: support BCM4908 fixed partitions") I have used the mtd tree from next-20210212 for today. -- Cheers, Stephen Rothwell pgpVeW81UGTiF.pgp Description: OpenPGP digital signature

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

imise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c index a2e0b548bf57,d3534b657b98.. --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@@ -65,7

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

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, Stephen Rothwell diff --

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

o see these warnings in Linus' build testing, you need to make sure that the drm-misc tree is merged before the pm tree (or the drivers-x86 tree). Or you need to include module.h in mdfld_output.c before intel_scu_ipc.h (or in intel_scu_ipc.h itself). -- Cheers, Stephen Rothwell pgp30b690u5z0.pgp

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

Hi Arjun, On Sun, 14 Feb 2021 13:40:38 -0800 Arjun Roy wrote: > > Sorry, I was confused from the prior email. Is any action required at > the moment, or not? No. This is just something that the net-next and bpf-next maintainers need to sort out when they merge their trees. -- Cheers

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

Hi all, On Mon, 8 Feb 2021 23:37:16 +1100 Stephen Rothwell wrote: > > After merging the v4l-dvb tree, today's linux-next build (htmldocs) > produced this warning: > > include/media/v4l2-async.h:178: warning: expecting prototype for > v4l2_async_notifier_add_fwnode_s

Re: linux-next: manual merge of the xfs tree with the pidfd tree

Hi all, On Mon, 8 Feb 2021 10:33:48 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the xfs tree got a conflict in: > > fs/xfs/xfs_ioctl.c > > between commit: > > f736d93d76d3 ("xfs: support idmapped mounts") > > from the pidfd tr

Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree

Hi all, On Thu, 4 Feb 2021 15:58:46 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drivers-x86 tree got a conflict in: > > drivers/gpu/drm/gma500/Kconfig > drivers/gpu/drm/gma500/mdfld_device.c > drivers/gpu/drm/gma500/mdfld_dsi_output.c > d

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

Hi all, On Fri, 5 Feb 2021 14:45:40 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the devicetree tree got a conflict in: > > scripts/Makefile.lib > > between commit: > > d73a6a04c76a ("kbuild: use always-y instead of extra-y") &g

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

Hi all, On Tue, 2 Feb 2021 14:16:18 +1100 Stephen Rothwell wrote: > > On Tue, 2 Feb 2021 13:57:14 +1100 Stephen Rothwell > wrote: > > > > After merging the block tree, today's linux-next build (powerpc > > ppc64_defconfig) failed like this: > &

Re: linux-next: manual merge of the block tree with the btrfs tree

Hi all, On Tue, 2 Feb 2021 13:45:59 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the block tree got a conflict in: > > fs/iomap/direct-io.c > > between commit: > > dffd1df2d29a ("iomap: support REQ_OP_ZONE_APPEND") &

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

Hi all, On Tue, 2 Feb 2021 09:01:35 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in: > > arch/arm/Kconfig.debug > > between commits: > > 9ca4efec0aba ("ARM: 9040/1: use DEBUG_UART_PHYS and DEBUG

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

Hi all, On Mon, 1 Feb 2021 14:42:59 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the irqchip tree got a conflict in: > > > Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml > > between commit: > > 752b

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

Hi all, On Mon, 1 Feb 2021 12:30:12 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the drm tree got a conflict in: > > drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h > > between commit: > > a119f87b86bc ("Revert "drm/amdgpu/swsmu: drop set_f

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

Hi all, On Fri, 29 Jan 2021 15:53:41 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the char-misc tree got conflicts in: > > drivers/tty/n_tracerouter.c > drivers/tty/n_tracesink.c > > between commit: > > 3b830a9c34d5 ("tty: convert

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

Hi all, On Thu, 28 Jan 2021 16:56:11 +1100 Stephen Rothwell wrote: > > On Mon, 25 Jan 2021 15:02:13 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the scsi-mkp tree got a conflict in: > > > > drivers/scsi/gdth.c > > >

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

Hi all, On Wed, 27 Jan 2021 22:43:51 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > fs/hugetlbfs/inode.c > > between commit: > > 2f221d6f7b88 ("attr: handle idmapped mounts") &

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

Hi all, On Thu, 28 Jan 2021 10:27:47 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the risc-v tree got a conflict in: > > arch/arm64/mm/Makefile > > between commit: > > 072e3d96a79a ("arm64: hibernate: move page handling function to n

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

Hi all, On Wed, 27 Jan 2021 22:39:18 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > fs/btrfs/file.c > > between commit: > > 0225a20db6d8 ("btrfs: Prevent nowait or async read from doing sync

Re: linux-next: manual merge of the pidfd tree with the xfs tree

Hi all, On Wed, 27 Jan 2021 11:24:41 +1100 Stephen Rothwell wrote: > > On Mon, 25 Jan 2021 17:14:14 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the pidfd tree got a conflict in: > > > > fs/xfs/xfs_inode.c > > > > betwe

<    1   2   3   4   5   6   7   8   9   10   >