er-core tree.
--
Cheers,
Stephen Rothwell
pgp8Of2wzeRTY.pgp
Description: OpenPGP digital signature
t;
> Instead of fixing the build, it breaks the build.
>
> pw-bot: cr
This patch is only needed in linux-next. It should be applied to the
driver-core tree - since that includes commit 97d06802d10a. It should
also have a Fixes tag referencing commit 97d06802d10a.
--
Cheers,
Stephen Rothwell
pgp1bO91EgLiA.pgp
Description: OpenPGP digital signature
through Andrew's tree to avoid
> conflicts. Please take it through yours.
If they have been rebased onto mm-nonmm-unstable, then they really need
to go through Andrew' tree (since mm-nonmm-unstable gets rebased often).
--
Cheers,
Stephen Rothwell
pgp6J5AZ7185E.pgp
Description: OpenPGP digital signature
Hi Luis,
On Sun, 20 Oct 2024 10:28:20 -0700 Luis Chamberlain wrote:
>
> Yes please add: petr.pa...@suse.com, samitolva...@google.com,
> da.go...@samsung.com
Done.
--
Cheers,
Stephen Rothwell
pgpkuoe4gO9RM.pgp
Description: OpenPGP digital signature
git#for-next
Done
Currently only you, Luis, are listed as a contact. Should I add anyone else?
--
Cheers,
Stephen Rothwell
pgpKhE13AGItN.pgp
Description: OpenPGP digital signature
I had to revert yesterday.
--
Cheers,
Stephen Rothwell
pgp0GZT9jLG1O.pgp
Description: OpenPGP digital signature
skb.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 checko
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
pgpZSIISeFaSc.pgp
Description: OpenPGP digital signature
: note: format string is defined here
481 | dev_dbg(qspi->dev, "%s len = 0x%x offs = 0x%llx buf = 0x%p\n",
__func__, len, offs, buf);
| ~^
| |
| unsigned int
| %lx
Introdu
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
owerpc/traps: Enhance readability for trap types")
I have applied the following patch for today.
From: Stephen Rothwell
Date: Mon, 19 Apr 2021 19:05:05 +1000
Subject: [PATCH] fix up for "powerpc/traps: Enhance readability for trap types"
Signed-off-by: Stephen Rothwell
---
a
um number of links to
128")
--
Cheers,
Stephen Rothwell
pgpSxmQ9sIt8x.pgp
Description: OpenPGP digital signature
intainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/f2fs/namei.c
index 405d85dbf9f1,377c6b161b23..
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@@ -416,10 -416,8 +416,9 @@@ out
struct dentry *f2fs_get_parent(struct den
ting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/xfs/xfs_ioctl.c
index bf490bfae6cb,bbda105a2ce5..
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@@ -1056,77 -1057,17 +1057,19 @@@ xfs_ioc_ag_geometry
static void
xfs_fill_fsxattr(
fd8e8b ("veth: allow enabling NAPI even without XDP")
--
Cheers,
Stephen Rothwell
pgpEC523gR0tU.pgp
Description: OpenPGP digital signature
Hi all,
On Fri, 16 Apr 2021 16:02:01 +0200 Paolo Bonzini wrote:
>
> On 16/04/21 14:38, Christian Borntraeger wrote:
> > On 16.04.21 14:27, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> In commit
> >>
> >> c3171e94cc1c ("KVM
git log -1 --format='Fixes: %h ("%s")'
--
Cheers,
Stephen Rothwell
pgp8D6dFguKch.pgp
Description: OpenPGP digital signature
skb.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 checko
Hi all,
On Fri, 16 Apr 2021 17:58:06 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> include/uapi/linux/android/binder.h
>
> between commits:
>
> 432ff1e91694 ("binder: BINDER_FREEZE
ting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc kernel/printk/printk.c
index 421c35571797,d13be89530c4..
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@@ -394,11 -411,8 +394,12 @@@ static struct latched_seq clear_se
rned, 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 -
which case, this patch should not be in linux-next (or any branch
that is included by linux-next).
--
Cheers,
Stephen Rothwell
pgpe8OeiFcmwZ.pgp
Description: OpenPGP digital signature
Hi all,
This is actually just a warning.
On Fri, 16 Apr 2021 13:48:27 +1000 Stephen Rothwell
wrote:
>
> Hi all,
>
> After merging the mmc tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from drive
ev->pio_fifo, buffer, 4);
| ^
Caused by commit
4b00ed3c5072 ("memstick: r592: remove unused variable")
Please check the fixes for "simple, robot reported" warnings :-(
--
Cheers,
Stephen Rothwell
pgp9fZLWkh9zV.pgp
Description: OpenPGP digital signature
2 | struct pci_dev *rdev;
| ^~~~
Introduced by commit
9597624ef606 ("nvme: put some AMD PCIE downstream NVME device to simple
suspend/resume path")
--
Cheers,
Stephen Rothwell
pgpI2syQttFk6.pgp
Description: OpenPGP digital signature
lag)
> >
> > This would minimise the conflits with the changes I did in powerpc/next
> > reported by Stephen R.
> >
>
> I'll drop powerpc-64s-radix-enable-huge-vmalloc-mappings.patch for now,
> make life simpler.
I have dropped that patch from linux-next.
--
Cheers,
Stephen Rothwell
pgpxAl10ZqUKJ.pgp
Description: OpenPGP digital signature
Hi all,
Fetching the scmi tree produces this error:
fatal: couldn't find remote ref refs/heads/for-linux-next
I will use the scmi tree from next-20210415 for today.
--
Cheers,
Stephen Rothwell
pgp0J0njab4ca.pgp
Description: OpenPGP digital signature
}
> >+}
> >+ }
>
> With https://git.kernel.org/netdev/net/c/00423969d806 that reverts
> stmmac_reinit_rx_buffers(), then the above dma_recycle_rx_skbufs()
> is no longer needed when net-next is sent for merge.
Thanks. I have added removal of that (now unused) function to my merge
resolution.
--
Cheers,
Stephen Rothwell
pgp7tmTAfcDCC.pgp
Description: OpenPGP digital signature
Hi all,
In commit
af5247b169a0 ("iommu/mediatek: Always enable the clk on resume")
Fixes tag
Fixes: commit c0b57581b73b ("iommu/mediatek: Add power-domain operation")
has these problem(s):
- leading word 'commit' unexpected
--
Cheers,
Stephen Rothwell
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 (7f75285ca572 Merge tag 'for-5.12/dm-fixes-3' of
git://git.kernel.org/pub/scm/linux/kernel/git/device-
Hi all,
On Thu, 15 Apr 2021 19:44:17 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/powerpc/kernel/module.c
>
> between commit:
>
> 2ec13df16704 ("powerpc/modules: Load modules closer to k
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 arch/powerpc/kernel/module.c
index fab84024650c,cdb2d88c54e7..
--- a/arch/powerpc/kernel/module.c
+++ b/arc
m.c:144:43: note: format string is
defined here
144 | dev_err(&p->pdev->dev, "flush error: %lld", rc);
|~~~^
| |
| long long int
| %ld
Int
may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
pgpau0KrImBu4.pgp
Description: OpenPGP digital signature
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 --cc drivers/ne
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/infiniband/hw/hfi1/hfi.h
index 2a9a040569eb,2183d02ccfa2..
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/dr
Introduced by commit
95d143923379 ("macintosh/via-pmu: Make some symbols static")
--
Cheers,
Stephen Rothwell
pgpzhoRtj0jYy.pgp
Description: OpenPGP digital signature
Hi all,
In commit
a4856e15e58b ("ASoC: rsnd: check all BUSIF status when error")
Fixes tag
Fixes: commit 66c705d07d784 ("SoC: rsnd: add interrupt support for SSI BUSIF
buffer")
has these problem(s):
- leading word 'commit' unexpected
--
Cheers,
Stephe
Hi all,
Commit
ff57cfaa3d68 ("platform/x86: pmc_atom: Match all Beckhoff Automation baytrail
boards with critclk_systems DMI table")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpK7vO1nXM1y.pgp
Description: OpenPGP digital signature
ork, 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 (eebe426d32e1 Merge tag 'fixes-for-5.12-rc7
>
> | The check was added when Stephen Rothwell created the file, but
> | no architecture ever defined it.
Actually it was used by the xtensa architecture until Dec, 2006.
--
Cheers,
Stephen Rothwell
pgpBR9mvgcEgm.pgp
Description: OpenPGP digital signature
s for
wiphy_rfkill_set_hw_state_reason() instead
Introduced by commit
6f779a66dc84 ("cfg80211: allow specifying a reason for hw_rfkill")
--
Cheers,
Stephen Rothwell
pgpw3cTEr22Ef.pgp
Description: OpenPGP digital signature
dy 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 (89698becf06d Merge tag 'm68knommu-for-v5.12-rc7' of
git://git.kernel.org/pub/scm/linux/k
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
diff --cc lib/test_kasan.c
index 785e724ce0d8,bf9225002a7e..
--- a/lib/test_kasan.
ry. This
is now fixed as far as 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 c
dvice 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 (d
usive if O_CREAT is set in open flags)
tmpfile:no
fileattr_get: no or exclusive
fileattr_set: exclusive
=
Introduced by commit
10a489bbff3e ("vfs: add fileattr ops")
--
Cheers,
Stephen Rothwell
pgpE8gRPSDW83.
the ports to the connectors they are attached to")
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell
pgpGxijrgDzm3.pgp
Description: OpenPGP digital signature
ts 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 --cc certs/system_keyring.c
index
ote: in definition of macro 'list_entry_is_head'
619 | (&pos->member == (head))
|^~~~
net/bridge/netfilter/ebtables.c:1248:2: note: in expansion of macro
'list_for_each_entry'
1248 | list_for_each_entry(t, &net->xt.tables[NFPROTO_BRIDGE],
n 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 --cc fs/xfs/xfs_ioctl.
f the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/overlayfs/file.c
index 6e454a294046,9bd4167cc7fb..
--- a/fs/overlayfs/file.c
+++ b/fs/overlayfs/file.c
@@@ -716,11 -590,6 +610,7 @@@ const struct file_operations
bmitted 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
pgp4nwGQBhKsL.pgp
Description: OpenPGP digital signature
l: at91-pio4: add support for slew-rate")
--
Cheers,
Stephen Rothwell
pgpzjFjLckjKI.pgp
Description: OpenPGP digital signature
Hi all,
Commit
a20c5c4f18ae ("Revert "KVM: arm64: Fully zero the vcpu state on reset"")
is missing a Signed-off-by from its author and committer.
Reverts are commits, too.
--
Cheers,
Stephen Rothwell
pgpct2wU1yn3K.pgp
Description: OpenPGP digital signature
to fix, but this can be avoided in future
commits 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
pgpCn3AX9grnz.pgp
Description: OpenPGP digital signature
Hi all,
Commit
6fa6517fe62e ("ata: ahci_tegra: call tegra_powergate_power_off only when PM
domain is not present")
is missing a Signed-off-by from its author.
--
Cheers,
Stephen Rothwell
pgpDJVYCj80z8.pgp
Description: OpenPGP digital signature
Hi all,
In commit
36303413885e ("crypto: chelsio - Read rxchannel-id from firmware")
Fixes tag
Fixes: 567be3a5d227 ("crypto: chelsio - Use multiple txq/rxq per tfm to
process the requests)
has these problem(s):
- Subject has leading but no trailing quotes
--
Cheers,
S
This is probably not worth rebasing to fix, but can be avoided in future
commits 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
pgpDry4G_jWwd.pgp
Description: OpenPGP digital signature
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
t a cast [-Wint-conversion]
47 | addr = ioremap_np(offset, size);
|^
Caused by commits
7c566bb5e4d5 ("asm-generic/io.h: Add a non-posted variant of ioremap()")
89897f739d7b ("of/address: Add infrastructure to declare MMIO as non-posted")
(and maybe some others)
I have reverted 86332e9e3477..7d2d16ccf15d for today.
--
Cheers,
Stephen Rothwell
pgpsFFLeLZ6dH.pgp
Description: OpenPGP digital signature
ider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index f5efa8c0b927,7dd6b67f0f51..
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11993,14 -11872,14 +12004,22 @@@ F:
drive
nflicts 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 --cc drivers/irqchip/Kconfig
index d3a1
Hi all,
On Fri, 19 Mar 2021 13:05:51 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the security tree got conflicts in:
>
> arch/alpha/kernel/syscalls/syscall.tbl
> arch/arm/tools/syscall.tbl
> arch/arm64/include/asm/unistd.h
> arch/arm64/inclu
tion twice :-(
I have applied a merge fix patch removing the second copy.
--
Cheers,
Stephen Rothwell
pgpkuFLHsq5DI.pgp
Description: OpenPGP digital signature
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/gpu/drm/vc4/vc4_plane.c
index 1e9c84cf614a,c76e73a452e0..
--- a/drivers/gpu/drm/vc4/vc4_plane.c
Hi all,
On Thu, 8 Apr 2021 09:56:12 +1000 Stephen Rothwell
wrote:
>
> After merging the mvebu tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
>
> arch/arm/boot/dts/armada-385-atl-x530.dts:171.14-199.4: Warning
> (spi_bus_reg): /soc/spi
Hi all,
Commit
042a00f93aad ("IB/{ipoib,hfi1}: Add a timeout handler for rdma_netdev")
is missing a Signed-off-by from its author.
--
Cheers,
Stephen Rothwell
pgptkYYVJhQ2f.pgp
Description: OpenPGP digital signature
Hi all,
Commit
11cccec79c60 ("genirq: Add IRQF_NO_AUTOEN for request_irq/nmi()")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgppsj7QakBNS.pgp
Description: OpenPGP digital signature
Hi all,
Commit
e67fcb31fb0e ("stuff")
is missing a Signed-off-by from its author and comitter.
--
Cheers,
Stephen Rothwell
pgpjy3npdNnMZ.pgp
Description: OpenPGP digital signature
arm64: Add support for the KVM PTP service")
--
Cheers,
Stephen Rothwell
pgpD_PQNVEWT_.pgp
Description: OpenPGP digital signature
ork, 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 (454859c552da Merge tag 'arc-5.12-rc7' of
Hi all,
On Thu, 8 Apr 2021 20:34:49 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> Makefile
This also affected init/Kconfig
> between commit:
>
> 2f8864dbe668 ("kbuild: move module strip/c
g tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
pgp6Xry_NAt5g.pgp
Description: OpenPGP digital signature
49663 ("irqchip: Add driver for WPCM450 interrupt controller")
I have used the irqchip tree from next-20210407 for today.
--
Cheers,
Stephen Rothwell
pgpLhJoYYtpeF.pgp
Description: OpenPGP digital signature
do these standalone compile checks on the uapi header files.
--
Cheers,
Stephen Rothwell
pgpACVhh2tkWa.pgp
Description: OpenPGP digital signature
./usr/include/linux/virtio_bt.h:1:1: note: (this will be reported only once per
input file)
Caused by commit
148a48f61393 ("Bluetooth: Add support for virtio transport driver")
I have used the bluetooth tree from next-20210407 for today.
--
Cheers,
Stephen Rothwell
pgpt9Z2bR_E0e.
may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
pgp3UqR42C5pN.pgp
Description: OpenPGP digital signature
ider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/core/skmsg.c
index 5def3a2e85be,92a83c02562a..
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@@ -806,12 -900,17 +900,13 @@@ int sk_p
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
pgpLwie9IQh1g.pgp
Description: OpenPGP digital signature
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 include/linux/ethtool.h
index cdca84e6dd6b,5c631a298994..
--- a/include/linux/ethtool.h
+++ b/include/linux/etht
Hi all,
Commit
f48a273a4244 ("Bluetooth: virtio_bt: Use virtio_cread16 instead of
virtio_cread")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpD2EFGhPL79.pgp
Description: OpenPGP digital signature
duced by commit
c6dfc019c239 ("ARM: dts: mvebu: Add device tree for ATL-x530 Board")
--
Cheers,
Stephen Rothwell
pgpH8MxaTeBqY.pgp
Description: OpenPGP digital signature
Hi all,
Commit
4f838411c98b ("pinctrl: bcm63xx: Fix More dependencies")
is missing a Signed-off-by from its author.
--
Cheers,
Stephen Rothwell
pgpuFMgiJoTcX.pgp
Description: OpenPGP digital signature
e
git log -1 --format='Fixes: %h ("%s")'
--
Cheers,
Stephen Rothwell
pgpbW6G36zyYK.pgp
Description: OpenPGP digital signature
Hi all,
In commit
f2ce9e97cf07 ("of: properly check for error returned by fdt_get_name()")
Fixes tag
Fixes: commit 79edff12060f ("scripts/dtc: Update to upstream version
v1.6.0-51-g183df9e9c2b9")
has these problem(s):
- leading word 'commit' unexpected
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (2d743660786e Merge branch 'fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging fixes/fixes (e71ba9452f0b Linux 5.11-rc2)
Merging kbui
ider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc block/blk-settings.c
index 9c009090c4b5,976085a44fb8..
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@@ -7,6 -7,8 +7,7 @@@
#includ
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/target/iscsi/iscsi_target.c
index e5c443bfbdf9,cf7f0465dd63..
--- a/drivers/target/iscsi/iscsi_targ
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 certs/system_keyring.c
index bb122bf4cc17,0c9a4795e847..
--- a/certs/system_keyring.c
+++ b/certs/sys
iling quotes
Please do not split Fixes tags over more than one line. Also, please
keep all the commit message tags together at the end of te commit message.
--
Cheers,
Stephen Rothwell
pgpig8zoOpzlK.pgp
Description: OpenPGP digital signature
inux-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 r
Hi all,
On Tue, 6 Apr 2021 21:44:41 +1000 Stephen Rothwell
wrote:
>
> After merging the char-misc tree, today's linux-next build (htmldocs)
> produced this warning:
>
> Documentation/misc-devices/dw-xdata-pcie.rst:20: WARNING: Unexpected
> indentation.
> Documenta
e.rst:35: WARNING: Block quote ends
without a blank line; unexpected unindent.
Documentation/misc-devices/dw-xdata-pcie.rst:40: WARNING: Unexpected
indentation.
Introduced by commit
e1181b5bbc3c ("Documentation: misc-devices: Add Documentation for
dw-xdata-pcie driver")
--
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,
Stephen Rothwell
dif
c __printf(3, 4) void __kunit_fail_current_test(const char *file,
int line,
|^
Introduced by commit
359a376081d4 ("kunit: support failure from dynamic analysis tools")
--
Cheers,
Stephen Rothwell
pgpwPgNlxvKWI.pgp
Des
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 drivers/scsi/ufs/ufshcd.c
index a5f3ae3b6170,58d7f264c664..
--- a/
ng
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/nfc/nci/uart.c
index 6af5752cde09,9958b37d8f9d..
--- a/net/nfc/nci/uart.c
+++ b/net/nfc/nci/uart.c
@@@ -229,6 -229,72 +229,72 @@@ static void n
bmitted 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/of/property.c
index 2046ae311322,2bb3158c9e43..
--- a/drivers/of/property.c
++
signed int' changes value from '18446744073709551600' to
'4294967280' [-Woverflow]
361 | writel(~IMR_MASK, hs->regs + HISI_SPI_IMR);
| ^
Introduced by commit
c770d8631e18 ("spi: Add HiSilicon SPI Controller Driver for Kunpeng SoCs")
-
1 - 100 of 7171 matches
Mail list logo