linux-next: Tree for Dec 3
Hi all, Changes since 20201201: The v4l-dvb tree gained a conflict against the mvebu tree. The net-next tree gained a conflict against the net tree and a semantic conflict against the bpf tree. The bpf-next tree lost its build failure. The block tree gained a semantic conflict against the btrfs tree and conflicts against the arm64 and f2fs trees. The phy-next tree lost its build failure. The akpm-current tree gained a build failure for which I reverted a commit. The akpm tree gained a conflict against the arm64 tree and a build failure for which I applied a patch. Non-merge commits (relative to Linus' tree): 9593 8732 files changed, 686913 insertions(+), 153638 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, 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 327 trees (counting Linus' and 85 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. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (3bb61aa61828 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) Merging fixes/fixes (4e33a343ac74 powerpc: fix the allyesconfig build) Merging kbuild-current/fixes (d5750cd3c548 kbuild: Disable CONFIG_LD_ORPHAN_WARN for ld.lld 10.0.1) Merging arc-current/for-curr (3a71e423133a ARC: build: use $(READELF) instead of hard-coded readelf) Merging arm-current/fixes (9fa2e7af3d53 ARM: 9019/1: kprobes: Avoid fortify_panic() when copying optprobe template) Merging arm64-fixes/for-next/fixes (9e5344e0ffc3 arm64: mte: Fix typo in macro definition) Merging arm-soc-fixes/arm/fixes (ae597565d13f Merge tag 'optee-valid-memory-type-for-v5.11' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes) Merging drivers-memory-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging m68k-current/for-linus (50c5feeea0af ide/macide: Convert Mac IDE driver to platform driver) Merging powerpc-fixes/fixes (a1ee28117077 powerpc/64s/powernv: Fix memory corruption when saving SLB entries on MCE) Merging s390-fixes/fixes (b1cae1f84a0f s390: fix irq state tracing) Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) Merging net/master (832ba596494b net: ip6_gre: set dev->hard_header_len when using header_ops) Merging bpf/master (156c9b70dbfb selftests/bpf: Drain ringbuf samples at the end of test) Merging ipsec/master (48f486e13ffd net: xfrm: fix memory leak in xfrm_user_policy()) Merging netfilter/master (4d521943f76b dt-bindings: net: correct interrupt flags in examples) Merging ipvs/master (c0700dfa2cae netfilter: nf_tables: avoid false-postive lockdep splat) Merging wireless-drivers/master (807982017730 mt76: usb: fix crash on device removal) Merging mac80211/master (849920c70339 devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill()) Merging rdma-fixes/for-rc (b65054597872 Linux 5.10-rc6) Merging sound-current/for-linus (aeedad250499 ALSA: hda/realtek: Add mute LED quirk to yet another HP x360 model) Merging sound-asoc-fixes/for-linus (69a09a6730a3 Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus) Merging regmap-fixes/for-linus (e6e9354b5830 regmap: Remove duplicate `type` field from regmap `regcache_sync` trace event) Merging regulator-fixes/for-linus (34c5aa2666db regulator: Kconfig: Fix REGULATOR_QCOM_RPMH
linux-next: Tree for Dec 3
Hi all,
Changes since 20181130:
The arm-soc tree gained a conflict against the kbuild tree.
The reset tree gained a conflict against the arm-soc tree.
The clk tree lost its build failure.
The vfs tree gained a conflict against the fscrypt tree.
The net-next tree gained conflicts against the net and bpf trees.
The akpm tree still had its build failure so I added another fix patch.
Non-merge commits (relative to Linus' tree): 5737
5828 files changed, 283447 insertions(+), 161618 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, sparc
and sparc64 defconfig. 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 286 trees (counting Linus' and 67 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.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (6a512726090a Merge tag 'armsoc-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs)
Merging kbuild-current/fixes (8d6237bb5d27 kbuild: fix UML build error with
CONFIG_GCC_PLUGINS)
Merging arc-current/for-curr (10d443431dc2 ARC: io.h: Implement
reads{x}()/writes{x}())
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (ea2412dc21cc ACPI/IORT: Fix
iort_get_platform_device_domain() uninitialized pointer value)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (bf3d6afbb234 powerpc: Look for "stdout-path" when
setting up legacy consoles)
Merging sparc/master (e399ef194171 sparc32: supress another
implicit-fallthrough warning)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (35b827b6d061 tun: forbid iface creation with rtnl ops)
Merging bpf/master (dcb40590e69e bpf: refactor bpf_test_run() to separate own
failures and test program result)
Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on
acquire)
Merging netfilter/master (d78a5ebd8b18 Merge branch '1GbE' of
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates
of non-anonymous set)
Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (7bca603a69c0 RDMA/mlx5: Initialize return variable
in case pagefault was skipped)
Merging sound-current/for-linus (5363857b916c ALSA: pcm: Fix interval
evaluation with openmin/max)
Merging sound-asoc-fixes/for-linus (b586eb05a2b8 Merge branch 'asoc-4.20' into
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (af4d024d23b5 Merge branch 'regulator-4.20'
into regulator-linus)
Merging spi-fixes/for-linus (5377ce14c76a Merge branch 'spi-4.20' into
spi-linus)
Merging pci-current/for-linus (c74eadf881ad Merge remote-tracking branch
'lorenzo/pci/controller-fixes' into for-linus)
Merging driver-core.current/driver-core-linus (d8f190ee836a Merge branch 'akpm'
(patches from Andrew))
Merging tty.current/tty-linus (2a48602615e0 tty: do not set TTY_IO_ERROR flag
if console port)
Merging usb.current/usb-linus (d8f190ee836a Merge branch 'akpm' (patches from
Andrew))
Merging usb-gadget-fixes/fixes
linux-next: Tree for Dec 3
Hi all,
Changes since 20181130:
The arm-soc tree gained a conflict against the kbuild tree.
The reset tree gained a conflict against the arm-soc tree.
The clk tree lost its build failure.
The vfs tree gained a conflict against the fscrypt tree.
The net-next tree gained conflicts against the net and bpf trees.
The akpm tree still had its build failure so I added another fix patch.
Non-merge commits (relative to Linus' tree): 5737
5828 files changed, 283447 insertions(+), 161618 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, sparc
and sparc64 defconfig. 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 286 trees (counting Linus' and 67 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.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (6a512726090a Merge tag 'armsoc-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs)
Merging kbuild-current/fixes (8d6237bb5d27 kbuild: fix UML build error with
CONFIG_GCC_PLUGINS)
Merging arc-current/for-curr (10d443431dc2 ARC: io.h: Implement
reads{x}()/writes{x}())
Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false
positive with FORTIFY_SOURCE)
Merging arm64-fixes/for-next/fixes (ea2412dc21cc ACPI/IORT: Fix
iort_get_platform_device_domain() uninitialized pointer value)
Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and
m68k_pgtable_cachemode)
Merging powerpc-fixes/fixes (bf3d6afbb234 powerpc: Look for "stdout-path" when
setting up legacy consoles)
Merging sparc/master (e399ef194171 sparc32: supress another
implicit-fallthrough warning)
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
Merging net/master (35b827b6d061 tun: forbid iface creation with rtnl ops)
Merging bpf/master (dcb40590e69e bpf: refactor bpf_test_run() to separate own
failures and test program result)
Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on
acquire)
Merging netfilter/master (d78a5ebd8b18 Merge branch '1GbE' of
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue)
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates
of non-anonymous set)
Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
Merging mac80211/master (113f3aaa81bd cfg80211: Prevent regulatory restore
during STA disconnect in concurrent interfaces)
Merging rdma-fixes/for-rc (7bca603a69c0 RDMA/mlx5: Initialize return variable
in case pagefault was skipped)
Merging sound-current/for-linus (5363857b916c ALSA: pcm: Fix interval
evaluation with openmin/max)
Merging sound-asoc-fixes/for-linus (b586eb05a2b8 Merge branch 'asoc-4.20' into
asoc-linus)
Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
Merging regulator-fixes/for-linus (af4d024d23b5 Merge branch 'regulator-4.20'
into regulator-linus)
Merging spi-fixes/for-linus (5377ce14c76a Merge branch 'spi-4.20' into
spi-linus)
Merging pci-current/for-linus (c74eadf881ad Merge remote-tracking branch
'lorenzo/pci/controller-fixes' into for-linus)
Merging driver-core.current/driver-core-linus (d8f190ee836a Merge branch 'akpm'
(patches from Andrew))
Merging tty.current/tty-linus (2a48602615e0 tty: do not set TTY_IO_ERROR flag
if console port)
Merging usb.current/usb-linus (d8f190ee836a Merge branch 'akpm' (patches from
Andrew))
Merging usb-gadget-fixes/fixes
linux-next: Tree for Dec 3
Hi all, The overnight builds will be delayed until tomorrow since some of our build infrastructure is down tonight. Changes since 20141201: The pm tree gained a conflict against the arm tree. The net-next tree gained a conflict against the kselftest-fixes tree. The drm tree gained a conflict against the drm-intel-fixes tree. The drm-misc tree gained a conflict against the drm tree. The trivial tree gained a conflict against the pm tree. The devicetree tree gained a conflict against the regulator tree. The driver-core tree lost its build failure and gained a conflict against the omap_dss2 tree. The usb tree still had its build failure so I used the version from next-20141128. The kselftest tree gained a conflict against the kselftest-fixes tree. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 9858 9271 files changed, 363612 insertions(+), 271729 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 and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 229 trees (counting Linus' and 32 trees of patches pending for Linus' tree). 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. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (3a18ca061311 Merge tag 'ext4_for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (f114040e3ea6 Linux 3.18-rc1) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (3f4aa45ceea5 ARM: 8226/1: cacheflush: get rid of restarting block) Merging m68k-current/for-linus (f7bbd12a4b7e m68k: Wire up bpf) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) Merging powerpc-merge-mpe/fixes (152d44a853e4 powerpc: 32 bit getcpu VDSO function uses 64 bit instructions) Merging sparc/master (0d1d9092b536 sparc: Add NOP dma_cache_sync() implementation.) Merging net/master (7fa2955ff70c sh_eth: Fix sleeping function called from invalid context) Merging ipsec/master (d10845fc85b2 Merge branch 'gso_encap_fixes') Merging sound-current/for-linus (b734304f15eb ALSA: hda/realtek - Add headset Mic support for new Dell machine) Merging pci-current/for-linus (5106787a9e08 PCI: tegra: Use physical range for I/O mapping) Merging wireless/master (87141db0848a rtlwifi: rtl8192ce: Fix missing interrupt ready flag) Merging driver-core.current/driver-core-linus (206c5f60a3d9 Linux 3.18-rc4) Merging tty.current/tty-linus (a5e9ab291c60 Revert "serial: of-serial: add PM suspend/resume support") Merging usb.current/usb-linus (009d0431c391 Linux 3.18-rc7) Merging usb-gadget-fixes/fixes (520fe7633692 usb: dwc3: ep0: fix for dead code) Merging usb-serial-fixes/usb-linus (75bcbf29c284 USB: ssu100: fix overrun-error reporting) Merging staging.current/staging-linus (6d4556fc0309 staging: r8188eu: Add new device ID for DLink GO-USB-N150) Merging char-misc.current/char-misc-linus (0df1f2487d2f Linux 3.18-rc3) Merging input-current/for-linus (a1f9a4072655 Input: xpad - use proper endpoint type) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (24c65bc7037e hwrng: pseries - port to new read API and fix stack corruption) Merging ide/master (7546e52b5e3d Drivers: ide: Remove typedef atiixp_ide_timing) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX
linux-next: Tree for Dec 3
Hi all, The overnight builds will be delayed until tomorrow since some of our build infrastructure is down tonight. Changes since 20141201: The pm tree gained a conflict against the arm tree. The net-next tree gained a conflict against the kselftest-fixes tree. The drm tree gained a conflict against the drm-intel-fixes tree. The drm-misc tree gained a conflict against the drm tree. The trivial tree gained a conflict against the pm tree. The devicetree tree gained a conflict against the regulator tree. The driver-core tree lost its build failure and gained a conflict against the omap_dss2 tree. The usb tree still had its build failure so I used the version from next-20141128. The kselftest tree gained a conflict against the kselftest-fixes tree. The akpm tree lost a patch that turned up elsewhere. Non-merge commits (relative to Linus' tree): 9858 9271 files changed, 363612 insertions(+), 271729 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 and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 229 trees (counting Linus' and 32 trees of patches pending for Linus' tree). 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. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (3a18ca061311 Merge tag 'ext4_for_linus_urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (f114040e3ea6 Linux 3.18-rc1) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (3f4aa45ceea5 ARM: 8226/1: cacheflush: get rid of restarting block) Merging m68k-current/for-linus (f7bbd12a4b7e m68k: Wire up bpf) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) Merging powerpc-merge-mpe/fixes (152d44a853e4 powerpc: 32 bit getcpu VDSO function uses 64 bit instructions) Merging sparc/master (0d1d9092b536 sparc: Add NOP dma_cache_sync() implementation.) Merging net/master (7fa2955ff70c sh_eth: Fix sleeping function called from invalid context) Merging ipsec/master (d10845fc85b2 Merge branch 'gso_encap_fixes') Merging sound-current/for-linus (b734304f15eb ALSA: hda/realtek - Add headset Mic support for new Dell machine) Merging pci-current/for-linus (5106787a9e08 PCI: tegra: Use physical range for I/O mapping) Merging wireless/master (87141db0848a rtlwifi: rtl8192ce: Fix missing interrupt ready flag) Merging driver-core.current/driver-core-linus (206c5f60a3d9 Linux 3.18-rc4) Merging tty.current/tty-linus (a5e9ab291c60 Revert serial: of-serial: add PM suspend/resume support) Merging usb.current/usb-linus (009d0431c391 Linux 3.18-rc7) Merging usb-gadget-fixes/fixes (520fe7633692 usb: dwc3: ep0: fix for dead code) Merging usb-serial-fixes/usb-linus (75bcbf29c284 USB: ssu100: fix overrun-error reporting) Merging staging.current/staging-linus (6d4556fc0309 staging: r8188eu: Add new device ID for DLink GO-USB-N150) Merging char-misc.current/char-misc-linus (0df1f2487d2f Linux 3.18-rc3) Merging input-current/for-linus (a1f9a4072655 Input: xpad - use proper endpoint type) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding discard stripe) Merging crypto-current/master (24c65bc7037e hwrng: pseries - port to new read API and fix stack corruption) Merging ide/master (7546e52b5e3d Drivers: ide: Remove typedef atiixp_ide_timing) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board
Re: linux-next: Tree for Dec 3 (mm/Kconfig)
On Thu, 5 Dec 2013, Sima Baymani wrote: > > CONFIG_HWPOISON_INJECT is unrelated, it already depends on CONFIG_PROC_FS. > > > > CONFIG_PROC_PAGE_MONITOR is obviously only useful for CONFIG_PROC_FS, so > > the correct fix would be to make CONFIG_MEM_SOFT_DIRTY depend on > > CONFIG_PROC_FS. > > > > Want to try sending a patch? > > You bet! > > However, I have the slightest confusion: > I tested what you suggested by running "make oldconfig", and it does > eliminate the error. However, I can't figure out why it's enough with > adding the dependency for PROC_FS in MEM_SOFT_DIRTY, if > PROC_PAGE_MONITOR depends on both? > "select" will force the option to be selected regardless of its dependencies, so in this case you have CONFIG_MEM_SOFT_DIRTY set and CONFIG_PROC_FS unset and CONFIG_MEM_SOFT_DIRTY enables PROC_PAGE_MONITOR which depends on CONFIG_PROC_FS. The warning you're fixing shows the missing dependency. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Dec 3 (mm/Kconfig)
On Thu, Dec 5, 2013 at 1:00 AM, David Rientjes wrote: > On Wed, 4 Dec 2013, Sima Baymani wrote: > >> When generating randconfig, got following warning: >> >> warning: (HWPOISON_INJECT && MEM_SOFT_DIRTY) selects PROC_PAGE_MONITOR >> which has unmet direct dependencies (PROC_FS && MMU) >> >> I would have liked to form a patch for it, but not sure whether to >> simply add PROC_FS && MMU as dependencies for HWPOISON_INJECT and >> MEM_SOFT_DIRTY, or if some other fix would be more suitable? >> > > CONFIG_HWPOISON_INJECT is unrelated, it already depends on CONFIG_PROC_FS. > > CONFIG_PROC_PAGE_MONITOR is obviously only useful for CONFIG_PROC_FS, so > the correct fix would be to make CONFIG_MEM_SOFT_DIRTY depend on > CONFIG_PROC_FS. > > Want to try sending a patch? You bet! However, I have the slightest confusion: I tested what you suggested by running "make oldconfig", and it does eliminate the error. However, I can't figure out why it's enough with adding the dependency for PROC_FS in MEM_SOFT_DIRTY, if PROC_PAGE_MONITOR depends on both? -Sima -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Dec 3 (mm/Kconfig)
On Thu, Dec 5, 2013 at 1:00 AM, David Rientjes rient...@google.com wrote: On Wed, 4 Dec 2013, Sima Baymani wrote: When generating randconfig, got following warning: warning: (HWPOISON_INJECT MEM_SOFT_DIRTY) selects PROC_PAGE_MONITOR which has unmet direct dependencies (PROC_FS MMU) I would have liked to form a patch for it, but not sure whether to simply add PROC_FS MMU as dependencies for HWPOISON_INJECT and MEM_SOFT_DIRTY, or if some other fix would be more suitable? CONFIG_HWPOISON_INJECT is unrelated, it already depends on CONFIG_PROC_FS. CONFIG_PROC_PAGE_MONITOR is obviously only useful for CONFIG_PROC_FS, so the correct fix would be to make CONFIG_MEM_SOFT_DIRTY depend on CONFIG_PROC_FS. Want to try sending a patch? You bet! However, I have the slightest confusion: I tested what you suggested by running make oldconfig, and it does eliminate the error. However, I can't figure out why it's enough with adding the dependency for PROC_FS in MEM_SOFT_DIRTY, if PROC_PAGE_MONITOR depends on both? -Sima -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Dec 3 (mm/Kconfig)
On Thu, 5 Dec 2013, Sima Baymani wrote: CONFIG_HWPOISON_INJECT is unrelated, it already depends on CONFIG_PROC_FS. CONFIG_PROC_PAGE_MONITOR is obviously only useful for CONFIG_PROC_FS, so the correct fix would be to make CONFIG_MEM_SOFT_DIRTY depend on CONFIG_PROC_FS. Want to try sending a patch? You bet! However, I have the slightest confusion: I tested what you suggested by running make oldconfig, and it does eliminate the error. However, I can't figure out why it's enough with adding the dependency for PROC_FS in MEM_SOFT_DIRTY, if PROC_PAGE_MONITOR depends on both? select will force the option to be selected regardless of its dependencies, so in this case you have CONFIG_MEM_SOFT_DIRTY set and CONFIG_PROC_FS unset and CONFIG_MEM_SOFT_DIRTY enables PROC_PAGE_MONITOR which depends on CONFIG_PROC_FS. The warning you're fixing shows the missing dependency. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Dec 3 (mm/Kconfig)
On Wed, 4 Dec 2013, Sima Baymani wrote: > When generating randconfig, got following warning: > > warning: (HWPOISON_INJECT && MEM_SOFT_DIRTY) selects PROC_PAGE_MONITOR > which has unmet direct dependencies (PROC_FS && MMU) > > I would have liked to form a patch for it, but not sure whether to > simply add PROC_FS && MMU as dependencies for HWPOISON_INJECT and > MEM_SOFT_DIRTY, or if some other fix would be more suitable? > CONFIG_HWPOISON_INJECT is unrelated, it already depends on CONFIG_PROC_FS. CONFIG_PROC_PAGE_MONITOR is obviously only useful for CONFIG_PROC_FS, so the correct fix would be to make CONFIG_MEM_SOFT_DIRTY depend on CONFIG_PROC_FS. Want to try sending a patch? -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: Tree for Dec 3 (mm/Kconfig)
On Wed, 4 Dec 2013, Sima Baymani wrote: When generating randconfig, got following warning: warning: (HWPOISON_INJECT MEM_SOFT_DIRTY) selects PROC_PAGE_MONITOR which has unmet direct dependencies (PROC_FS MMU) I would have liked to form a patch for it, but not sure whether to simply add PROC_FS MMU as dependencies for HWPOISON_INJECT and MEM_SOFT_DIRTY, or if some other fix would be more suitable? CONFIG_HWPOISON_INJECT is unrelated, it already depends on CONFIG_PROC_FS. CONFIG_PROC_PAGE_MONITOR is obviously only useful for CONFIG_PROC_FS, so the correct fix would be to make CONFIG_MEM_SOFT_DIRTY depend on CONFIG_PROC_FS. Want to try sending a patch? -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: Tree for Dec 3
Hi all, Changes since 20131202: The wireless-next tree gained conflicts against the wireless tree. The sound-asoc tree gained a conflict against the slave-dma tree. The akpm-current tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 2063 2264 files changed, 88552 insertions(+), 61433 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" as mentioned in the FAQ on the wiki (see below). 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 and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. I am currently merging 210 trees (counting Linus' and 29 trees of patches pending for Linus' tree). 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. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpuXS9YU40R2.pgp Description: PGP signature
linux-next: Tree for Dec 3
Hi all, Changes since 20131202: The wireless-next tree gained conflicts against the wireless tree. The sound-asoc tree gained a conflict against the slave-dma tree. The akpm-current tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 2063 2264 files changed, 88552 insertions(+), 61433 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 as mentioned in the FAQ on the wiki (see below). 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 and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc, sparc64 and arm defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. I am currently merging 210 trees (counting Linus' and 29 trees of patches pending for Linus' tree). 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. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpuXS9YU40R2.pgp Description: PGP signature
