11 Apr, 2015

1 commit

  • …rnel/platform-linux-feature-tree into ti-linux-3.14.y

    TI-Feature: platform_base
    TI-Tree: git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree.git
    TI-Branch: platform-ti-linux-3.14.y

    * 'platform-ti-linux-3.14.y' of git://git.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
    crypto: omap-sham: Use pm_runtime_irq_safe()
    crypto: omap-sham: Add the offset of sg page to vaddr
    crypto: omap-aes - Fix support for unaligned lengths
    gpio: Document GPIO hogging mechanism
    gpio: add GPIO hog mechanism
    dmaengine: omap-dma: Fix memory leak when terminating running transfer
    dmaengine: edma: fix memory leak when terminating running transfers
    ti_config_fragments/baseport.cfg: enable opening files by handle
    scripts/dtc: Update to upstream version 1.4.1-ga4b093f7
    scripts/dtc: Add a script to update to mainline dtc source

    Conflicts:
    drivers/dma/edma.c
    drivers/gpio/gpiolib.c

    Signed-off-by: Dan Murphy <DMurphy@ti.com>

    Dan Murphy
     

09 Apr, 2015

2 commits

  • This updates scripts/dtc to commit
    "a4b093f libfdt: Add missing functions to shared library"
    from git://git.kernel.org/pub/scm/utils/dtc/dtc.git.
    This is autogenerated commit using the update-dtc-source.sh script.

    This change is mainly needed for including the new DTC syntax.
    "3346e065a dtc: parser: Add label while overriding nodes"
    With the new syntax, it is possible to write generic app board
    device tree which can work with multiple boards.

    For e.g. the JAMR3 DTSI file describes all the devices on an i2c bus.
    All these devices are put under i2c2 or i2c5 depending on whether
    it's used with dra7-evm or dra72-evm
    This way, there is no need to replicate the DT nodes in two places.

    Signed-off-by: Nikhil Devshatwar

    Nikhil Devshatwar
     
  • [ Upstream commit c8a3e6a866f91f82b4d04809aa30de2f4d928756 ]

    A very simple script that automates pulling in a newer version of DTC.
    Not particularly robust, but a whole lot better than doing it by hand
    every time.

    Signed-off-by: Grant Likely
    Signed-off-by: Nikhil Devshatwar

    Grant Likely
     

11 Feb, 2015

1 commit

  • commit 2d560306096739e2251329ab5c16059311a151b0 upstream.

    Warning:
    In file included from scripts/kconfig/zconf.tab.c:2537:0:
    scripts/kconfig/menu.c: In function ‘get_symbol_str’:
    scripts/kconfig/menu.c:590:18: warning: ‘jump’ may be used uninitialized in this function [-Wmaybe-uninitialized]
    jump->offset = strlen(r->s);

    Simplifies the test logic because (head && local) means (jump != 0)
    and makes GCC happy when checking if the jump pointer was initialized.

    Signed-off-by: Peter Kümmel
    Signed-off-by: Michal Marek
    Cc: Sedat Dilek
    Signed-off-by: Greg Kroah-Hartman

    Peter Kümmel
     

30 Jan, 2015

1 commit

  • commit 1caf6aaaa47471831d77c75f094d4e00ad1ec808 upstream.

    Compiling SH with gcc-4.8 fails due to the -m32 option not being
    supported.

    From http://buildd.debian-ports.org/status/fetch.php?pkg=linux&arch=sh4&ver=3.16.7-ckt4-1&stamp=1421425783

    CC init/main.o
    gcc-4.8: error: unrecognized command line option '-m32'
    ld: cannot find init/.tmp_mc_main.o: No such file or directory
    objcopy: 'init/.tmp_mx_main.o': No such file
    rm: cannot remove 'init/.tmp_mx_main.o': No such file or directory
    rm: cannot remove 'init/.tmp_mc_main.o': No such file or directory

    Link: http://lkml.kernel.org/r/1421537778-29001-1-git-send-email-kernel@mkarcher.dialup.fu-berlin.de
    Link: http://lkml.kernel.org/r/54BCBDD4.10102@physik.fu-berlin.de

    Cc: Matt Fleming
    Reported-by: John Paul Adrian Glaubitz
    Signed-off-by: Michael Karcher
    Signed-off-by: Steven Rostedt
    Signed-off-by: Greg Kroah-Hartman

    Michael Karcher
     

16 Jan, 2015

1 commit

  • commit 7b990789a4c3420fa57596b368733158e432d444 upstream.

    The change from \d+ to .+ inside __aligned() means that the following
    structure:

    struct test {
    u8 a __aligned(2);
    u8 b __aligned(2);
    };

    essentially gets modified to

    struct test {
    u8 a;
    };

    for purposes of kernel-doc, thus dropping a struct member, which in
    turns causes warnings and invalid kernel-doc generation.

    Fix this by replacing the catch-all (".") with anything that's not a
    semicolon ("[^;]").

    Fixes: 9dc30918b23f ("scripts/kernel-doc: handle struct member __aligned without numbers")
    Signed-off-by: Johannes Berg
    Cc: Nishanth Menon
    Cc: Randy Dunlap
    Cc: Michal Marek
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds
    Signed-off-by: Greg Kroah-Hartman

    Johannes Berg
     

07 Jul, 2014

1 commit

  • commit 91ad11d7cc6f4472ebf177a6252fbf0fd100d798 upstream.

    On MIPS calls to _mcount in modules generate 2 instructions to load
    the _mcount address (and therefore 2 relocations). The mcount_loc
    table should only reference the first of these, so the second is
    filtered out by checking the relocation offset and ignoring ones that
    immediately follow the previous one seen.

    However if a module has an _mcount call at offset 0, the second
    relocation would not be filtered out due to old_r_offset == 0
    being taken to mean that the current relocation is the first one
    seen, and both would end up in the mcount_loc table.

    This results in ftrace_make_nop() patching both (adjacent)
    instructions to branches over the _mcount call sequence like so:

    0xffffffffc08a8000: 04 00 00 10 b 0xffffffffc08a8014
    0xffffffffc08a8004: 04 00 00 10 b 0xffffffffc08a8018
    0xffffffffc08a8008: 2d 08 e0 03 move at,ra
    ...

    The second branch is in the delay slot of the first, which is
    defined to be unpredictable - on the platform on which this bug was
    encountered, it triggers a reserved instruction exception.

    Fix by initializing old_r_offset to ~0 and using that instead of 0
    to determine whether the current relocation is the first seen.

    Signed-off-by: Alex Smith
    Cc: linux-kernel@vger.kernel.org
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/7098/
    Signed-off-by: Ralf Baechle
    Signed-off-by: Greg Kroah-Hartman

    Alex Smith
     

01 Jul, 2014

1 commit

  • commit 6b4a144a92ab81a1f45fb9b12aebaaaee0d08120 upstream.

    In cross-build environment, we expect to use the cross-compiler objcopy
    instead of the host objcopy.

    It fixes following build failures:
    objcopy --only-keep-debug lib/modules/3.14/kernel/net/ipv6/xfrm6_mode_tunnel.ko /srv/build/linux/debian/dbgtmp/usr/lib/debug/lib/modules/3.14/kernel/net/ipv6/xfrm6_mode_tunnel.ko
    objcopy: Unable to recognise the format of the input file `lib/modules/3.14/kernel/net/ipv6/xfrm6_mode_tunnel.ko'

    Signed-off-by: Fathi Boudra
    Fixes: 810e843746b7 ('deb-pkg: split debug symbols in their own package')
    Reviewed-by: Ben Hutchings
    Signed-off-by: Michal Marek
    Signed-off-by: Greg Kroah-Hartman

    Fathi Boudra
     

11 Mar, 2014

1 commit

  • Revert the recently applied 0f55159d091c ("kallsyms: fix absolute
    addresses for kASLR"). Kees said

    : This got NAKed, please don't apply -- this patch works for x86 and
    : ARM, but may cause problems for others:
    :
    : https://lkml.org/lkml/2014/2/24/718

    It appears that Kees will be fixing all this up for 3.15.

    Cc: Andy Honig
    Cc: Kees Cook
    Cc: Michal Marek
    Cc: Rusty Russell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     

08 Mar, 2014

1 commit

  • Pull ARM fixes from Russell King:
    "A number of ARM updates for -rc, covering mostly ARM specific code,
    but with one change to modpost.c to allow Thumb section mismatches to
    be detected.

    ARM changes include reporting when an attempt is made to boot a LPAE
    kernel on hardware which does not support LPAE, rather than just being
    silent about it.

    A number of other minor fixes are included too"

    * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
    ARM: 7992/1: boot: compressed: ignore bswapsdi2.S
    ARM: 7991/1: sa1100: fix compile problem on Collie
    ARM: fix noMMU kallsyms symbol filtering
    ARM: 7980/1: kernel: improve error message when LPAE config doesn't match CPU
    ARM: 7964/1: Detect section mismatches in thumb relocations
    ARM: 7963/1: mm: report both sections from PMD

    Linus Torvalds
     

04 Mar, 2014

2 commits

  • Currently symbols that are absolute addresses are incorrectly displayed
    in /proc/kallsyms if the kernel is loaded with kASLR.

    The problem was that the scripts/kallsyms.c file which generates the
    array of symbol names and addresses uses an relocatable value for all
    symbols, even absolute symbols. This patch fixes that.

    Several kallsyms output in different boot states for comparison:

    $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.nokaslr
    0000000000000000 D __per_cpu_start
    0000000000014280 D __per_cpu_end
    ffffffff810001c8 T _stext
    $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr1
    000000001f200000 D __per_cpu_start
    000000001f214280 D __per_cpu_end
    ffffffffa02001c8 T _stext
    $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr2
    000000000d400000 D __per_cpu_start
    000000000d414280 D __per_cpu_end
    ffffffff8e4001c8 T _stext
    $ egrep '_(stext|_per_cpu_(start|end))' /root/kallsyms.kaslr-fixed
    0000000000000000 D __per_cpu_start
    0000000000014280 D __per_cpu_end
    ffffffffadc001c8 T _stext

    Signed-off-by: Andy Honig
    Signed-off-by: Kees Cook
    Cc: Michal Marek
    Cc: Rusty Russell
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andy Honig
     
  • LZ4 as implemented in the kernel differs from the default method now
    used by the reference implementation of LZ4. Until the in-kernel method
    is updated to support the new default, passing the legacy flag (-l) to
    the compressor is necessary. Without this flag the kernel-generated,
    LZ4-compressed initramfs is junk.

    Kyungsik said:

    : It seems that lz4 supports legacy format with the same option as lz4c
    : does. Just looking at the first few bytes of lz4 compressed image, we can
    : see whether it is new format or not.
    :
    : It shows new format magic number without this patch. New format magic
    : number is 0x184d2204.
    :
    : $ hexdump -C ./initramfs_data.cpio.lz4 |more
    : 00000000 04 22 4d 18 64 70 b9 69 (Little Endian)
    : ...
    :
    : Currently kernel supports legacy format only.

    Signed-off-by: Daniel M. Weeks
    Cc: Michal Marek
    Acked-by: Kyungsik Lee
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Daniel M. Weeks
     

20 Feb, 2014

1 commit

  • The testcase data is usable by any platform. This patch moves it into
    the drivers/of directory so it can be included by any architecture.

    Using the test cases requires manually adding #include
    to the end of the boards .dtsi file and enabling CONFIG_OF_SELFTEST. Not
    pretty though. A useful project would be to make the testcase code
    easier to execute.

    Signed-off-by: Grant Likely

    Grant Likely
     

19 Feb, 2014

1 commit


15 Feb, 2014

1 commit

  • Pull USB fixes from Greg KH:
    "Here is a bunch of USB fixes for 3.14-rc3. Most of these are xhci
    reverts, fixing a bunch of reported issues with USB 3 host controller
    issues that loads of people have been hitting (with the exception of
    kernel developers, all of our machines seem to be working fine, which
    is why these took so long to get resolved...)

    There are some other minor fixes and new device ids, as ususal. All
    have been in linux-next successfully"

    * tag 'usb-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (22 commits)
    usb: option: blacklist ZTE MF667 net interface
    Revert "usb: xhci: Link TRB must not occur within a USB payload burst"
    Revert "xhci: Avoid infinite loop when sg urb requires too many trbs"
    Revert "xhci: Set scatter-gather limit to avoid failed block writes."
    xhci 1.0: Limit arbitrarily-aligned scatter gather.
    Modpost: fixed USB alias generation for ranges including 0x9 and 0xA
    usb: core: Fix potential memory leak adding dyn USBdevice IDs
    USB: ftdi_sio: add Tagsys RFID Reader IDs
    usb: qcserial: add Netgear Aircard 340U
    usb-storage: enable multi-LUN scanning when needed
    USB: simple: add Dynastream ANT USB-m Stick device support
    usb-storage: add unusual-devs entry for BlackBerry 9000
    usb-storage: restrict bcdDevice range for Super Top in Cypress ATACB
    usb: phy: move some error messages to debug
    usb: ftdi_sio: add Mindstorms EV3 console adapter
    usb: dwc2: fix memory corruption in dwc2 driver
    usb: dwc2: fix role switch breakage
    usb: dwc2: bail out early when booting with "nousb"
    Revert "xhci: replace xhci_read_64() with readq()"
    Revert "xhci: replace xhci_write_64() with writeq()"
    ...

    Linus Torvalds
     

11 Feb, 2014

2 commits

  • Since git v1.7.7, the .git directory can be a file when, for example,
    the kernel is a submodule of another git super project. So, the check
    "-d .git" is not working anymore in this case. Using a more generic
    check like "-e .git" corrects this behaviour.

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

    Richard Genoud
     
  • Since git v1.7.7, the .git directory can be a file when, for example,
    the kernel is a submodule of another git super project. So, the check
    "-d .git" is not working anymore in this case. Using a more generic
    check like "-e .git" corrects this behaviour.

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

    Richard Genoud
     

08 Feb, 2014

1 commit

  • Commit afe2dab4f6 ("USB: add hex/bcd detection to usb modalias generation")
    changed the routine that generates alias ranges. Before that change, only
    digits 0-9 were supported; the commit tried to fix the case when the range
    includes higher values than 0x9.

    Unfortunately, the commit didn't fix the case when the range includes both
    0x9 and 0xA, meaning that the final range must look like [x-9A-y] where
    x = 0xA -- instead the [x-9A-x] range was produced.

    Modprobe doesn't complain as it sees no difference between no-match and
    bad-pattern results of fnmatch().

    Fixing this simple bug to fix the aliases.
    Also changing the hardcoded beginning of the range to uppercase as all the
    other letters are also uppercase in the device version numbers.

    Fortunately, this affects only the dvb-usb-dib0700 module, AFAIK.

    Signed-off-by: Jan Moskyto Matejka
    Cc: stable
    Signed-off-by: Greg Kroah-Hartman

    Jan Moskyto Matejka
     

02 Feb, 2014

1 commit

  • Pull misc kbuild changes from Michal Marek:
    "The non-critical part of kbuild is small this time:
    - Three fixes for make deb-pkg
    - A new coccinelle check

    One of the deb-pkg fixes is a leftover from the last merge window,
    hence the merge commit"

    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    deb-pkg: Fix building for MIPS big-endian or ARM OABI
    deb-pkg: Fix cross-building linux-headers package
    scripts: Coccinelle script for pm_runtime_* return checks with IS_ERR_VALUE
    deb-pkg: Inhibit initramfs builders if CONFIG_BLK_DEV_INITRD is not set

    Linus Torvalds
     

31 Jan, 2014

1 commit

  • Pull kbuild changes from Michal Marek:
    - fix make -s detection with make-4.0
    - fix for scripts/setlocalversion when the kernel repository is a
    submodule
    - do not hardcode ';' in macros that expand to assembler code, as some
    architectures' assemblers use a different character for newline
    - Fix passing --gdwarf-2 to the assembler

    * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    frv: Remove redundant debugging info flag
    mn10300: Remove redundant debugging info flag
    kbuild: Fix debugging info generation for .S files
    arch: use ASM_NL instead of ';' for assembler new line character in the macro
    kbuild: Fix silent builds with make-4
    Fix detectition of kernel git repository in setlocalversion script [take #2]

    Linus Torvalds
     

28 Jan, 2014

3 commits

  • Merge misc updates from Andrew Morton:

    - a few hotfixes

    - dynamic-debug updates

    - ipc updates

    - various other sweepings off the factory floor

    * akpm: (31 commits)
    firmware/google: drop 'select EFI' to avoid recursive dependency
    compat: fix sys_fanotify_mark
    checkpatch.pl: check for function declarations without arguments
    mm/migrate.c: fix setting of cpupid on page migration twice against normal page
    softirq: use const char * const for softirq_to_name, whitespace neatening
    softirq: convert printks to pr_
    softirq: use ffs() in __do_softirq()
    kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcoreinfo_append_str()
    splice: fix unexpected size truncation
    ipc: fix compat msgrcv with negative msgtyp
    ipc,msg: document barriers
    ipc: delete seq_max field in struct ipc_ids
    ipc: simplify sysvipc_proc_open() return
    ipc: remove useless return statement
    ipc: remove braces for single statements
    ipc: standardize code comments
    ipc: whitespace cleanup
    ipc: change kern_ipc_perm.deleted type to bool
    ipc: introduce ipc_valid_object() helper to sort out IPC_RMID races
    ipc/sem.c: avoid overflow of semop undo (semadj) value
    ...

    Linus Torvalds
     
  • Pull powerpc updates from Ben Herrenschmidt:
    "So here's my next branch for powerpc. A bit late as I was on vacation
    last week. It's mostly the same stuff that was in next already, I
    just added two patches today which are the wiring up of lockref for
    powerpc, which for some reason fell through the cracks last time and
    is trivial.

    The highlights are, in addition to a bunch of bug fixes:

    - Reworked Machine Check handling on kernels running without a
    hypervisor (or acting as a hypervisor). Provides hooks to handle
    some errors in real mode such as TLB errors, handle SLB errors,
    etc...

    - Support for retrieving memory error information from the service
    processor on IBM servers running without a hypervisor and routing
    them to the memory poison infrastructure.

    - _PAGE_NUMA support on server processors

    - 32-bit BookE relocatable kernel support

    - FSL e6500 hardware tablewalk support

    - A bunch of new/revived board support

    - FSL e6500 deeper idle states and altivec powerdown support

    You'll notice a generic mm change here, it has been acked by the
    relevant authorities and is a pre-req for our _PAGE_NUMA support"

    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (121 commits)
    powerpc: Implement arch_spin_is_locked() using arch_spin_value_unlocked()
    powerpc: Add support for the optimised lockref implementation
    powerpc/powernv: Call OPAL sync before kexec'ing
    powerpc/eeh: Escalate error on non-existing PE
    powerpc/eeh: Handle multiple EEH errors
    powerpc: Fix transactional FP/VMX/VSX unavailable handlers
    powerpc: Don't corrupt transactional state when using FP/VMX in kernel
    powerpc: Reclaim two unused thread_info flag bits
    powerpc: Fix races with irq_work
    Move precessing of MCE queued event out from syscall exit path.
    pseries/cpuidle: Remove redundant call to ppc64_runlatch_off() in cpu idle routines
    powerpc: Make add_system_ram_resources() __init
    powerpc: add SATA_MV to ppc64_defconfig
    powerpc/powernv: Increase candidate fw image size
    powerpc: Add debug checks to catch invalid cpu-to-node mappings
    powerpc: Fix the setup of CPU-to-Node mappings during CPU online
    powerpc/iommu: Don't detach device without IOMMU group
    powerpc/eeh: Hotplug improvement
    powerpc/eeh: Call opal_pci_reinit() on powernv for restoring config space
    powerpc/eeh: Add restore_config operation
    ...

    Linus Torvalds
     
  • Functions like this one are evil:

    void foo()
    {
    ...
    }

    Because these functions allow variadic arguments without
    checking the arguments at all.

    Original patch by Richard Weinberger.

    Signed-off-by: Joe Perches
    Cc: Richard Weinberger
    Cc: Borislav Petkov
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     

25 Jan, 2014

1 commit

  • Pull ACPI and power management updates from Rafael Wysocki:
    "As far as the number of commits goes, the top spot belongs to ACPI
    this time with cpufreq in the second position and a handful of PM
    core, PNP and cpuidle updates. They are fixes and cleanups mostly, as
    usual, with a couple of new features in the mix.

    The most visible change is probably that we will create struct
    acpi_device objects (visible in sysfs) for all devices represented in
    the ACPI tables regardless of their status and there will be a new
    sysfs attribute under those objects allowing user space to check that
    status via _STA.

    Consequently, ACPI device eject or generally hot-removal will not
    delete those objects, unless the table containing the corresponding
    namespace nodes is unloaded, which is extremely rare. Also ACPI
    container hotplug will be handled quite a bit differently and cpufreq
    will support CPU boost ("turbo") generically and not only in the
    acpi-cpufreq driver.

    Specifics:

    - ACPI core changes to make it create a struct acpi_device object for
    every device represented in the ACPI tables during all namespace
    scans regardless of the current status of that device. In
    accordance with this, ACPI hotplug operations will not delete those
    objects, unless the underlying ACPI tables go away.

    - On top of the above, new sysfs attribute for ACPI device objects
    allowing user space to check device status by triggering the
    execution of _STA for its ACPI object. From Srinivas Pandruvada.

    - ACPI core hotplug changes reducing code duplication, integrating
    the PCI root hotplug with the core and reworking container hotplug.

    - ACPI core simplifications making it use ACPI_COMPANION() in the
    code "glueing" ACPI device objects to "physical" devices.

    - ACPICA update to upstream version 20131218. This adds support for
    the DBG2 and PCCT tables to ACPICA, fixes some bugs and improves
    debug facilities. From Bob Moore, Lv Zheng and Betty Dall.

    - Init code change to carry out the early ACPI initialization
    earlier. That should allow us to use ACPI during the timekeeping
    initialization and possibly to simplify the EFI initialization too.
    From Chun-Yi Lee.

    - Clenups of the inclusions of ACPI headers in many places all over
    from Lv Zheng and Rashika Kheria (work in progress).

    - New helper for ACPI _DSM execution and rework of the code in
    drivers that uses _DSM to execute it via the new helper. From
    Jiang Liu.

    - New Win8 OSI blacklist entries from Takashi Iwai.

    - Assorted ACPI fixes and cleanups from Al Stone, Emil Goode, Hanjun
    Guo, Lan Tianyu, Masanari Iida, Oliver Neukum, Prarit Bhargava,
    Rashika Kheria, Tang Chen, Zhang Rui.

    - intel_pstate driver updates, including proper Baytrail support,
    from Dirk Brandewie and intel_pstate documentation from Ramkumar
    Ramachandra.

    - Generic CPU boost ("turbo") support for cpufreq from Lukasz
    Majewski.

    - powernow-k6 cpufreq driver fixes from Mikulas Patocka.

    - cpufreq core fixes and cleanups from Viresh Kumar, Jane Li, Mark
    Brown.

    - Assorted cpufreq drivers fixes and cleanups from Anson Huang, John
    Tobias, Paul Bolle, Paul Walmsley, Sachin Kamat, Shawn Guo, Viresh
    Kumar.

    - cpuidle cleanups from Bartlomiej Zolnierkiewicz.

    - Support for hibernation APM events from Bin Shi.

    - Hibernation fix to avoid bringing up nonboot CPUs with ACPI EC
    disabled during thaw transitions from Bjørn Mork.

    - PM core fixes and cleanups from Ben Dooks, Leonardo Potenza, Ulf
    Hansson.

    - PNP subsystem fixes and cleanups from Dmitry Torokhov, Levente
    Kurusa, Rashika Kheria.

    - New tool for profiling system suspend from Todd E Brandt and a
    cpupower tool cleanup from One Thousand Gnomes"

    * tag 'pm+acpi-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (153 commits)
    thermal: exynos: boost: Automatic enable/disable of BOOST feature (at Exynos4412)
    cpufreq: exynos4x12: Change L0 driver data to CPUFREQ_BOOST_FREQ
    Documentation: cpufreq / boost: Update BOOST documentation
    cpufreq: exynos: Extend Exynos cpufreq driver to support boost
    cpufreq / boost: Kconfig: Support for software-managed BOOST
    acpi-cpufreq: Adjust the code to use the common boost attribute
    cpufreq: Add boost frequency support in core
    intel_pstate: Add trace point to report internal state.
    cpufreq: introduce cpufreq_generic_get() routine
    ARM: SA1100: Create dummy clk_get_rate() to avoid build failures
    cpufreq: stats: create sysfs entries when cpufreq_stats is a module
    cpufreq: stats: free table and remove sysfs entry in a single routine
    cpufreq: stats: remove hotplug notifiers
    cpufreq: stats: handle cpufreq_unregister_driver() and suspend/resume properly
    cpufreq: speedstep: remove unused speedstep_get_state
    platform: introduce OF style 'modalias' support for platform bus
    PM / tools: new tool for suspend/resume performance optimization
    ACPI: fix module autoloading for ACPI enumerated devices
    ACPI: add module autoloading support for ACPI enumerated devices
    ACPI: fix create_modalias() return value handling
    ...

    Linus Torvalds
     

24 Jan, 2014

15 commits

  • ether_addr_copy was added for kernel version 3.14. It's slightly
    smaller/faster for some arches. Encourage its use.

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

    Joe Perches
     
  • This adds a simple check that any compatible strings in DeviceTree dts
    files are present in Documentation/devicetree/bindings. Vendor prefixes
    are also checked for existing in vendor-prefixes.txt These should be
    temporary checks until we have more sophisticated binding schema
    checking.

    Signed-off-by: Rob Herring
    Signed-off-by: Joe Perches
    Cc: Grant Likely
    Cc: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Rob Herring
     
  • This change restricts the check for the for the FSF address in the GPL
    copyright statement so that it only flags the address, not the
    references to the gnu.org/licenses URL which appears to be used in
    numerous drivers. The idea is to still allow some reference to an
    external copy of the GPL in the event that files are copied out of the
    kernel tree without the COPYING file.

    So for example this statement will still return an error:
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

    However, this statement will not return an error after this patch:
    You should have received a copy of the GNU General Public License
    along with this program. If not, see .

    Signed-off-by: Alexander Duyck
    Cc: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexander Duyck
     
  • Kernel style uses function pointers in this form:
    "type (*funcptr)(args...)"

    Emit warnings when this function pointer form isn't used.

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

    Joe Perches
     
  • The FSF address check is a bit too verbose looking for the GPL text.
    Quiet it a bit by requiring --strict for the GPL bit.

    Also make the address tests match a few uses of abbreviations for street
    names and make it case insensitive.

    Signed-off-by: Joe Perches
    Reviewed-by: Josh Triplett
    Cc: Manfred Spraul
    Cc: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • If statements don't need multiple parentheses around tested comparisons
    like "if ((foo == bar))".

    An == comparison maybe a sign of an intended assignment, so emit a
    slightly different message if so.

    Signed-off-by: Joe Perches
    Reviewed-by: Josh Triplett
    Cc: Manfred Spraul
    Cc: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • This test should remove all the spaces before a tab not just one space.

    Substitute a tab for each 8 space block before a tab and remove less than
    8 spaces before a tab.

    This SPACE_BEFORE_TAB test is done after CODE_INDENT.

    If there are spaces used at the beginning of a line that should be
    converted to tabs, please make sure that the CODE_INDENT test and
    conversion is done before this SPACE_BEFORE_TAB test and conversion.

    Reported-by: Manfred Spraul
    Signed-off-by: Joe Perches
    Cc: Josh Triplett
    Cc: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • Add the ability to fix and overwrite existing files/patches instead of
    creating a new file ".EXPERIMENTAL-checkpatch-fixes".

    Suggested-by: Manfred Spraul
    Signed-off-by: Joe Perches
    Reviewed-by: Josh Triplett
    Cc: Andy Whitcroft
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • switch case statements missing a break statement are an unfortunately
    common error.

    e.g.:
    commit 4a2c94c9b6c0 ("HID: kye: Add report fixup for Genius Manticore Keyboard")

    case blocks should end in a break/return/goto/continue.

    If a fall-through is used, it should have a comment showing that it is
    intentional. Ideally that comment should be something like:
    "/* fall-through */"

    Add a test to look for missing break statements.

    This looks only at the context lines before an inserted case so it's
    possible to have false positives when the context contains a close brace
    and the break is before the brace and not part of the patch context.

    Looking at recent patches, this is a pretty rare occurrence. The normal
    kernel style uses a break as the last line of the previous block.

    Signed-off-by: Joe Perches
    Cc: Andy Whitcroft
    Cc: Jiri Kosina
    Cc: Benjamin Tissoires
    Cc: Dave Jones
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • gfp.h and page_alloc.c already specify that __GFP_NOFAIL is deprecated and
    no new users should be added.

    Add a warning to checkpatch to catch this.

    Signed-off-by: David Rientjes
    Cc: Joe Perches
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Rientjes
     
  • The "space before a non-naked semicolon" test has unwanted output when
    used in "for ( ;; )" loops.

    Make the test work only on end-of-line statement termination semicolons.

    Signed-off-by: Joe Perches
    Cc: Dan Carpenter
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • The current checkpatch test for split strings does not find several
    cases that should be found.

    For instance:

    /* Else poor success; go back to mode in "active" table */
    } else {
    IWL_DEBUG_RATE(mvm,
    - "LQ: GOING BACK TO THE OLD TABLE suc=%d cur-tpt=%d old-tpt=%d\n",
    + "GOING BACK TO THE OLD TABLE: SR %d "
    + "cur-tpt %d old-tpt %d\n",
    window->success_ratio,
    window->average_tpt,
    lq_sta->last_tpt);

    does not currently emit a warning.

    Improve the test to find these cases.

    Add more exceptions to reduce false positives for assembly and octal/hex
    string constants.

    Signed-off-by: Joe Perches
    Reviewed-by: Josh Triplett
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Joe Perches
     
  • get_maintainer currently uses "Signed-off-by" style lines to find
    interested parties to send patches to when the MAINTAINERS file does not
    have a specific section entry with a matching file pattern.

    Add statistics for commit authors and lines added and deleted to the
    information provided by --rolestats.

    These statistics are also emitted whenever --rolestats and --git are
    selected even when there is a specified maintainer.

    This can have the effect of expanding the number of people that are shown
    as possible "maintainers" of a particular file because "authors",
    "added_lines", and "removed_lines" are also used as criterion for the
    --max-maintainers option separate from the "commit_signers".

    The first "--git-max-maintainers" values of each criterion
    are emitted. Any "ties" are not shown.

    For example: (forcedeth does not have a named maintainer)

    Old output:

    $ ./scripts/get_maintainer.pl -f drivers/net/ethernet/nvidia/forcedeth.c
    "David S. Miller" (commit_signer:8/10=80%)
    Jiri Pirko (commit_signer:2/10=20%)
    Patrick McHardy (commit_signer:2/10=20%)
    Larry Finger (commit_signer:1/10=10%)
    Peter Zijlstra (commit_signer:1/10=10%)
    netdev@vger.kernel.org (open list:NETWORKING DRIVERS)
    linux-kernel@vger.kernel.org (open list)

    New output:

    $ ./scripts/get_maintainer.pl -f drivers/net/ethernet/nvidia/forcedeth.c
    "David S. Miller" (commit_signer:8/10=80%)
    Jiri Pirko (commit_signer:2/10=20%,authored:2/10=20%,removed_lines:3/33=9%)
    Patrick McHardy (commit_signer:2/10=20%,authored:2/10=20%,added_lines:12/95=13%,removed_lines:10/33=30%)
    Larry Finger (commit_signer:1/10=10%,authored:1/10=10%,added_lines:35/95=37%)
    Peter Zijlstra (commit_signer:1/10=10%)
    "Peter Hüwe" (authored:1/10=10%,removed_lines:15/33=45%)
    Joe Perches (authored:1/10=10%)
    Neil Horman (added_lines:40/95=42%)
    Bill Pemberton (removed_lines:3/33=9%)
    netdev@vger.kernel.org (open list:NETWORKING DRIVERS)
    linux-kernel@vger.kernel.org (open list)

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

    Joe Perches
     
  • "make headers_check" warns about soundcard.h for (at least) five years
    now:
    [...]/usr/include/linux/soundcard.h:1054: userspace cannot reference function or variable defined in the kernel

    We're apparently stuck with providing OSSlib-3.8 compatibility, so let's
    special case this declaration just to silence it.

    Notes:

    0) Support for OSSlib post 3.8 was already removed in commit 43a990765a
    ("sound: Remove OSSlib stuff from linux/soundcard.h"). Five years have
    passed since that commit: do people still care about OSSlib-3.8? If
    not, quite a bit of code could be remove from soundcard.h (and probably
    ultrasound.h).

    2) By the way, what is actually meant by:
    It is no longer possible to actually link against OSSlib with this
    header, but we still provide these macros for programs using them.

    Doesn't that mean compatibility to OSSlib isn't even useful?

    3) Anyhow, a previous discussion soundcard.h, which led to that commit,
    starts at https://lkml.org/lkml/2009/1/20/349 .

    4) And, yes, I sneaked in a whitespace fix.

    Signed-off-by: Paul Bolle
    Cc: Takashi Iwai
    Acked-by: Arnd Bergmann
    Cc: Michal Marek
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Paul Bolle
     
  • Sort the exception table at build-time rather than during boot.

    Microblaze is the same case as AARCH64 that's why EM_MICROBLAZE
    conditional check was added to allow cross-compilation on machines which
    are not running the latest libc-dev.

    Inspired by AARCH64 commit adace89562c7 ("arm64: extable: sort the
    exception table at build time").

    Signed-off-by: Michal Simek
    Acked-by: David Daney
    Cc: Catalin Marinas
    Cc: Will Deacon
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michal Simek
     

23 Jan, 2014

1 commit

  • Pull PCI updates from Bjorn Helgaas:
    "PCI changes for the v3.14 merge window:

    Resource management
    - Change pci_bus_region addresses to dma_addr_t (Bjorn Helgaas)
    - Support 64-bit AGP BARs (Bjorn Helgaas, Yinghai Lu)
    - Add pci_bus_address() to get bus address of a BAR (Bjorn Helgaas)
    - Use pci_resource_start() for CPU address of AGP BARs (Bjorn Helgaas)
    - Enforce bus address limits in resource allocation (Yinghai Lu)
    - Allocate 64-bit BARs above 4G when possible (Yinghai Lu)
    - Convert pcibios_resource_to_bus() to take pci_bus, not pci_dev (Yinghai Lu)

    PCI device hotplug
    - Major rescan/remove locking update (Rafael J. Wysocki)
    - Make ioapic builtin only (not modular) (Yinghai Lu)
    - Fix release/free issues (Yinghai Lu)
    - Clean up pciehp (Bjorn Helgaas)
    - Announce pciehp slot info during enumeration (Bjorn Helgaas)

    MSI
    - Add pci_msi_vec_count(), pci_msix_vec_count() (Alexander Gordeev)
    - Add pci_enable_msi_range(), pci_enable_msix_range() (Alexander Gordeev)
    - Deprecate "tri-state" interfaces: fail/success/fail+info (Alexander Gordeev)
    - Export MSI mode using attributes, not kobjects (Greg Kroah-Hartman)
    - Drop "irq" param from *_restore_msi_irqs() (DuanZhenzhong)

    SR-IOV
    - Clear NumVFs when disabling SR-IOV in sriov_init() (ethan.zhao)

    Virtualization
    - Add support for save/restore of extended capabilities (Alex Williamson)
    - Add Virtual Channel to save/restore support (Alex Williamson)
    - Never treat a VF as a multifunction device (Alex Williamson)
    - Add pci_try_reset_function(), et al (Alex Williamson)

    AER
    - Ignore non-PCIe error sources (Betty Dall)
    - Support ACPI HEST error sources for domains other than 0 (Betty Dall)
    - Consolidate HEST error source parsers (Bjorn Helgaas)
    - Add a TLP header print helper (Borislav Petkov)

    Freescale i.MX6
    - Remove unnecessary code (Fabio Estevam)
    - Make reset-gpio optional (Marek Vasut)
    - Report "link up" only after link training completes (Marek Vasut)
    - Start link in Gen1 before negotiating for Gen2 mode (Marek Vasut)
    - Fix PCIe startup code (Richard Zhu)

    Marvell MVEBU
    - Remove duplicate of_clk_get_by_name() call (Andrew Lunn)
    - Drop writes to bridge Secondary Status register (Jason Gunthorpe)
    - Obey bridge PCI_COMMAND_MEM and PCI_COMMAND_IO bits (Jason Gunthorpe)
    - Support a bridge with no IO port window (Jason Gunthorpe)
    - Use max_t() instead of max(resource_size_t,) (Jingoo Han)
    - Remove redundant of_match_ptr (Sachin Kamat)
    - Call pci_ioremap_io() at startup instead of dynamically (Thomas Petazzoni)

    NVIDIA Tegra
    - Disable Gen2 for Tegra20 and Tegra30 (Eric Brower)

    Renesas R-Car
    - Add runtime PM support (Valentine Barshak)
    - Fix rcar_pci_probe() return value check (Wei Yongjun)

    Synopsys DesignWare
    - Fix crash in dw_msi_teardown_irq() (Bjørn Erik Nilsen)
    - Remove redundant call to pci_write_config_word() (Bjørn Erik Nilsen)
    - Fix missing MSI IRQs (Harro Haan)
    - Add dw_pcie prefix before cfg_read/write (Pratyush Anand)
    - Fix I/O transfers by using CPU (not realio) address (Pratyush Anand)
    - Whitespace cleanup (Jingoo Han)

    EISA
    - Call put_device() if device_register() fails (Levente Kurusa)
    - Revert EISA initialization breakage ((Bjorn Helgaas)

    Miscellaneous
    - Remove unused code, including PCIe 3.0 interfaces (Stephen Hemminger)
    - Prevent bus conflicts while checking for bridge apertures (Bjorn Helgaas)
    - Stop clearing bridge Secondary Status when setting up I/O aperture (Bjorn Helgaas)
    - Use dev_is_pci() to identify PCI devices (Yijing Wang)
    - Deprecate DEFINE_PCI_DEVICE_TABLE (Joe Perches)
    - Update documentation 00-INDEX (Erik Ekman)"

    * tag 'pci-v3.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (119 commits)
    Revert "EISA: Initialize device before its resources"
    Revert "EISA: Log device resources in dmesg"
    vfio-pci: Use pci "try" reset interface
    PCI: Check parent kobject in pci_destroy_dev()
    xen/pcifront: Use global PCI rescan-remove locking
    powerpc/eeh: Use global PCI rescan-remove locking
    PCI: Fix pci_check_and_unmask_intx() comment typos
    PCI: Add pci_try_reset_function(), pci_try_reset_slot(), pci_try_reset_bus()
    MPT / PCI: Use pci_stop_and_remove_bus_device_locked()
    platform / x86: Use global PCI rescan-remove locking
    PCI: hotplug: Use global PCI rescan-remove locking
    pcmcia: Use global PCI rescan-remove locking
    ACPI / hotplug / PCI: Use global PCI rescan-remove locking
    ACPI / PCI: Use global PCI rescan-remove locking in PCI root hotplug
    PCI: Add global pci_lock_rescan_remove()
    PCI: Cleanup pci.h whitespace
    PCI: Reorder so actual code comes before stubs
    PCI/AER: Support ACPI HEST AER error sources for PCI domains other than 0
    ACPICA: Add helper macros to extract bus/segment numbers from HEST table.
    PCI: Make local functions static
    ...

    Linus Torvalds