linux-next: Tree for Nov 29
Hi all, Changes since 20181128: Non-merge commits (relative to Linus' tree): 5335 5517 files changed, 266627 insertions(+), 155239 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 (121b018f8c74 Merge tag 'for-4.20-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) Merging fixes/master (595c647d341e sparc: suppress the implicit-fallthrough warnings) Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2) Merging arc-current/for-curr (bf360f3b799f ARC: change defconfig defaults to ARCv2) Merging arm-current/fixes (e46daee53bb5 ARM: 8806/1: kprobes: Fix false positive with FORTIFY_SOURCE) Merging arm64-fixes/for-next/fixes (4f9f49646a57 arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block) Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode) Merging powerpc-fixes/fixes (462951cd32e1 powerpc/mm: Fix linux page tables build with some configs) Merging sparc/master (e399ef194171 sparc32: supress another implicit-fallthrough warning) Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) Merging net/master (d78a5ebd8b18 Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue) Merging bpf/master (0d32f17717e6 sctp: increase sk_wmem_alloc when head->truesize is increased) Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on acquire) Merging netfilter/master (ca08987885a1 netfilter: nf_tables: deactivate expressions in rule replecement routine) 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 (75b7b86bdb0d IB/mlx5: Fix page fault handling for MW) Merging sound-current/for-linus (8159a6a4a7d2 ALSA: usb-audio: Add vendor and product name for Dell WD19 Dock) Merging sound-asoc-fixes/for-linus (64d358d9843b 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 (35bf20e73a0b Merge branch 'spi-4.20' into spi-linus) Merging pci-current/for-linus (0e62205ca505 Merge remote-tracking branch 'lorenzo/pci/controller-fixes' into for-linus) Merging driver-core.current/driver-core-linus (a66d972465d1 devres: Align data[] to ARCH_KMALLOC_MINALIGN) Merging tty.current/tty-linus (2a48602615e0 tty: do not set TTY_IO_ERROR flag if console port) Merging usb.current/usb-linus (effd14f66cc1 usb: core: quirks: add RESET_RESUME quirk for Cherry G230 Stream series) Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of out transfers when DMA is used) Merging usb-serial-fixes/usb-linus (ccda4af0f4b9 Linux 4.20-rc2) Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code) Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRIM tuning with fused value for SDM845) Merging staging.current/staging-linus (
linux-next: Tree for Nov 29
Hi all, Changes since 20171128: New trees: bpf, bpf-next Renamed tree: kvm-master to kvm-fixes Dropped tree: vfs (badly conflicting commit) The vfs tree gained conflicts against Linus' tree so I dropped it for today. The i2c tree lost its build failure. The etnaviv tree still had its build failure, so I used the version from next-20171127. The sound-asoc tree gained a build failure, so I used the version from next-20171128. Non-merge commits (relative to Linus' tree): 1362 1321 files changed, 29513 insertions(+), 16743 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 251 trees (counting Linus' and 40 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 (43f462f1c2e1 Merge tag 'drm-for-v4.15-part2-fixes' of git://people.freedesktop.org/~airlied/linux) Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging kbuild-current/fixes (bb3f38c3c5b7 kbuild: clang: fix build failures with sparse check) Merging arc-current/for-curr (4fbd8d194f06 Linux 4.15-rc1) Merging arm-current/fixes (3aaf33bebda8 ARM: avoid faulting on qemu) Merging m68k-current/for-linus (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (2621e945fbf1 powerpc/kexec: Fix kexec/kdump in P9 guest kernels) Merging sparc/master (0c86a6bd85ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (d51aae68b142 net: sched: cbq: create block for q->link.block) CONFLICT (content): Merge conflict in net/rxrpc/call_object.c Merging bpf/master (a39e17b2d842 bpf: offload: add a license header) Merging ipsec/master (94802151894d Revert "xfrm: Fix stack-out-of-bounds read in xfrm_state_find.") Merging netfilter/master (8b1836c4b643 netfilter: conntrack: clamp timeouts to INT_MAX) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (ed59b7d53c95 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) Merging mac80211/master (72e2c3438ba3 mac80211: tear down RX aggregations first) Merging sound-current/for-linus (4fbd8d194f06 Linux 4.15-rc1) Merging pci-current/for-linus (4fbd8d194f06 Linux 4.15-rc1) Merging driver-core.current/driver-core-linus (0946b2fb38fd firmware: cleanup FIRMWARE_IN_KERNEL message) Merging tty.current/tty-linus (c8ec2041f549 MIPS: Add custom serial.h with BASE_BAUD override for generic kernel) Merging usb.current/usb-linus (7fee72d5e8f1 uas: Always apply US_FL_NO_ATA_1X quirk to Seagate devices) Merging usb-gadget-fixes/fixes (a3acc696085e usb: f_fs: Force Reserved1=1 in OS_DESC_EXT_COMPAT) Merging usb-serial-fixes/usb-linus (762ff4678e89 USB: serial: usb_debug: add new USB device id) Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) Merging phy/fixes (4fbd8d194f06 Linux 4.15-rc1) Merging staging.current/staging-linus (0590cdfead8c staging: octeon-usb: use __delay() instead of cvmx_wait()) Merging char-misc.current/char-misc-linus
linux-next: Tree for Nov 29
Hi all, Changes since 20161128: The net-next tree gained conflicts against the net tree. The crypto tree gained a build failure so I used the version from next-20161128. The akpm-current tree still had its build failure for which I added a supplied patch. Non-merge commits (relative to Linus' tree): 8411 8329 files changed, 486291 insertions(+), 183081 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 (with CONFIG_BUILD_DOCSRC=n) 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 (with KALLSYMS_EXTRA_PASS=1) and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 244 trees (counting Linus' and 34 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 (e5517c2a5a49 Linux 4.9-rc7) Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging kbuild-current/rc-fixes (152b695d7437 builddeb: fix cross-building to arm64 producing host-arch debs) Merging arc-current/for-curr (e5517c2a5a49 Linux 4.9-rc7) Merging arm-current/fixes (8478132a8784 Revert "arm: move exports to definitions") Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro) Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) Merging powerpc-fixes/fixes (984d7a1ec67c powerpc/mm: Fixup kernel read only mapping) Merging sparc/master (16f46050e709 dbri: Fix compiler warning) Merging net/master (2dbb4c05d048 bpf/samples: Fix PT_REGS_IP on s390x and use it) Merging ipsec/master (6b2264878155 flowcache: Increase threshold for refusing new allocations) Merging netfilter/master (5173bc679dec netfilter: nat: fix crash when conntrack entry is re-used) Merging ipvs/master (9b6c14d51bd2 net: tcp response should set oif only if it is L3 master) Merging wireless-drivers/master (fcd2042e8d36 mwifiex: printk() overflow with 32-byte SSIDs) Merging mac80211/master (9590112241ba tipc: fix link statistics counter errors) Merging sound-current/for-linus (b5337cfe067e ALSA: hda/ca0132 - Add quirk for Alienware 15 R2 2016) Merging pci-current/for-linus (e42010d8207f PCI: Set Read Completion Boundary to 128 iff Root Port supports it (_HPX)) Merging driver-core.current/driver-core-linus (a25f0944ba9b Linux 4.9-rc5) Merging tty.current/tty-linus (a909d3e63699 Linux 4.9-rc3) Merging usb.current/usb-linus (e5517c2a5a49 Linux 4.9-rc7) Merging usb-gadget-fixes/fixes (05e78c6933d6 usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match()) Merging usb-serial-fixes/usb-linus (2ab13292d7a3 USB: serial: cp210x: add ID for the Zone DPMX) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu) Merging staging.current/staging-linus (a25f0944ba9b Linux 4.9-rc5) Merging char-misc.current/char-misc-linus (a25f0944ba9b Linux 4.9-rc5) Merging input-current/for-linus (e9fb7cc63801 Input: psmouse - disable automatic probing of BYD touchpads) Merging crypto-current/master (c8467f7a3620 crypto: scatterwalk - Remove unnecessary aliasing check in map_and_copy) Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit) Merging vfio-fixes/for-linus (05692d7005a3 vfio/pci: Fix integer overflows, bitmask check) Merging kselftest-fixes/fixes (1001354ca341 Linux 4.9-rc1) Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER whi
Re: linux-next: Tree for Nov 29 (i915/intel_opregion)
On 11/28/13 18:45, Stephen Rothwell wrote: > Hi all, > > Changes since 20131128: > on x86_64: CONFIG_ACPI is not enabled. CC drivers/gpu/drm/i915/intel_opregion.o In file included from drivers/gpu/drm/i915/intel_opregion.c:31:0: include/linux/acpi_io.h:7:45: error: unknown type name 'acpi_physical_address' include/linux/acpi_io.h:8:10: error: unknown type name 'acpi_size' include/linux/acpi_io.h:13:33: error: unknown type name 'acpi_physical_address' include/linux/acpi_io.h:15:40: warning: 'struct acpi_generic_address' declared inside parameter list [enabled by default] include/linux/acpi_io.h:15:40: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] include/linux/acpi_io.h:16:43: warning: 'struct acpi_generic_address' declared inside parameter list [enabled by default] drivers/gpu/drm/i915/intel_opregion.c: In function 'intel_opregion_setup': drivers/gpu/drm/i915/intel_opregion.c:866:2: error: implicit declaration of function 'acpi_os_ioremap' [-Werror=implicit-function-declaration] drivers/gpu/drm/i915/intel_opregion.c:866:7: warning: assignment makes pointer from integer without a cast [enabled by default] cc1: some warnings being treated as errors make[5]: *** [drivers/gpu/drm/i915/intel_opregion.o] Error 1 -- ~Randy -- 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 Nov 29 (sfi)
On 11/28/13 18:45, Stephen Rothwell wrote: > Hi all, > > Changes since 20131128: > on x86_64: when CONFIG_ACPI is not enabled: CC drivers/sfi/sfi_acpi.o drivers/sfi/sfi_acpi.c: In function 'sfi_acpi_parse_xsdt': drivers/sfi/sfi_acpi.c:105:12: error: dereferencing pointer to incomplete type drivers/sfi/sfi_acpi.c:105:12: error: invalid application of 'sizeof' to incomplete type 'struct acpi_table_header' drivers/sfi/sfi_acpi.c:107:32: error: dereferencing pointer to incomplete type drivers/sfi/sfi_acpi.c: In function 'sfi_acpi_get_table': drivers/sfi/sfi_acpi.c:133:12: error: dereferencing pointer to incomplete type drivers/sfi/sfi_acpi.c:133:12: error: invalid application of 'sizeof' to incomplete type 'struct acpi_table_header' drivers/sfi/sfi_acpi.c:135:32: error: dereferencing pointer to incomplete type drivers/sfi/sfi_acpi.c: In function 'sfi_acpi_table_show': drivers/sfi/sfi_acpi.c:195:12: error: dereferencing pointer to incomplete type drivers/sfi/sfi_acpi.c: In function 'sfi_acpi_sysfs_init': drivers/sfi/sfi_acpi.c:207:12: error: dereferencing pointer to incomplete type drivers/sfi/sfi_acpi.c:207:12: error: invalid application of 'sizeof' to incomplete type 'struct acpi_table_header' drivers/sfi/sfi_acpi.c:210:35: error: dereferencing pointer to incomplete type make[3]: *** [drivers/sfi/sfi_acpi.o] Error 1 -- ~Randy -- 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 Nov 29
Hi all, Changes since 20131128: The slave-dma tree gained conflicts against the imx-mxs tree. The sound-asoc tree gained a build failure so I used teh version from next-20131128. Non-merge commits (relative to Linus' tree): 1585 1774 files changed, 68549 insertions(+), 33718 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 $ git checkout master $ git reset --hard stable Merging origin/master (dda9cc3a1451 Merge tag 'gpio-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) Merging fixes/master (8ae516aa8b81 Merge tag 'trace-fixes-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux) Merging arc-current/for-curr (da990a4f2d5a ARC: [perf] Fix a few thinkos) Merging arm-current/fixes (476d1c03d202 ARM: dma-mapping: check DMA mask against available memory) Merging m68k-current/for-linus (77a42796786c m68k: Remove deprecated IRQF_DISABLED) Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2) Merging powerpc-merge/merge (721cb59e9d95 powerpc/windfarm: Fix XServe G5 fan control Makefile issue) Merging sparc/master (b4789b8e6be3 aacraid: prevent invalid pointer dereference) Merging net/master (2c7a9dc16416 be2net: Avoid programming permenant MAC by BE3-R VFs) Merging ipsec/master (be408cd3e1fe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging sound-current/for-linus (eb9ca3ab2194 ALSA: hda - Add LFE chmap to ASUS ET2700) Merging pci-current/for-linus (4bff6749905d PCI: Move device_del() from pci_stop_dev() to pci_destroy_dev()) Merging wireless/master (d5aedd7e1b2f Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211) Merging driver-core.current/driver-core-linus (81440e737444 Revert "sysfs: handle duplicate removal attempts in sysfs_remove_group()") Merging tty.current/tty-linus (c42b4e6501cd Revert "n_gsm: race between ld close and gsmtty open") Merging usb.current/usb-linus (c24cb6c8b501 Merge tag 'fixes-for-v3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) Merging staging.current/staging-linus (930ba4a374b9 Staging: tidspbridge: disable driver) Merging char-misc.current/char-misc-linus (d0b00d3fb96d Merge tag 'extcon-linus-for-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus) Merging input-current/for-linus (358f24704f2f Input: add key code for ambient light sensor button) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (8ec25c512916 crypto: testmgr - fix sglen in test_aead for case 'dst != src') Merging ide/master (c2f7d1e103ef ide: pmac: remove unnecessary pci_set_drvdata()) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions) Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory") Merging rr-fixes/fixes
Re: linux-next: Tree for Nov 29 (netlabel)
On 11/30/2012 8:55 AM, Randy Dunlap wrote: > On 11/30/2012 07:31 AM, Paul Moore wrote: > >> On Friday, November 30, 2012 10:19:16 AM Paul Moore wrote: >>> On Thursday, November 29, 2012 04:05:26 PM Randy Dunlap wrote: On 11/28/2012 10:40 PM, Stephen Rothwell wrote: > Hi all, > Changes since 20121128: (on i386:) >>> If I had to guess it looks like CONFIG_NETLABEL needs to be dependent on >>> CONFIG_INET. While the net/ Kconfig only pulls in the net/netlabel Kconfig >>> if CONFIG_INET is defined, I'm guessing that without the explicit >>> dependency there is nothing preventing someone from arriving at a bad >>> configuration as we see here. >>> >>> Let me test this out to make sure my reasoning is right and if it is I'll >>> post a patch to netdev later today. >>> >>> Thanks for catching this. >> Hmmm. The existing logic in net/Kconfig seems to disable CONFIG_NETLABEL at >> build time whenever CONFIG_INET is disabled in my .config file. The only >> way >> I can recreate what you are seeing here is if I move the NetLabel include >> outside of the INET conditional in net/Kconfig. >> >> Regardless, adding an explicit dependency on INET to NETLABEL shouldn't hurt >> anything so I'll go ahead and post the patch to netdev. Hopefully someone >> who >> understands Kconfig better than I do can help shed some light on this. > Sorry, this patch doesn't help. > > I just checked the kernel .config again. SECURITY_SMACK > selects NETLABEL even when INET is not enabled. Bad SMACK. I'll send the patch properly, but it'll look like this. security/smack/Kconfig |1 + 1 file changed, 1 insertion(+) diff --git a/security/smack/Kconfig b/security/smack/Kconfig index 9fb14ef..1be1088 100644 --- a/security/smack/Kconfig +++ b/security/smack/Kconfig @@ -1,5 +1,6 @@ config SECURITY_SMACK bool "Simplified Mandatory Access Control Kernel Support" + depends on INET depends on NET depends on SECURITY select NETLABEL > > I added Casey and mailing list to the cc: > net/built-in.o: In function `netlbl_cfg_cipsov4_add': (.text+0x61757): undefined reference to `cipso_v4_doi_add' net/built-in.o: In function `netlbl_cfg_cipsov4_del': (.text+0x6177d): undefined reference to `cipso_v4_doi_remove' net/built-in.o: In function `netlbl_cfg_cipsov4_map_add': (.text+0x617ae): undefined reference to `cipso_v4_doi_getdef' net/built-in.o: In function `netlbl_cfg_cipsov4_map_add': (.text+0x61a49): undefined reference to `cipso_v4_doi_putdef' net/built-in.o: In function `netlbl_sock_setattr': (.text+0x6218c): undefined reference to `cipso_v4_sock_setattr' net/built-in.o: In function `netlbl_sock_delattr': (.text+0x6220b): undefined reference to `cipso_v4_sock_delattr' net/built-in.o: In function `netlbl_sock_getattr': (.text+0x62238): undefined reference to `cipso_v4_sock_getattr' net/built-in.o: In function `netlbl_conn_setattr': (.text+0x622de): undefined reference to `cipso_v4_sock_setattr' net/built-in.o: In function `netlbl_conn_setattr': (.text+0x62303): undefined reference to `cipso_v4_sock_delattr' net/built-in.o: In function `netlbl_req_setattr': (.text+0x62429): undefined reference to `cipso_v4_req_setattr' net/built-in.o: In function `netlbl_req_setattr': (.text+0x6244e): undefined reference to `cipso_v4_req_delattr' net/built-in.o: In function `netlbl_req_delattr': (.text+0x624ba): undefined reference to `cipso_v4_req_delattr' net/built-in.o: In function `netlbl_skbuff_setattr': (.text+0x62551): undefined reference to `cipso_v4_skbuff_setattr' net/built-in.o: In function `netlbl_skbuff_setattr': (.text+0x62576): undefined reference to `cipso_v4_skbuff_delattr' net/built-in.o: In function `netlbl_skbuff_getattr': (.text+0x62619): undefined reference to `cipso_v4_skbuff_getattr' net/built-in.o: In function `netlbl_skbuff_err': (.text+0x62685): undefined reference to `cipso_v4_error' net/built-in.o: In function `netlbl_cache_invalidate': (.text+0x626ab): undefined reference to `cipso_v4_cache_invalidate' net/built-in.o: In function `netlbl_cache_add': (.text+0x626ec): undefined reference to `cipso_v4_cache_add' net/built-in.o: In function `netlbl_domhsh_remove_entry': (.text+0x63294): undefined reference to `cipso_v4_doi_putdef' net/built-in.o: In function `netlbl_domhsh_remove_entry': (.text+0x632eb): undefined reference to `cipso_v4_doi_putdef' net/built-in.o: In function `netlbl_domhsh_remove_af4': (.text+0x6349b): undefined reference to `cipso_v4_doi_putdef' net/built-in.o: In function `netlbl_mgmt_add_common.clone.1': netlabel_mgmt.c:(.text+0x64a87): undefined reference to `cipso_v4_doi_getdef' netlabel_mgmt.c:(.text+0x64c83): undefined reference to `cipso_v4_doi_putdef' net/built-in.o: In function `netlbl_cipsov4_listall': netl
Re: linux-next: Tree for Nov 29 (netlabel)
On 11/30/2012 07:31 AM, Paul Moore wrote: > On Friday, November 30, 2012 10:19:16 AM Paul Moore wrote: >> On Thursday, November 29, 2012 04:05:26 PM Randy Dunlap wrote: >>> On 11/28/2012 10:40 PM, Stephen Rothwell wrote: Hi all, >>> Changes since 20121128: >>> (on i386:) >> >> If I had to guess it looks like CONFIG_NETLABEL needs to be dependent on >> CONFIG_INET. While the net/ Kconfig only pulls in the net/netlabel Kconfig >> if CONFIG_INET is defined, I'm guessing that without the explicit >> dependency there is nothing preventing someone from arriving at a bad >> configuration as we see here. >> >> Let me test this out to make sure my reasoning is right and if it is I'll >> post a patch to netdev later today. >> >> Thanks for catching this. > > Hmmm. The existing logic in net/Kconfig seems to disable CONFIG_NETLABEL at > build time whenever CONFIG_INET is disabled in my .config file. The only way > I can recreate what you are seeing here is if I move the NetLabel include > outside of the INET conditional in net/Kconfig. > > Regardless, adding an explicit dependency on INET to NETLABEL shouldn't hurt > anything so I'll go ahead and post the patch to netdev. Hopefully someone > who > understands Kconfig better than I do can help shed some light on this. Sorry, this patch doesn't help. I just checked the kernel .config again. SECURITY_SMACK selects NETLABEL even when INET is not enabled. Bad SMACK. I added Casey and mailing list to the cc: >>> net/built-in.o: In function `netlbl_cfg_cipsov4_add': >>> (.text+0x61757): undefined reference to `cipso_v4_doi_add' >>> net/built-in.o: In function `netlbl_cfg_cipsov4_del': >>> (.text+0x6177d): undefined reference to `cipso_v4_doi_remove' >>> net/built-in.o: In function `netlbl_cfg_cipsov4_map_add': >>> (.text+0x617ae): undefined reference to `cipso_v4_doi_getdef' >>> net/built-in.o: In function `netlbl_cfg_cipsov4_map_add': >>> (.text+0x61a49): undefined reference to `cipso_v4_doi_putdef' >>> net/built-in.o: In function `netlbl_sock_setattr': >>> (.text+0x6218c): undefined reference to `cipso_v4_sock_setattr' >>> net/built-in.o: In function `netlbl_sock_delattr': >>> (.text+0x6220b): undefined reference to `cipso_v4_sock_delattr' >>> net/built-in.o: In function `netlbl_sock_getattr': >>> (.text+0x62238): undefined reference to `cipso_v4_sock_getattr' >>> net/built-in.o: In function `netlbl_conn_setattr': >>> (.text+0x622de): undefined reference to `cipso_v4_sock_setattr' >>> net/built-in.o: In function `netlbl_conn_setattr': >>> (.text+0x62303): undefined reference to `cipso_v4_sock_delattr' >>> net/built-in.o: In function `netlbl_req_setattr': >>> (.text+0x62429): undefined reference to `cipso_v4_req_setattr' >>> net/built-in.o: In function `netlbl_req_setattr': >>> (.text+0x6244e): undefined reference to `cipso_v4_req_delattr' >>> net/built-in.o: In function `netlbl_req_delattr': >>> (.text+0x624ba): undefined reference to `cipso_v4_req_delattr' >>> net/built-in.o: In function `netlbl_skbuff_setattr': >>> (.text+0x62551): undefined reference to `cipso_v4_skbuff_setattr' >>> net/built-in.o: In function `netlbl_skbuff_setattr': >>> (.text+0x62576): undefined reference to `cipso_v4_skbuff_delattr' >>> net/built-in.o: In function `netlbl_skbuff_getattr': >>> (.text+0x62619): undefined reference to `cipso_v4_skbuff_getattr' >>> net/built-in.o: In function `netlbl_skbuff_err': >>> (.text+0x62685): undefined reference to `cipso_v4_error' >>> net/built-in.o: In function `netlbl_cache_invalidate': >>> (.text+0x626ab): undefined reference to `cipso_v4_cache_invalidate' >>> net/built-in.o: In function `netlbl_cache_add': >>> (.text+0x626ec): undefined reference to `cipso_v4_cache_add' >>> net/built-in.o: In function `netlbl_domhsh_remove_entry': >>> (.text+0x63294): undefined reference to `cipso_v4_doi_putdef' >>> net/built-in.o: In function `netlbl_domhsh_remove_entry': >>> (.text+0x632eb): undefined reference to `cipso_v4_doi_putdef' >>> net/built-in.o: In function `netlbl_domhsh_remove_af4': >>> (.text+0x6349b): undefined reference to `cipso_v4_doi_putdef' >>> net/built-in.o: In function `netlbl_mgmt_add_common.clone.1': >>> netlabel_mgmt.c:(.text+0x64a87): undefined reference to >>> `cipso_v4_doi_getdef' netlabel_mgmt.c:(.text+0x64c83): undefined reference >>> to `cipso_v4_doi_putdef' net/built-in.o: In function >>> `netlbl_cipsov4_listall': >>> netlabel_cipso_v4.c:(.text+0x66e52): undefined reference to >>> `cipso_v4_doi_walk' net/built-in.o: In function `netlbl_cipsov4_list': >>> netlabel_cipso_v4.c:(.text+0x67199): undefined reference to >>> `cipso_v4_doi_getdef' net/built-in.o: In function `netlbl_cipsov4_remove': >>> netlabel_cipso_v4.c:(.text+0x6771b): undefined reference to >>> `cipso_v4_doi_remove' net/built-in.o: In function >>> `netlbl_cipsov4_add_pass': >>> netlabel_cipso_v4.c:(.text+0x67a4b): undefined reference to >>> `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x67a76): undefined >>> reference >>> to `cipso_v4_doi_free' net
Re: linux-next: Tree for Nov 29 (netlabel)
On Friday, November 30, 2012 10:19:16 AM Paul Moore wrote: > On Thursday, November 29, 2012 04:05:26 PM Randy Dunlap wrote: > > On 11/28/2012 10:40 PM, Stephen Rothwell wrote: > > > Hi all, > > > > > Changes since 20121128: > > (on i386:) > > If I had to guess it looks like CONFIG_NETLABEL needs to be dependent on > CONFIG_INET. While the net/ Kconfig only pulls in the net/netlabel Kconfig > if CONFIG_INET is defined, I'm guessing that without the explicit > dependency there is nothing preventing someone from arriving at a bad > configuration as we see here. > > Let me test this out to make sure my reasoning is right and if it is I'll > post a patch to netdev later today. > > Thanks for catching this. Hmmm. The existing logic in net/Kconfig seems to disable CONFIG_NETLABEL at build time whenever CONFIG_INET is disabled in my .config file. The only way I can recreate what you are seeing here is if I move the NetLabel include outside of the INET conditional in net/Kconfig. Regardless, adding an explicit dependency on INET to NETLABEL shouldn't hurt anything so I'll go ahead and post the patch to netdev. Hopefully someone who understands Kconfig better than I do can help shed some light on this. > > net/built-in.o: In function `netlbl_cfg_cipsov4_add': > > (.text+0x61757): undefined reference to `cipso_v4_doi_add' > > net/built-in.o: In function `netlbl_cfg_cipsov4_del': > > (.text+0x6177d): undefined reference to `cipso_v4_doi_remove' > > net/built-in.o: In function `netlbl_cfg_cipsov4_map_add': > > (.text+0x617ae): undefined reference to `cipso_v4_doi_getdef' > > net/built-in.o: In function `netlbl_cfg_cipsov4_map_add': > > (.text+0x61a49): undefined reference to `cipso_v4_doi_putdef' > > net/built-in.o: In function `netlbl_sock_setattr': > > (.text+0x6218c): undefined reference to `cipso_v4_sock_setattr' > > net/built-in.o: In function `netlbl_sock_delattr': > > (.text+0x6220b): undefined reference to `cipso_v4_sock_delattr' > > net/built-in.o: In function `netlbl_sock_getattr': > > (.text+0x62238): undefined reference to `cipso_v4_sock_getattr' > > net/built-in.o: In function `netlbl_conn_setattr': > > (.text+0x622de): undefined reference to `cipso_v4_sock_setattr' > > net/built-in.o: In function `netlbl_conn_setattr': > > (.text+0x62303): undefined reference to `cipso_v4_sock_delattr' > > net/built-in.o: In function `netlbl_req_setattr': > > (.text+0x62429): undefined reference to `cipso_v4_req_setattr' > > net/built-in.o: In function `netlbl_req_setattr': > > (.text+0x6244e): undefined reference to `cipso_v4_req_delattr' > > net/built-in.o: In function `netlbl_req_delattr': > > (.text+0x624ba): undefined reference to `cipso_v4_req_delattr' > > net/built-in.o: In function `netlbl_skbuff_setattr': > > (.text+0x62551): undefined reference to `cipso_v4_skbuff_setattr' > > net/built-in.o: In function `netlbl_skbuff_setattr': > > (.text+0x62576): undefined reference to `cipso_v4_skbuff_delattr' > > net/built-in.o: In function `netlbl_skbuff_getattr': > > (.text+0x62619): undefined reference to `cipso_v4_skbuff_getattr' > > net/built-in.o: In function `netlbl_skbuff_err': > > (.text+0x62685): undefined reference to `cipso_v4_error' > > net/built-in.o: In function `netlbl_cache_invalidate': > > (.text+0x626ab): undefined reference to `cipso_v4_cache_invalidate' > > net/built-in.o: In function `netlbl_cache_add': > > (.text+0x626ec): undefined reference to `cipso_v4_cache_add' > > net/built-in.o: In function `netlbl_domhsh_remove_entry': > > (.text+0x63294): undefined reference to `cipso_v4_doi_putdef' > > net/built-in.o: In function `netlbl_domhsh_remove_entry': > > (.text+0x632eb): undefined reference to `cipso_v4_doi_putdef' > > net/built-in.o: In function `netlbl_domhsh_remove_af4': > > (.text+0x6349b): undefined reference to `cipso_v4_doi_putdef' > > net/built-in.o: In function `netlbl_mgmt_add_common.clone.1': > > netlabel_mgmt.c:(.text+0x64a87): undefined reference to > > `cipso_v4_doi_getdef' netlabel_mgmt.c:(.text+0x64c83): undefined reference > > to `cipso_v4_doi_putdef' net/built-in.o: In function > > `netlbl_cipsov4_listall': > > netlabel_cipso_v4.c:(.text+0x66e52): undefined reference to > > `cipso_v4_doi_walk' net/built-in.o: In function `netlbl_cipsov4_list': > > netlabel_cipso_v4.c:(.text+0x67199): undefined reference to > > `cipso_v4_doi_getdef' net/built-in.o: In function `netlbl_cipsov4_remove': > > netlabel_cipso_v4.c:(.text+0x6771b): undefined reference to > > `cipso_v4_doi_remove' net/built-in.o: In function > > `netlbl_cipsov4_add_pass': > > netlabel_cipso_v4.c:(.text+0x67a4b): undefined reference to > > `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x67a76): undefined > > reference > > to `cipso_v4_doi_free' net/built-in.o: In function > > `netlbl_cipsov4_add_local': > > netlabel_cipso_v4.c:(.text+0x67b9a): undefined reference to > > `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x67bc5): undefined > > reference > > to `cipso_v4_doi_free' net/built-in.o: In function > > `n
Re: linux-next: Tree for Nov 29 (netlabel)
On Thursday, November 29, 2012 04:05:26 PM Randy Dunlap wrote: > On 11/28/2012 10:40 PM, Stephen Rothwell wrote: > > Hi all, > > > Changes since 20121128: > (on i386:) If I had to guess it looks like CONFIG_NETLABEL needs to be dependent on CONFIG_INET. While the net/ Kconfig only pulls in the net/netlabel Kconfig if CONFIG_INET is defined, I'm guessing that without the explicit dependency there is nothing preventing someone from arriving at a bad configuration as we see here. Let me test this out to make sure my reasoning is right and if it is I'll post a patch to netdev later today. Thanks for catching this. > net/built-in.o: In function `netlbl_cfg_cipsov4_add': > (.text+0x61757): undefined reference to `cipso_v4_doi_add' > net/built-in.o: In function `netlbl_cfg_cipsov4_del': > (.text+0x6177d): undefined reference to `cipso_v4_doi_remove' > net/built-in.o: In function `netlbl_cfg_cipsov4_map_add': > (.text+0x617ae): undefined reference to `cipso_v4_doi_getdef' > net/built-in.o: In function `netlbl_cfg_cipsov4_map_add': > (.text+0x61a49): undefined reference to `cipso_v4_doi_putdef' > net/built-in.o: In function `netlbl_sock_setattr': > (.text+0x6218c): undefined reference to `cipso_v4_sock_setattr' > net/built-in.o: In function `netlbl_sock_delattr': > (.text+0x6220b): undefined reference to `cipso_v4_sock_delattr' > net/built-in.o: In function `netlbl_sock_getattr': > (.text+0x62238): undefined reference to `cipso_v4_sock_getattr' > net/built-in.o: In function `netlbl_conn_setattr': > (.text+0x622de): undefined reference to `cipso_v4_sock_setattr' > net/built-in.o: In function `netlbl_conn_setattr': > (.text+0x62303): undefined reference to `cipso_v4_sock_delattr' > net/built-in.o: In function `netlbl_req_setattr': > (.text+0x62429): undefined reference to `cipso_v4_req_setattr' > net/built-in.o: In function `netlbl_req_setattr': > (.text+0x6244e): undefined reference to `cipso_v4_req_delattr' > net/built-in.o: In function `netlbl_req_delattr': > (.text+0x624ba): undefined reference to `cipso_v4_req_delattr' > net/built-in.o: In function `netlbl_skbuff_setattr': > (.text+0x62551): undefined reference to `cipso_v4_skbuff_setattr' > net/built-in.o: In function `netlbl_skbuff_setattr': > (.text+0x62576): undefined reference to `cipso_v4_skbuff_delattr' > net/built-in.o: In function `netlbl_skbuff_getattr': > (.text+0x62619): undefined reference to `cipso_v4_skbuff_getattr' > net/built-in.o: In function `netlbl_skbuff_err': > (.text+0x62685): undefined reference to `cipso_v4_error' > net/built-in.o: In function `netlbl_cache_invalidate': > (.text+0x626ab): undefined reference to `cipso_v4_cache_invalidate' > net/built-in.o: In function `netlbl_cache_add': > (.text+0x626ec): undefined reference to `cipso_v4_cache_add' > net/built-in.o: In function `netlbl_domhsh_remove_entry': > (.text+0x63294): undefined reference to `cipso_v4_doi_putdef' > net/built-in.o: In function `netlbl_domhsh_remove_entry': > (.text+0x632eb): undefined reference to `cipso_v4_doi_putdef' > net/built-in.o: In function `netlbl_domhsh_remove_af4': > (.text+0x6349b): undefined reference to `cipso_v4_doi_putdef' > net/built-in.o: In function `netlbl_mgmt_add_common.clone.1': > netlabel_mgmt.c:(.text+0x64a87): undefined reference to > `cipso_v4_doi_getdef' netlabel_mgmt.c:(.text+0x64c83): undefined reference > to `cipso_v4_doi_putdef' net/built-in.o: In function > `netlbl_cipsov4_listall': > netlabel_cipso_v4.c:(.text+0x66e52): undefined reference to > `cipso_v4_doi_walk' net/built-in.o: In function `netlbl_cipsov4_list': > netlabel_cipso_v4.c:(.text+0x67199): undefined reference to > `cipso_v4_doi_getdef' net/built-in.o: In function `netlbl_cipsov4_remove': > netlabel_cipso_v4.c:(.text+0x6771b): undefined reference to > `cipso_v4_doi_remove' net/built-in.o: In function > `netlbl_cipsov4_add_pass': > netlabel_cipso_v4.c:(.text+0x67a4b): undefined reference to > `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x67a76): undefined reference > to `cipso_v4_doi_free' net/built-in.o: In function > `netlbl_cipsov4_add_local': > netlabel_cipso_v4.c:(.text+0x67b9a): undefined reference to > `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x67bc5): undefined reference > to `cipso_v4_doi_free' net/built-in.o: In function > `netlbl_cipsov4_add_std': > netlabel_cipso_v4.c:(.text+0x68535): undefined reference to > `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x68575): undefined reference > to `cipso_v4_doi_free' > > > Full randconfig file is attached. -- paul moore www.paul-moore.com -- 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/
