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 (69f637c33560 Merge tag 'for-5.11/drivers-2020-12-14' of
git://git.kernel.dk/linux-block)
Merging fixes
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/kvm/svm/svm.c
index da7eb4aaf44f,941e5251e13f..
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@@ -1309,10 -1347,8 +1347,10 @@@ static
Hi all,
On Tue, 15 Dec 2020 11:41:50 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the cel tree got a conflict in:
>
> include/linux/sunrpc/xdr.h
>
> between commits:
>
> 9a20f6f4e6ba ("SUNRPC: Fixes for xdr_align_data()")
> c4f2f
Hi all,
On Tue, 15 Dec 2020 07:12:12 +1100 Stephen Rothwell
wrote:
>
> On Thu, 3 Dec 2020 14:43:48 +1100 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the block tree got conflicts in:
> >
> > fs/f2fs/checkpoint.c
> > fs/f2fs/f2fs.h
Hi all,
On Fri, 27 Nov 2020 18:34:41 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/riscv/Kconfig
>
> between commit:
>
> 5cb0080f1bfd ("riscv: Enable ARCH_STACKWALK")
&g
Hi all,
On Mon, 14 Dec 2020 20:21:07 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> lib/Makefile
>
> between commit:
>
> 527701eda5f1 ("lib: Add a generic version of devmem_is_allowed()")
>
Hi aa,
On Wed, 25 Nov 2020 17:38:24 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the seccomp tree got a conflict in:
>
> arch/csky/include/asm/Kbuild
>
> between commit:
>
> fed76f8679a6 ("csky: Add QUEUED_SPINLOCKS supported")
Hi all,
On Tue, 8 Dec 2020 20:40:16 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got conflicts in:
>
> drivers/misc/lkdtm/Makefile
> drivers/misc/lkdtm/lkdtm.h
> tools/testing/selftests/lkdtm/tests.txt
>
> between com
rom their author and committer.
--
Cheers,
Stephen Rothwell
pgpB2aNWd9ntR.pgp
Description: OpenPGP digital signature
ail to build as nla_strscpy does
not exist in your tree ... Just remove that commit and tell Linus about
the necessary change and he can add it to the merge.
And, no, rebasing your tree in Linus', or even doing a merge with
Linus' tree is not really a reasonable option at this point.
--
Cheers,
Step
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 (148842c98a24 Merge tag 'x86-apic-2020-12-14' of
git://git.kernel.org/pub/scm/
Hi all,
On Sun, 13 Dec 2020 22:09:55 -0800 Guenter Roeck wrote:
>
> On 12/13/20 9:23 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the watchdog tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > In fi
Hi all,
On Mon, 14 Dec 2020 13:14:38 +1100 Stephen Rothwell
wrote:
>
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> fs/cifs/cifs_swn.c: In function 'cifs_swn_notify':
> fs/cifs/cifs_swn.c:450:4: error: implicit decla
Hi all,
On Fri, 11 Dec 2020 18:24:53 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the userns tree got a conflict in:
>
> kernel/events/core.c
>
> between commit:
>
> 78af4dc949da ("perf: Break deadlock involving exec_update_mutex")
Hi all,
On Thu, 10 Dec 2020 15:03:23 +0100 Michal Simek wrote:
>
> On 10. 12. 20 5:58, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the tip tree got conflicts in:
> >
> > arch/microblaze/Kconfig
> > arch/microblaze/mm/Makefile
> >
&
Hi all,
On Tue, 24 Nov 2020 10:25:14 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the s390 tree got a conflict in:
>
> arch/s390/include/asm/mmu_context.h
>
> between commit:
>
> 93e2dfd39438 ("s390: use asm-generic/mmu_context.h for no-op
Cheers,
Stephen Rothwell
pgpIKSCeYSULy.pgp
Description: OpenPGP digital signature
man.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
set.
>
> Fixes: 615510fe13bd2 ("thermal: devfreq_cooling: remove old power model and
> use EM")
Reported-by: Stephen Rothwell
> Signed-off-by: Daniel Lezcano
> ---
> drivers/thermal/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/thermal/Kc
Hi Helge,
On Tue, 15 Dec 2020 05:45:49 +0100 Helge Deller wrote:
>
> I dropped the patch from the parisc-hd tree for now -
> it needs more work and will not be part of the next merge window.
Thanks for letting me know.
--
Cheers,
Stephen Rothwell
pgpNgyoZ38GwF.pgp
Description
t next to timens_on_fork() prototype), I'm just surprised
> you saw no conflicts..
The time namespace changes appear in linux-next for the first time
today - where I reported that 3 of them have no Signed-off-by from their
committer :-(.
--
Cheers,
Stephen Rothwell
pgprDqkLUOFYQ.pgp
Description: OpenPGP digital signature
Hi all,
On Tue, 15 Dec 2020 06:56:08 +1100 Stephen Rothwell
wrote:
>
> On Tue, 17 Nov 2020 15:45:14 +1100 Stephen Rothwell
> wrote:
> >
> > After merging the amdgpu tree, today's linux-next build (htmldocs)
> > produced this warning:
> >
> > drivers/gp
Hi all,
On Tue, 15 Dec 2020 06:50:45 +1100 Stephen Rothwell
wrote:
>
> On Mon, 16 Nov 2020 10:44:44 +1100 Stephen Rothwell
> wrote:
> >
> > On Thu, 5 Nov 2020 17:50:31 +1100 Stephen Rothwell
> > wrote:
> > >
> > > After merging the drm tree,
Hi Jakub,
On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski wrote:
>
> AFAIU all we can do is tell Linus about the merge issue, and point
> at Stephen's resolution.
This is the correct response.
--
Cheers,
Stephen Rothwell
pgphDBS_HwAUg.pgp
Description: OpenPGP digital signature
^~
Caused by commit
615510fe13bd ("thermal: devfreq_cooling: remove old power model and use EM")
em_pd is only available when CONFIG_ENERGY_MODEL is set.
I have used the thermal tree from next-20201214 for today.
--
Cheers,
Stephen Rothwell
pgpJN7kN3AWkt.pgp
Description: OpenPGP digital signature
necessary. 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
r of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/nfs/nfs4proc.c
index e89468678ae1,61a07dcb963d..
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@@ -5309,18 -5319,18 +5319,18 @@@ static int nfs4_rea
ceph: implement msgr2.1 protocol (crc and secure
modes)")
interacting with commit
a24d22b225ce ("crypto: sha - split sha.h into sha1.h and sha2.h")
from the crypto tree (and now in Linus' tree).
I have applied the following merge fix patch:
From: Stephen Rothwell
Date: Tue, 15 Dec
Hi David,
On Mon, 14 Dec 2020 22:54:46 +0100 David Sterba wrote:
>
> On Tue, Dec 15, 2020 at 08:43:00AM +1100, Stephen Rothwell wrote:
> >
> > On Mon, 14 Dec 2020 22:36:12 +0100 David Sterba wrote:
> > >
> > > On Mon, Dec 14, 2020 at 01:12:46PM -0700, Jen
Hi David,
On Mon, 14 Dec 2020 22:36:12 +0100 David Sterba wrote:
>
> On Mon, Dec 14, 2020 at 01:12:46PM -0700, Jens Axboe wrote:
> > On 12/14/20 1:09 PM, Stephen Rothwell wrote:
> > > Just a reminder that I am still applying the above merge fix.
> >
&g
e that hasn't been in linux-next -
> > from you this merge window.
>
> It looks like Stephen Rothwell saw it in next yesterday, and fixed it
> up there in his merge.
>
> So somebody was aware of the problem. But unlike Stephen, I don't take
> broken code and just sil
Hi all,
On Wed, 9 Dec 2020 20:30:29 +1100 Stephen Rothwell
wrote:
>
> After merging the kbuild tree, today's linux-next build (x86_64
> modules_install) produced this warning:
>
> Warning: 'make modules_install' requires depmod. Please install it.
> This is probably i
Hi all,
On Tue, 8 Dec 2020 13:27:54 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/vga/vga_switcheroo.c
>
> between commit:
>
> 99efde6c9bb7 ("PCI/PM: Rename pci_wakeup_bus() to pci_resume_b
Hi all,
On Tue, 8 Dec 2020 16:02:22 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the ftrace tree got a conflict in:
>
> kernel/trace/ring_buffer.c
>
> between commit:
>
> 68e10d5ff512 ("ring-buffer: Always check to put back before
Hi all,
On Tue, 8 Dec 2020 13:56:20 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the amdgpu tree got a conflict in:
>
> drivers/pci/pcie/err.c
>
> between commits:
>
> 8f1bbfbc3596 ("PCI/ERR: Rename reset_link() to reset_subordinates()"
Hi all,
On Tue, 8 Dec 2020 11:04:13 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
>
> drivers/staging/media/sunxi/cedrus/cedrus.c
>
> between commit:
>
> c6e95daab1cc ("media: cedrus: Remove the MBUS quirks
Hi all,
On Mon, 7 Dec 2020 14:09:51 +1100 Stephen Rothwell
wrote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> fs/io_uring.c: In function 'io_shutdown':
> fs/io_uring.c:3782:9: error: too many arguments to functi
Hi all,
On Mon, 7 Dec 2020 16:46:01 +1100 Stephen Rothwell
wrote:
>
> Hi all,
>
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/iio/trigger/iio-trig-sysfs.c: In function 'iio_sysfs_trigger_probe':
> driv
Hi all,
On Wed, 21 Oct 2020 12:47:33 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the notifications tree got conflicts in:
>
> arch/alpha/kernel/syscalls/syscall.tbl
> arch/arm/tools/syscall.tbl
> arch/arm64/include/asm/unistd32.h
> arch
Hi all,
On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got conflicts in:
>
> include/linux/memcontrol.h
> mm/memcontrol.c
>
> between commit:
>
> bcfe06bf2622 ("mm: memcontrol: Use h
Hi all,
On Thu, 3 Dec 2020 14:25:30 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
>
> arch/arm64/include/asm/thread_info.h
>
> between commit:
>
> b5a5a01d8e9a ("arm64: uaccess: remove addr_limit_user_check
Hi all,
On Wed, 2 Dec 2020 15:01:49 +1100 Stephen Rothwell
wrote:
>
> Hi all,
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> fs/btrfs/zoned.c: In function 'btrfs_get_dev_zone_info':
> fs/btrfs/zoned.
Hi all,
On Thu, 3 Dec 2020 18:39:58 +1100 Stephen Rothwell
wrote:
>
> After merging the block tree, today's linux-next build (htmldocs)
> produced this warning:
>
> fs/block_dev.c:1838: warning: Function parameter or member 'dev' not
> described in 'lookup_bdev'
>
&
Hi all,
On Thu, 3 Dec 2020 18:37:40 +1100 Stephen Rothwell
wrote:
>
> After merging the block tree, today's linux-next build (htmldocs)
> produced this warning:
>
> fs/block_dev.c:1067: warning: Excess function parameter 'whole' description
> in 'bd_abort_claiming'
>
&
Hi all,
On Thu, 3 Dec 2020 14:43:48 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the block tree got conflicts in:
>
> fs/f2fs/checkpoint.c
> fs/f2fs/f2fs.h
> fs/f2fs/super.c
>
> between commit:
>
> 5c0602188dc7 ("f2fs: fix kbytes
Hi all,
On Thu, 26 Nov 2020 16:22:48 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the userns tree got a conflict in:
>
> kernel/bpf/task_iter.c
>
> between commit:
>
> 91b2db27d3ff ("bpf: Simplify task_file_seq_get_next()")
>
Hi all,
On Thu, 26 Nov 2020 17:40:57 +1100 Stephen Rothwell
wrote:
>
> After merging the net-next tree, today's linux-next build (htmldocs)
> produced this warning:
>
> include/linux/phy.h:869: warning: Function parameter or member 'config_intr'
> not described in 'phy_drive
Hi all,
On Thu, 19 Nov 2020 14:29:15 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the dmaengine tree got a conflict in:
>
> drivers/dma/idxd/submit.c
>
> between commit:
>
> 8326be9f1c0b ("dmaengine: idxd: fix mapping of portal size")
Hi all,
On Tue, 17 Nov 2020 15:45:14 +1100 Stephen Rothwell
wrote:
>
> After merging the amdgpu tree, today's linux-next build (htmldocs)
> produced this warning:
>
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h:353: warning: Function
> parameter or member 'crc_wi
Hi all,
On Mon, 16 Nov 2020 17:03:03 +1100 Stephen Rothwell
wrote:
>
> After merging the jc_docs tree, today's linux-next build (htmldocs)
> produced this warning:
>
> Documentation/translations/zh_CN/filesystems/tmpfs.rst:5: WARNING: undefined
> label: tmpfs_index (if the l
Hi all,
On Mon, 16 Nov 2020 10:44:44 +1100 Stephen Rothwell
wrote:
>
> On Thu, 5 Nov 2020 17:50:31 +1100 Stephen Rothwell
> wrote:
> >
> > After merging the drm tree, today's linux-next build (htmldocs) produced
> > these warnings:
> >
> > include/l
Hi all,
On Mon, 2 Nov 2020 12:38:41 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the parisc-hd tree got a conflict in:
>
> arch/parisc/kernel/time.c
>
> between commit:
>
> 686092e7daaa ("parisc: use legacy_timer_tick")
>
&
e missing a Signed-off-by from their committer.
--
Cheers,
Stephen Rothwell
pgpQykWx6MCth.pgp
Description: OpenPGP digital signature
Hi all,
Commits
425f40482491 ("cifs: fix uninitialized variable in
smb3_fs_context_parse_param")
8cc9a66ea70e ("cifs: update mnt_cifs_flags during reconfigure")
are missing a Signed-off-by from their committer.
--
Cheers,
Stephen Rothwell
pgp_yCAq79gJ4.pgp
Descript
re.abbrev to 12 (or more) or (for git v2.11
or later) just making sure it is not set (or set to "auto").
- Subject has leading but no trailing parentheses
- Subject has leading but no trailing quotes
Please do not split Fixes tags over more than one line.
--
Cheers,
Stephen Rot
g fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (ec6f5e0e5ca0 Merge tag 'x86-urgent-2020-12-13' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging fixes/fixes (9223e74f9960 Merge tag 'io_uring-5.10-2020-11-27' of
git:/
cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc lib/Makefile
index bcedd691ef63,dc623561ef9d..
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -350,8 -350,7 +350,9 @@@ obj-$(CONFIG_PLDMFW) += pldmf
--
Cheers,
Stephen Rothwell
pgpzx0wogJ9a_.pgp
Description: OpenPGP digital signature
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/rtc.h
index b829382de6c3,55e7beed066c..
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@@ -110,43 -110,14 +110,37 @@@ struct rtc_dev
249238feef ("efi: arm: reduce minimum alignment of uncompressed kernel")
--
Cheers,
Stephen Rothwell
pgpk9utPDDsAT.pgp
Description: OpenPGP digital signature
in definition of macro 'dev_err'
112 | _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__)
| ^~~
Caused by commit
9c612b338fdf ("watchdog: iTCO_wdt: use dev_*() instead of pr_*() for logging")
I have used the wtchdog tree from next-20201211 for today.
--
C
g discard
bio"")
from Linus' tree.
I have applied the following merge fix:
From: Stephen Rothwell
Date: Mon, 14 Dec 2020 15:14:26 +1100
Subject: [PATCH] fixup for "block: remove the request_queue argument to the
block_bio_remap tracepoint"
conflicting with
"Revert "
also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/md/raid10.c
index 3b598a3cb462,a84fa7526a53..
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@@ -1493,
ream 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
pgpZbpaLftKyV.pgp
Description: OpenPGP digital signature
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index 3b358262de8f,eb18459c1d16..
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6932,11 -6913,16 +6941,10 @@@ S: Maintaine
W:http://floatingp
tification handler for messages from
userspace daemon")
from the cifs tree.
I have applied the following merge fix patch.
From: Stephen Rothwell
Date: Mon, 14 Dec 2020 13:09:27 +1100
Subject: [PATCH] fixup for "treewide: rename nla_strlcpy to nla_strscpy."
conflicting with
"
Hi all,
Commit
3aa4e616197b ("cifs: Register generic netlink family")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpeEQB7GcsLr.pgp
Description: OpenPGP digital signature
builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (9fca90cf2892 Merge tag 'for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma)
Merging fixes/fixes (9223e74f9960 Merge tag
consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc mm/gup.c
index 44b0c6b89602,b3d852b4a60c..
--- a/mm/gup.c
+++ b/mm/gup.c
@@@ -2062,29 -1977,62 +1977,6 @@@ EXPORT_SYMBOL(get_user_pages_unlo
consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc kernel/events/core.c
index 19ae6c931c52,55b2330b556c..
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@@ -11958,24 -11864,6 +11958,24
usion")
I have applied the following fix patch for today:
From: Stephen Rothwell
Date: Fri, 11 Dec 2020 15:46:09 +1100
Subject: [PATCH] fixup for "certs: Fix blacklist flag type confusion"
Signed-off-by: Stephen Rothwell
---
security/integrity/ima/ima_mok.c | 3 +--
1 file change
he "inline" :-(
--
Cheers,
Stephen Rothwell
pgp5NKTxn6c2T.pgp
Description: OpenPGP digital signature
e length arrays")
--
Cheers,
Stephen Rothwell
pgpeV2iNyGZCx.pgp
Description: OpenPGP digital signature
Hi Michael,
On Thu, 10 Dec 2020 11:19:45 +1100 Michael Ellerman wrote:
>
> Stephen Rothwell writes:
> >
> > On Wed, 09 Dec 2020 15:44:35 +1100 Michael Ellerman
> > wrote:
> >>
> >> They should really be in DATA_DATA or similar shouldn't they?
&g
Hi all,
Commit
46609527577d ("x86, sched: Use midpoint of max_boost and max_P for frequency
invariance on AMD EPYC")
is missing a Signed-off-by from its author.
--
Cheers,
Stephen Rothwell
pgpvS6w_PhqOB.pgp
Description: OpenPGP digital signature
Hi all,
Commit
7e9c48d305d5 ("cifs: remove the devname argument to
cifs_compose_mount_options")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpMFZNgmHTbV.pgp
Description: OpenPGP digital signature
Hi all,
On Thu, 10 Dec 2020 21:37:13 +1100 Stephen Rothwell
wrote:
>
> Commit
>
> 5137d303659d ("net: flow_offload: Fix memory leak for indirect flow block")
>
> is missing a Signed-off-by from its committer.
Sorry, that is in the net tree (not net-next).
Hi all,
Commit
5137d303659d ("net: flow_offload: Fix memory leak for indirect flow block")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpdWo5aLHtjU.pgp
Description: OpenPGP digital signature
unlap 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 (ca4bbdaf1716 Merge tag 'iommu-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
line; unexpected unindent.
Introduced by commit
6cf22751938a ("mm/page_owner: Record timestamp and pid")
--
Cheers,
Stephen Rothwell
pgp0Xpdj1SewG.pgp
Description: OpenPGP digital signature
't fit")
interacting with commit
2ac05f7fcf5b ("kasan: fix object remaining in offline per-cpu quarantine")
from the akmp-current tree.
This goes on and on :-(
I have applied the following patch:
From: Stephen Rothwell
Date: Thu, 10 Dec 2020 20:24:01 +1100
Subject: [PATCH] fixup fo
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/staging/Kconfig
index 4d7a5ddf9992,c42708e60afc..
--- a/drivers/staging/Kconfig
+++ b/dri
lso want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/microblaze/Kconfig
index 6acbb4571b0f,7f6ca0ab4f81..
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@@ -
Hi all,
Commit
faf724c90798 ("Documentation: DT: binding documentation for
regulator-poweroff")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpoSHPlXFWEx.pgp
Description: OpenPGP digital signature
ed 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 net/netfilter/nf_tables_api.c
index 9a080767667b,a11bc8dcaa82..
--- a/net/netfilter/nf_tables_api.c
ed 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
pgp1rCEUnPG6h.pgp
Description: OpenPGP digital signature
Hi Luben,
On Wed, 9 Dec 2020 16:58:07 -0500 Luben Tuikov wrote:
>
> Add a missing structure comment for the recently
> added @list member.
>
> Signed-off-by: Luben Tuikov
>
> Cc: Stephen Rothwell
> Cc: Daniel Vetter
> Cc: Christian König
The commit message
Hi all,
On Wed, 9 Dec 2020 12:14:39 -0800 Randy Dunlap wrote:
>
> On 12/9/20 2:44 AM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20201208:
> >
>
> on i386:
>
> I see this warning:/note: repeated 106 times on i386 build:
>
&g
arches and 'long long' on 32-bit arches, while kernel type is
> > always 'long long'.
> >
> > Reported-by: Stephen Rothwell
> > Suggested-by: Marco Elver
> > Signed-off-by: Dmitry Vyukov
>
> Reviewed-by: Kees Cook
>
> Thanks for chasing this down!
Hi all,
Commit
2305d20f251d ("firmware: xilinx: Mark pm_api_features_map with static
keyword")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpoUowBVuoOV.pgp
Description: OpenPGP digital signature
Hi all,
Commits
d24e661920cb ("cifs: Enable sticky bit with cifsacl mount option.")
4bcfb51f82f0 ("cifs: Fix unix perm bits to cifsacl conversion for "other"
bits.")
are missing a Signed-off-by from their committer.
--
Cheers,
Stephen Rothwell
pgpY7JNW
ou trying to solve. As far as I
can see all this change does is (ever so slightly) slow down the build
for no gain.
--
Cheers,
Stephen Rothwell
pgplSrbsYpFR5.pgp
Description: OpenPGP digital signature
Hi all,
Commit
ab7eff24a1e9 ("dt-bindings: net: dsa: b53: Add YAML bindings")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpxeYGQ4ubCL.pgp
Description: OpenPGP digital signature
bout 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 (7d8761ba27fc
Hi all,
On Tue, 8 Dec 2020 23:01:57 +1100 Stephen Rothwell
wrote:
>
> I will try the following patch tomorrow:
>
> From: Stephen Rothwell
> Date: Tue, 8 Dec 2020 22:58:24 +1100
> Subject: [PATCH] powerpc: Add .data..Lubsan_data*/.data..Lubsan_type*
> sections expl
quot; --> "list"")
--
Cheers,
Stephen Rothwell
pgpGElxO8nyWH.pgp
Description: OpenPGP digital signature
.
===
Platform Profile Selection (e.g. :ref:`\/sys\/firmware\/acpi\/platform_profile
`)
Caused by commit
ff950bebd0e0 ("Documentation: Add documentation for new platform_profile
sysfs attribute")
--
Cheers,
Stephe
path")
Unfortunately for most of us (?), /sbin is not in our PATH ...
--
Cheers,
Stephen Rothwell
pgpgki8ETTEAq.pgp
Description: OpenPGP digital signature
Hi Michael,
On Wed, 09 Dec 2020 15:44:35 +1100 Michael Ellerman wrote:
>
> They should really be in DATA_DATA or similar shouldn't they?
No other architecture appears t need them ...
--
Cheers,
Stephen Rothwell
pgpHxEGuWLRlX.pgp
Description: OpenPGP digital signature
Hi all,
Commit
2259c17f0188 ("kvm: x86: Sink cpuid update into vendor-specific set_cr4
functions")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpvvIqGP1WPK.pgp
Description: OpenPGP digital signature
701 - 800 of 23437 matches
Mail list logo