16 Dec, 2015

1 commit


20 Nov, 2015

2 commits


14 Sep, 2015

1 commit

  • commit c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a upstream.

    In kbuild it is allowed to define objects in files named "Makefile"
    and "Kbuild".
    Currently localmodconfig reads objects only from "Makefile"s and misses
    modules like nouveau.

    Link: http://lkml.kernel.org/r/1437948415-16290-1-git-send-email-richard@nod.at

    Reported-and-tested-by: Leonidas Spyropoulos
    Signed-off-by: Richard Weinberger
    Signed-off-by: Steven Rostedt
    Signed-off-by: Greg Kroah-Hartman

    Richard Weinberger
     

11 Jun, 2015

1 commit

  • Commit d5e616fc1c1d ("checkpatch: add a few more --fix corrections")
    broke the GLOBAL_INITIALISERS test with bad parentheses and optional
    leading spaces.

    Fix it.

    Signed-off-by: Joe Perches
    Reported-by: Bandan Das
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     

29 May, 2015

1 commit

  • Commit 2f35c41f58a9 ("module: Replace module_ref with atomic_t refcnt")
    changes the way refcnt is handled but did not update the gdb script to
    use the new variable.

    Since refcnt is not per-cpu anymore, we can directly read its value.

    Signed-off-by: Adrien Schildknecht
    Reviewed-by: Jan Kiszka
    Cc: Pantelis Koukousoulas
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Adrien Schildknecht
     

23 Apr, 2015

2 commits

  • Pull module updates from Rusty Russell:
    "Quentin opened a can of worms by adding extable entry checking to
    modpost, but most architectures seem fixed now. Thanks to all
    involved.

    Last minute rebase because I noticed a "[PATCH]" had snuck into a
    commit message somehow"

    * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
    modpost: don't emit section mismatch warnings for compiler optimizations
    modpost: expand pattern matching to support substring matches
    modpost: do not try to match the SHT_NUL section.
    modpost: fix extable entry size calculation.
    modpost: fix inverted logic in is_extable_fault_address().
    modpost: handle -ffunction-sections
    modpost: Whitelist .text.fixup and .exception.text
    params: handle quotes properly for values not of form foo="bar".
    modpost: document the use of struct section_check.
    modpost: handle relocations mismatch in __ex_table.
    scripts: add check_extable.sh script.
    modpost: mismatch_handler: retrieve tosym information only when needed.
    modpost: factorize symbol pretty print in get_pretty_name().
    modpost: add handler function pointer to sectioncheck.
    modpost: add .sched.text and .kprobes.text to the TEXT_SECTIONS list.
    modpost: add strict white-listing when referencing sections.
    module: do not print allocation-fail warning on bogus user buffer size
    kernel/module.c: fix typos in message about unused symbols

    Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "Here's the usual "low-priority fixes that didn't make it into the last
    few -rcs, with a twist: We had a fixes pull request that I didn't send
    in time to get into 4.0, so we'll send some of them to Greg for
    -stable as well.

    Contents here is as usual not all that controversial:

    - a handful of randconfig fixes from Arnd, in particular for older
    Samsung platforms

    - Exynos fixes, !SMP building, DTS updates for MMC and lid switch

    - Kbuild fix to create output subdirectory for DTB files

    - misc minor fixes for OMAP"

    * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
    ARM: at91/dt: sama5d3 xplained: add phy address for macb1
    kbuild: Create directory for target DTB
    ARM: mvebu: Disable CPU Idle on Armada 38x
    ARM: DRA7: Enable Cortex A15 errata 798181
    ARM: dts: am57xx-beagle-x15: Add thermal map to include fan and tmp102
    ARM: dts: DRA7: Add bandgap and related thermal nodes
    bus: ocp2scp: SYNC2 value should be changed to 0x6
    ARM: dts: am4372: Add "ti,am437x-ocp2scp" as compatible string for OCP2SCP
    ARM: OMAP2+: remove superfluous NULL pointer check
    ARM: EXYNOS: Fix build breakage cpuidle on !SMP
    ARM: dts: fix lid and power pin-functions for exynos5250-spring
    ARM: dts: fix mmc node updates for exynos5250-spring
    ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688
    MAINTAINERS: add OMAP defconfigs under OMAP SUPPORT
    ARM: OMAP1: PM: fix some build warnings on 1510-only Kconfigs
    ARM: cns3xxx: don't export static symbol
    ARM: S3C24XX: avoid a Kconfig warning
    ARM: S3C24XX: fix header file inclusions
    ARM: S3C24XX: fix building without PM_SLEEP
    ARM: S3C24XX: use SAMSUNG_WAKEMASK for s3c2416
    ...

    Linus Torvalds
     

22 Apr, 2015

8 commits

  • Currently an allyesconfig build [gcc-4.9.1] can generate the following:

    WARNING: vmlinux.o(.text.unlikely+0x3864): Section mismatch in
    reference from the function cpumask_empty.constprop.3() to the
    variable .init.data:nmi_ipi_mask

    which comes from the cpumask_empty usage in arch/x86/kernel/nmi_selftest.c.

    Normally we would not see a symbol entry for cpumask_empty since it is:

    static inline bool cpumask_empty(const struct cpumask *srcp)

    however in this case, the variant of the symbol gets emitted when GCC does
    constant propagation optimization.

    Fix things up so that any locally optimized constprop variants don't warn
    when accessing variables that live in the __init sections.

    Signed-off-by: Paul Gortmaker
    Signed-off-by: Rusty Russell

    Paul Gortmaker
     
  • Currently the match() function supports a leading * to match any
    prefix and a trailing * to match any suffix. However there currently
    is not a combination of both that can be used to target matches of
    whole families of functions that share a common substring.

    Here we expand the *foo and foo* match to also support *foo* with
    the goal of targeting compiler generated symbol names that contain
    strings like ".constprop." and ".isra."

    Signed-off-by: Paul Gortmaker
    Signed-off-by: Rusty Russell

    Paul Gortmaker
     
  • Trying to match the SHT_NUL section isn't useful and causes build failures
    on parisc and mn10300 since the addition of section strict white-listing
    and __ex_table sanitizing.

    Signed-off-by: Quentin Casasnovas
    Reported-by: Guenter Roeck
    Fixes: 050e57fd5936 ("modpost: add strict white-listing when referencing....")
    Fixes: 52dc0595d540 ("modpost: handle relocations mismatch in __ex_table.")
    Tested-by: Guenter Roeck
    Signed-off-by: Rusty Russell

    Quentin Casasnovas
     
  • As Guenter pointed out, we were never really calculating the extable entry
    size because the pointer arithmetic was simply wrong. We want to check
    we're handling the second relocation in __ex_table to infer an entry size,
    but we were using (void*) pointers instead of Elf_Rel[a]* ones.

    This fixes the problem by moving that check in the caller (since we can
    deal with different types of relocations) and add is_second_extable_reloc()
    to make the whole thing more readable.

    Signed-off-by: Quentin Casasnovas
    Reported-by: Guenter Roeck
    CC: Rusty Russell
    Signed-off-by: Rusty Russell

    Quentin Casasnovas
     
  • As Guenter pointed out, we want to assert that extable_entry_size has been
    discovered and not the other way around. Moreover, this sanity check is
    only valid when we're not dealing with the first relocation in __ex_table,
    since we have not discovered the extable entry size at that point.

    This was leading to a divide-by-zero on some architectures and make the
    build fail.

    Signed-off-by: Quentin Casasnovas
    Reported-by: Guenter Roeck
    CC: Rusty Russell
    Signed-off-by: Rusty Russell

    Quentin Casasnovas
     
  • 52dc0595d540 introduced OTHER_TEXT_SECTIONS for identifying what
    sections could validly have __ex_table entries. Unfortunately, it
    wasn't tested with -ffunction-sections, which some architectures
    use.

    Reported-by: kbuild test robot
    Cc: Quentin Casasnovas
    Signed-off-by: Rusty Russell

    Rusty Russell
     
  • 32-bit and 64-bit ARM use these sections to store executable code, so
    they must be whitelisted in modpost's table of valid text sections.

    Signed-off-by: Thierry Reding
    Signed-off-by: Rusty Russell

    Thierry Reding
     
  • Pull char/misc driver updates from Greg KH:
    "Here's the big char/misc driver patchset for 4.1-rc1.

    Lots of different driver subsystem updates here, nothing major, full
    details are in the shortlog.

    All of this has been in linux-next for a while"

    * tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (133 commits)
    mei: trace: remove unused TRACE_SYSTEM_STRING
    DTS: ARM: OMAP3-N900: Add lis3lv02d support
    Documentation: DT: lis302: update wakeup binding
    lis3lv02d: DT: add wakeup unit 2 and wakeup threshold
    lis3lv02d: DT: use s32 to support negative values
    Drivers: hv: hv_balloon: correctly handle num_pages>INT_MAX case
    Drivers: hv: hv_balloon: correctly handle val.freeram directory
    coresight-tmc: Adding a status interface to sysfs
    coresight: remove the unnecessary configuration coresight-default-sink
    ...

    Linus Torvalds
     

21 Apr, 2015

1 commit

  • Pull misc kbuild updates:
    "This is the remaining part of kbuild stuff for v4.1-rc1:

    - One wew coccinelle script and a clarification of the proposed fix
    in bugon.coccinelle

    - CONFIG_KERNEL_LZ4 support for extract-ikconfig"

    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    scripts/coccinelle/misc/bugon.cocci: update bug_on conversion warning
    scripts/extract-ikconfig: Support LZ4-compressed images.
    irqf_oneshot.cocci: add check of devm_request_threaded_irq()

    Linus Torvalds
     

18 Apr, 2015

1 commit

  • Pull MIPS updates from Ralf Baechle:
    "This is the main pull request for MIPS for Linux 4.1. Most
    noteworthy:

    - Add more Octeon-optimized crypto functions
    - Octeon crypto preemption and locking fixes
    - Little endian support for Octeon
    - Use correct CSR to soft reset Octeons
    - Support LEDs on the Octeon-based DSR-1000N
    - Fix PCI interrupt mapping for the Octeon-based DSR-1000N
    - Mark prom_free_prom_memory() as __init for a number of systems
    - Support for Imagination's Pistachio SOC. This includes arch and
    CLK bits. I'd like to merge pinctrl bits later
    - Improve parallelism of csum_partial for certain pipelines
    - Organize DTB files in subdirs like other architectures
    - Implement read_sched_clock for all MIPS platforms other than
    Octeon
    - Massive series of 38 fixes and cleanups for the FPU emulator /
    kernel
    - Further FPU remulator work to support new features. This sits on a
    separate branch which also has been pulled into the 4.1 KVM branch
    - Clean up and fixes for the SEAD3 eval board; remove unused file
    - Various updates for Netlogic platforms
    - A number of small updates for Loongson 3 platforms
    - Increase the memory limit for ATH79 platforms to 256MB
    - A fair number of fixes and updates for BCM47xx platforms
    - Finish the implementation of XPA support
    - MIPS FDC support. No, not floppy controller but Fast Debug Channel :)
    - Detect the R16000 used in SGI legacy platforms
    - Fix Kconfig dependencies for the SSB bus support"

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (265 commits)
    MIPS: Makefile: Fix MIPS ASE detection code
    MIPS: asm: elf: Set O32 default FPU flags
    MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G
    MIPS: Kconfig: Disable SMP/CPS for 64-bit
    MIPS: Hibernate: flush TLB entries earlier
    MIPS: smp-cps: cpu_set FPU mask if FPU present
    MIPS: lose_fpu(): Disable FPU when MSA enabled
    MIPS: ralink: add missing symbol for RALINK_ILL_ACC
    MIPS: ralink: Fix bad config symbol in PCI makefile.
    SSB: fix Kconfig dependencies
    MIPS: Malta: Detect and fix bad memsize values
    Revert "MIPS: Avoid pipeline stalls on some MIPS32R2 cores."
    MIPS: Octeon: Delete override of cpu_has_mips_r2_exec_hazard.
    MIPS: Fix cpu_has_mips_r2_exec_hazard.
    MIPS: kernel: entry.S: Set correct ISA level for mips_ihb
    MIPS: asm: spinlock: Fix addiu instruction for R10000_LLSC_WAR case
    MIPS: r4kcache: Use correct base register for MIPS R6 cache flushes
    MIPS: Kconfig: Fix typo for the r2-to-r6 emulator kernel parameter
    MIPS: unaligned: Fix regular load/store instruction emulation for EVA
    MIPS: unaligned: Surround load/store macros in do {} while statements
    ...

    Linus Torvalds
     

17 Apr, 2015

20 commits

  • Merge third patchbomb from Andrew Morton:

    - various misc things

    - a couple of lib/ optimisations

    - provide DIV_ROUND_CLOSEST_ULL()

    - checkpatch updates

    - rtc tree

    - befs, nilfs2, hfs, hfsplus, fatfs, adfs, affs, bfs

    - ptrace fixes

    - fork() fixes

    - seccomp cleanups

    - more mmap_sem hold time reductions from Davidlohr

    * emailed patches from Andrew Morton : (138 commits)
    proc: show locks in /proc/pid/fdinfo/X
    docs: add missing and new /proc/PID/status file entries, fix typos
    drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
    Documentation/spi/spidev_test.c: fix warning
    drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type
    .gitignore: ignore *.tar
    MAINTAINERS: add Mediatek SoC mailing list
    tomoyo: reduce mmap_sem hold for mm->exe_file
    powerpc/oprofile: reduce mmap_sem hold for exe_file
    oprofile: reduce mmap_sem hold for mm->exe_file
    mips: ip32: add platform data hooks to use DS1685 driver
    lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text
    x86: switch to using asm-generic for seccomp.h
    sparc: switch to using asm-generic for seccomp.h
    powerpc: switch to using asm-generic for seccomp.h
    parisc: switch to using asm-generic for seccomp.h
    mips: switch to using asm-generic for seccomp.h
    microblaze: use asm-generic for seccomp.h
    arm: use asm-generic for seccomp.h
    seccomp: allow COMPAT sigreturn overrides
    ...

    Linus Torvalds
     
  • It might be annoying to constantly see this:

    scripts/Makefile.kasan:16: Cannot use CONFIG_KASAN: -fsanitize=kernel-address is not supported by compiler

    while performing allmodconfig/allyesconfig build tests.
    Disable this warning if CONFIG_COMPILE_TEST=y.

    Signed-off-by: Andrey Ryabinin
    Cc: Michal Marek
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrey Ryabinin
     
  • Since commit 1f65f947a6a8 ("checkpatch: add checks for question mark and
    colon spacing") back in 2008, checkpatch has reported false positive for
    asm volatile uses of "::" checkpatch thinks colons should always have
    spaces around it.

    Add an exception for colons with colons on either side for this valid asm
    volatile (and c++) use.

    Signed-off-by: Joe Perches
    Reported-by: Yehuda Yitschak
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • If a patch touches multiple files, the --fix and --fix-inplace option
    doesn't keep the proper line count and makes the new patch file not able
    to be applied via bad offset line numbers when lines are added or deleted
    by the --fix option.

    Dunno how that extra backslash snuck in there.

    Signed-off-by: Joe Perches
    Cc: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • ENOSYS means that a nonexistent system call was called. We have a
    bad habit of using it for things like invalid operations on
    otherwise valid syscalls. We should avoid this in new code.

    Pervasive incorrect usage of ENOSYS came up at the kernel summit ABI
    review discussion. Let's see if checkpatch can help.

    I'll submit a separate patch for include/uapi/asm-generic/errno.h.

    Signed-off-by: Andy Lutomirski
    Cc: Pavel Machek
    Cc: Michael Kerrisk
    Cc: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andy Lutomirski
     
  • const objects shouldn't be __read_mostly. They are read-only.

    Marking these objects as __read_mostly causes section conflicts with LTO
    linking.

    So add a test to try to avoid this issue.

    Signed-off-by: Joe Perches
    Cc: Andy Whitcroft
    Cc: Andi Kleen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Code such as:
    x = timercmp(&now, &end,
    Cc: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Sam Bobroff
     
  • Add a test for sizeof(foo)/sizeof(foo[0]) that could be ARRAY_SIZE(foo).

    Signed-off-by: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Add another struct to the list of normally const struct types

    Signed-off-by: Joe Perches
    Cc: Andy Whitcroft
    Cc: Maxime Coquelin
    Cc: Greg Kroah-Hartman
    Cc: Jiri Slaby
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • There are #defines with long string constants like:
    #define foo "some really long string > 80 columns"
    Add a long line exception for them.

    Miscellanea:

    Use the $String variable for slightly better readability

    Signed-off-by: Joe Perches
    Reported-by: Madalin-Cristian Bucur
    Cc: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Commit messages lines are sometimes overly long.

    Suggest line wrapping at 75 columns so the default git commit log
    indentation of 4 plus the commit message text still fits on an 80 column
    screen.

    Add a checkpatch test for long commit messages lines too.

    Signed-off-by: Joe Perches
    Cc: David Miller
    Cc: Jonathan Corbet
    Cc: Ian Morris
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Currently checkpatch warns when asm/file.h is included and linux/file.h
    exists. That conversion can be made when linux/file.h includes asm/file.h
    which is not always the case.(See signal.h)

    Signed-off-by: Fabian Frederick
    Cc: Andy Whitcroft
    Acked-by: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Fabian Frederick
     
  • Using 'const const *' is generally meant to be written 'const
    * const'.

    Add a test for the miswritten form.

    Signed-off-by: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Add a few conditions to the test to find
    return (ERRNO);

    Make the output message a bit less cryptic too.

    Signed-off-by: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Currently checkpatch will fuss if one uses world writable settings in
    debugfs files and DEVICE_ATTR uses by testing S_IWUGO but not testing
    S_IWOTH, S_IRWXUGO or S_IALLUGO.

    Extend the check to catch all cases exporting world writable permissions
    including octal values.

    [akpm@linux-foundation.org: remove stray $]
    Signed-off-by: Joe Perches
    Original-patch-by: Nicholas Mc Guire
    Cc: Guenter Roeck
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • If a codespell dictionary exists, use it if desired. default is off,
    maybe it could be turned on later.

    codespell's dictionary format allows multiple possible corrections, ignore
    that for now and only use the first suggestion.

    Also add \b to spelling test so that consecutive misspelled words
    are found properly.

    Signed-off-by: Joe Perches
    Cc: Andy Whitcroft
    Cc: Kees Cook
    Cc: Masanari Iida
    Cc: Lucas De Marchi
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • References: http://mid.gmane.org/1424977312-24902-1-git-send-email-ville.syrjala@linux.intel.com

    Signed-off-by: Jani Nikula
    Cc: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jani Nikula
     
  • Only commit log and patch additions are checked for typos and spelling
    errors currently. Add a check of the email subject line too.

    Signed-off-by: Joe Perches
    Suggested-by: Jani Nikula
    Tested-by: Jani Nikula
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • The "no space is necessary after a cast" sizeof exclusion doesn't work
    properly.

    The test reports a false positive for code like:

    BUILD_BUG_ON(sizeof(struct batadv_bla_claim_dst) != 6);

    Make it work, simplify the exclusions, and add some comments.

    Signed-off-by: Joe Perches
    Reported-by: Marek Lindner
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Pull xen features and fixes from David Vrabel:

    - use a single source list of hypercalls, generating other tables etc.
    at build time.

    - add a "Xen PV" APIC driver to support >255 VCPUs in PV guests.

    - significant performance improve to guest save/restore/migration.

    - scsiback/front save/restore support.

    - infrastructure for multi-page xenbus rings.

    - misc fixes.

    * tag 'stable/for-linus-4.1-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
    xen/pci: Try harder to get PXM information for Xen
    xenbus_client: Extend interface to support multi-page ring
    xen-pciback: also support disabling of bus-mastering and memory-write-invalidate
    xen: support suspend/resume in pvscsi frontend
    xen: scsiback: add LUN of restored domain
    xen-scsiback: define a pr_fmt macro with xen-pvscsi
    xen/mce: fix up xen_late_init_mcelog() error handling
    xen/privcmd: improve performance of MMAPBATCH_V2
    xen: unify foreign GFN map/unmap for auto-xlated physmap guests
    x86/xen/apic: WARN with details.
    x86/xen: Provide a "Xen PV" APIC driver to support >255 VCPUs
    xen/pciback: Don't print scary messages when unsupported by hypervisor.
    xen: use generated hypercall symbols in arch/x86/xen/xen-head.S
    xen: use generated hypervisor symbols in arch/x86/xen/trace.c
    xen: synchronize include/xen/interface/xen.h with xen
    xen: build infrastructure for generating hypercall depending symbols
    xen: balloon: Use static attribute groups for sysfs entries
    xen: pcpu: Use static attribute groups for sysfs entry

    Linus Torvalds
     

16 Apr, 2015

2 commits

  • Pull kconfig updates from Michal Marek:
    "Here is the kconfig stuff for v4.1-rc1:

    - fixes for mergeconfig (used by make kvmconfig/tinyconfig)

    - header cleanup

    - make -s *config is silent now"

    * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    kconfig: Do not print status messages in make -s mode
    kconfig: Simplify Makefile
    kbuild: add generic mergeconfig target, %.config
    merge_config.sh: rename MAKE to RUNMAKE
    merge_config.sh: improve indentation
    kbuild: mergeconfig: remove redundant $(objtree)
    kbuild: mergeconfig: move an error check to merge_config.sh
    kbuild: mergeconfig: fix "jobserver unavailable" warning
    kconfig: Remove unnecessary prototypes from headers
    kconfig: Remove dead code
    kconfig: Get rid of the P() macro in headers
    kconfig: fix a misspelling in scripts/kconfig/merge_config.sh

    Linus Torvalds
     
  • Pull kbuild updates from Michal Marek:
    "Here is the first round of kbuild changes for v4.1-rc1:

    - kallsyms fix for ARM and cleanup

    - make dep(end) removed (developers have no sense of nostalgia these
    days...)

    - include Makefiles by relative path

    - stop useless rebuilds of asm-offsets.h and bounds.h"

    * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    Kbuild: kallsyms: drop special handling of pre-3.0 GCC symbols
    Kbuild: kallsyms: ignore veneers emitted by the ARM linker
    kbuild: ia64: use $(src)/Makefile.gate rather than particular path
    kbuild: include $(src)/Makefile rather than $(obj)/Makefile
    kbuild: use relative path more to include Makefile
    kbuild: use relative path to include Makefile
    kbuild: do not add $(bounds-file) and $(offsets-file) to targets
    kbuild: remove warning about "make depend"
    kbuild: Don't reset timestamps in include/generated if not needed

    Linus Torvalds