linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for Sep 28
@ 2022-09-28 19:26 broonie
  2022-09-29  5:21 ` linux-next: Tree for Sep 28 (mm/memory-failure.c) Randy Dunlap
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: broonie @ 2022-09-28 19:26 UTC (permalink / raw)
  To: Linux Next Mailing List; +Cc: Linux Kernel Mailing List

Hi all,

Changes since 20220927:

The various DRM trees gained even more conflicts with each other.

The counter tree gained a conflict with the counter-current tree.

Non-merge commits (relative to Linus' tree): 10124
 10571 files changed, 575990 insertions(+), 217896 deletions(-)

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

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

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

Below is a summary of the state of the merge.

I am currently merging 362 trees (counting Linus' and 100 trees of bug
fix patches pending for the current merge release).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

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

Thanks to Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

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

* Re: linux-next: Tree for Sep 28 (mm/memory-failure.c)
  2022-09-28 19:26 linux-next: Tree for Sep 28 broonie
@ 2022-09-29  5:21 ` Randy Dunlap
  2022-09-29  5:59 ` linux-next: Tree for Sep 28 (Kconfig: SND_SOC_QDSP6) Randy Dunlap
  2022-09-29  6:09 ` linux-next: Tree for Sep 28 (drivers/gpu/drm/msm/msm_gem_shrinker.c) Randy Dunlap
  2 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2022-09-29  5:21 UTC (permalink / raw)
  To: broonie, Linux Next Mailing List
  Cc: Linux Kernel Mailing List, Naoya Horiguchi, Andrew Morton, linux-mm

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



On 9/28/22 12:26, broonie@kernel.org wrote:
> Hi all,
> 
> Changes since 20220927:
> 

on i386 or x86_64, when
CONFIG_MEMORY_FAILURE=y and CONFIG_MEMORY_HOTPLUG is not set,
because drivers/base/memory.c is not built at all:

ld: mm/memory-failure.o: in function `num_poisoned_pages_inc':
mm/memory-failure.c:80: undefined reference to `memblk_nr_poison_inc'
ld: mm/memory-failure.c:80: undefined reference to `memblk_nr_poison_inc'
ld: mm/memory-failure.c:80: undefined reference to `memblk_nr_poison_inc'
ld: mm/memory-failure.c:80: undefined reference to `memblk_nr_poison_inc'
ld: mm/memory-failure.c:80: undefined reference to `memblk_nr_poison_inc'
ld: mm/memory-failure.o:mm/memory-failure.c:80: more undefined references to `memblk_nr_poison_inc' follow
ld: mm/memory-failure.o: in function `num_poisoned_pages_sub':
mm/memory-failure.c:87: undefined reference to `memblk_nr_poison_sub'


Full randconfig file is attached (for x86_64).

-- 
~Randy

[-- Attachment #2: config-r6241.gz --]
[-- Type: application/gzip, Size: 42736 bytes --]

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

* Re: linux-next: Tree for Sep 28 (Kconfig: SND_SOC_QDSP6)
  2022-09-28 19:26 linux-next: Tree for Sep 28 broonie
  2022-09-29  5:21 ` linux-next: Tree for Sep 28 (mm/memory-failure.c) Randy Dunlap
@ 2022-09-29  5:59 ` Randy Dunlap
  2022-09-29  6:09 ` linux-next: Tree for Sep 28 (drivers/gpu/drm/msm/msm_gem_shrinker.c) Randy Dunlap
  2 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2022-09-29  5:59 UTC (permalink / raw)
  To: broonie, Linux Next Mailing List
  Cc: Linux Kernel Mailing List, Srinivas Kandagatla,
	ALSA Development Mailing List



On 9/28/22 12:26, broonie@kernel.org wrote:
> Hi all,
> 
> Changes since 20220927:
> 

on x86_64, when QCOM_APR is not set and COMPILE_TEST=y:

WARNING: unmet direct dependencies detected for SND_SOC_QDSP6
  Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_QCOM [=y] && QCOM_APR [=n] && COMMON_CLK [=y]
  Selected by [y]:
  - SND_SOC_SC8280XP [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_QCOM [=y] && (QCOM_APR [=n] || COMPILE_TEST [=y]) && SOUNDWIRE [=y] && COMMON_CLK [=y]



-- 
~Randy

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

* Re: linux-next: Tree for Sep 28 (drivers/gpu/drm/msm/msm_gem_shrinker.c)
  2022-09-28 19:26 linux-next: Tree for Sep 28 broonie
  2022-09-29  5:21 ` linux-next: Tree for Sep 28 (mm/memory-failure.c) Randy Dunlap
  2022-09-29  5:59 ` linux-next: Tree for Sep 28 (Kconfig: SND_SOC_QDSP6) Randy Dunlap
@ 2022-09-29  6:09 ` Randy Dunlap
  2022-09-29  7:09   ` Geert Uytterhoeven
  2 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2022-09-29  6:09 UTC (permalink / raw)
  To: broonie, Linux Next Mailing List, linux-arm-msm, freedreno
  Cc: Linux Kernel Mailing List, dri-devel, Rob Clark



On 9/28/22 12:26, broonie@kernel.org wrote:
> Hi all,
> 
> Changes since 20220927:
> 

on x86_64:

../drivers/gpu/drm/msm/msm_gem_shrinker.c: In function ‘can_block’:
../drivers/gpu/drm/msm/msm_gem_shrinker.c:29:28: error: ‘__GFP_ATOMIC’ undeclared (first use in this function); did you mean ‘GFP_ATOMIC’?
   29 |         if (sc->gfp_mask & __GFP_ATOMIC)
      |                            ^~~~~~~~~~~~
      |                            GFP_ATOMIC



-- 
~Randy

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

* Re: linux-next: Tree for Sep 28 (drivers/gpu/drm/msm/msm_gem_shrinker.c)
  2022-09-29  6:09 ` linux-next: Tree for Sep 28 (drivers/gpu/drm/msm/msm_gem_shrinker.c) Randy Dunlap
@ 2022-09-29  7:09   ` Geert Uytterhoeven
  2022-09-29 15:05     ` Rob Clark
  0 siblings, 1 reply; 6+ messages in thread
From: Geert Uytterhoeven @ 2022-09-29  7:09 UTC (permalink / raw)
  To: Randy Dunlap
  Cc: broonie, Linux Next Mailing List, linux-arm-msm, freedreno,
	Linux Kernel Mailing List, dri-devel, Rob Clark

On Thu, Sep 29, 2022 at 8:10 AM Randy Dunlap <rdunlap@infradead.org> wrote:
> On 9/28/22 12:26, broonie@kernel.org wrote:
> > Changes since 20220927:
> >
>
> on x86_64:
>
> ../drivers/gpu/drm/msm/msm_gem_shrinker.c: In function ‘can_block’:
> ../drivers/gpu/drm/msm/msm_gem_shrinker.c:29:28: error: ‘__GFP_ATOMIC’ undeclared (first use in this function); did you mean ‘GFP_ATOMIC’?
>    29 |         if (sc->gfp_mask & __GFP_ATOMIC)
>       |                            ^~~~~~~~~~~~
>       |                            GFP_ATOMIC

Also on m68k, as reported by noreply@ellerman.id.au

I have bisected it to commit 1ccea29f90329e35 ("Merge branch
'mm-everything' of
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm"), but I didn't
see immediately what caused it.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

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

* Re: linux-next: Tree for Sep 28 (drivers/gpu/drm/msm/msm_gem_shrinker.c)
  2022-09-29  7:09   ` Geert Uytterhoeven
@ 2022-09-29 15:05     ` Rob Clark
  0 siblings, 0 replies; 6+ messages in thread
From: Rob Clark @ 2022-09-29 15:05 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Randy Dunlap, broonie, Linux Next Mailing List, linux-arm-msm,
	freedreno, Linux Kernel Mailing List, dri-devel

On Thu, Sep 29, 2022 at 12:09 AM Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
>
> On Thu, Sep 29, 2022 at 8:10 AM Randy Dunlap <rdunlap@infradead.org> wrote:
> > On 9/28/22 12:26, broonie@kernel.org wrote:
> > > Changes since 20220927:
> > >
> >
> > on x86_64:
> >
> > ../drivers/gpu/drm/msm/msm_gem_shrinker.c: In function ‘can_block’:
> > ../drivers/gpu/drm/msm/msm_gem_shrinker.c:29:28: error: ‘__GFP_ATOMIC’ undeclared (first use in this function); did you mean ‘GFP_ATOMIC’?
> >    29 |         if (sc->gfp_mask & __GFP_ATOMIC)
> >       |                            ^~~~~~~~~~~~
> >       |                            GFP_ATOMIC
>
> Also on m68k, as reported by noreply@ellerman.id.au
>
> I have bisected it to commit 1ccea29f90329e35 ("Merge branch
> 'mm-everything' of
> git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm"), but I didn't
> see immediately what caused it.

I'll send a patch for this shortly

BR,
-R


> Gr{oetje,eeting}s,
>
>                         Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds

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

end of thread, other threads:[~2022-09-29 15:05 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-28 19:26 linux-next: Tree for Sep 28 broonie
2022-09-29  5:21 ` linux-next: Tree for Sep 28 (mm/memory-failure.c) Randy Dunlap
2022-09-29  5:59 ` linux-next: Tree for Sep 28 (Kconfig: SND_SOC_QDSP6) Randy Dunlap
2022-09-29  6:09 ` linux-next: Tree for Sep 28 (drivers/gpu/drm/msm/msm_gem_shrinker.c) Randy Dunlap
2022-09-29  7:09   ` Geert Uytterhoeven
2022-09-29 15:05     ` Rob Clark

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).