This project is mirrored from Pull mirroring updated .
  1. 14 Oct, 2012 2 commits
    • Ingo Molnar's avatar
      perf: Fix UAPI fallout · 7d380c8f
      Ingo Molnar authored
      The UAPI commits forgot to test tooling builds such as tools/perf/,
      and this fixes the fallout.
      Manual conversion.
      Signed-off-by: default avatarIngo Molnar <>
      Signed-off-by: default avatarLinus Torvalds <>
    • Linus Torvalds's avatar
      Merge branch 'late-for-linus' of git:// · 3d6ee36d
      Linus Torvalds authored
      Pull ARM update from Russell King:
       "This is the final round of stuff for ARM, left until the end of the
        merge window to reduce the number of conflicts.  This set contains the
        ARM part of David Howells UAPI changes, and a fix to the ordering of
        'select' statements in ARM Kconfig files (see the appropriate commit
        for why this happened - thanks to Andrew Morton for pointing out the
        I've left this as long as I dare for this window to avoid conflicts,
        and I regenerated the config patch yesterday, posting it to our
        mailing list for review and testing.  I have several acks which
        include successful test reports for it.
        However, today I notice we've got new conflicts with previously unseen
        code...  though that conflict should be trivial (it's my changes vs a
        one liner.)"
      * 'late-for-linus' of git://
        ARM: config: make sure that platforms are ordered by option string
        ARM: config: sort select statements alphanumerically
        UAPI: (Scripted) Disintegrate arch/arm/include/asm
      Fix up fairly conflict in arch/arm/Kconfig (the select re-organization
      vs recent addition of GENERIC_KERNEL_EXECVE)
  2. 13 Oct, 2012 38 commits
    • Linus Torvalds's avatar
      Merge tag 'disintegrate-main-20121013' of git:// · 0b381a28
      Linus Torvalds authored
      Pull UAPI disintegration for include/linux/{,byteorder/}*.h from David Howells:
       "The patches contained herein do the following:
       (1) Remove kernel-only stuff in linux/ppp-comp.h from the UAPI.  I checked
           this with Paul Mackerras before I created the patch and he suggested some
           extra bits to unexport.
       (2) Remove linux/blk_types.h entirely from the UAPI as none of it is userspace
           applicable, and remove from the UAPI that part of linux/fs.h that was the
           reason for linux/blk_types.h being exported in the first place.  I
           discussed this with Jens Axboe before creating the patch.
       (3) The big patch of the series to disintegrate include/linux/*.h as a unit.
           This could be split up, though there would be collisions in moving stuff
           between the two Kbuild files when the parts are merged as that file is
           sorted alphabetically rather than being grouped by subsystem.
           Of this set of headers, 17 files have changed in the UAPI exported region
           since the 4th and only 8 since the 9th so there isn't much change in this
           area - as one might expect.
           It should be pretty obvious and straightforward if it does come to fixing
           up: stuff in __KERNEL__ guards stays where it is and stuff outside moves
           to the same file in the include/uapi/linux/ directory.
           If a new file appears then things get a bit more complicated as the
           "headers +=" line has to move to include/uapi/linux/Kbuild.  Only one new
           file has appeared since the 9th and I judge this type of event relatively
       (4) A patch to disintegrate include/linux/byteorder/*.h as a unit.
      Signed-off-by: default avatarDavid Howells <;">
      * tag 'disintegrate-main-20121013' of git://
        UAPI: (Scripted) Disintegrate include/linux/byteorder
        UAPI: (Scripted) Disintegrate include/linux
        UAPI: Unexport linux/blk_types.h
        UAPI: Unexport part of linux/ppp-comp.h
    • Linus Torvalds's avatar
      Merge tag 'disintegrate-spi-20121009' of git:// · 034b5eeb
      Linus Torvalds authored
      Pull spi UAPI disintegration from David Howells:
       "This is to complete part of the Userspace API (UAPI) disintegration
        for which the preparatory patches were pulled recently.  After these
        patches, userspace headers will be segregated into:
        for the userspace interface stuff, and:
        for the strictly kernel internal stuff.
      Signed-off-by: default avatarDavid Howells <>
      Acked-by: default avatarGrant Likely <;">
      * tag 'disintegrate-spi-20121009' of git://
        UAPI: (Scripted) Disintegrate include/linux/spi
    • Linus Torvalds's avatar
      Merge tag 'openrisc-uapi' of git:// · 7c5a4734
      Linus Torvalds authored
      Pull OpenRISC uapi disintegration from Jonas Bonn:
       "OpenRISC UAPI disintegration work from David Howells"
      * tag 'openrisc-uapi' of git://
        UAPI: (Scripted) Disintegrate arch/openrisc/include/asm
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git:// · 09a9ad6a
      Linus Torvalds authored
      Pull user namespace compile fixes from Eric W Biederman:
       "This tree contains three trivial fixes.  One compiler warning, one
        thinko fix, and one build fix"
      * 'for-linus' of git://
        btrfs: Fix compilation with user namespace support enabled
        userns: Fix posix_acl_file_xattr_userns gid conversion
        userns: Properly print bluetooth socket uids
    • Linus Torvalds's avatar
      Merge tag 'md-3.7' of git:// · 9db90880
      Linus Torvalds authored
      Pull md updates from NeilBrown:
       - "discard" support, some dm-raid improvements and other assorted bits
         and pieces.
      * tag 'md-3.7' of git:// (29 commits)
        md: refine reporting of resync/reshape delays.
        md/raid5: be careful not to resize_stripes too big.
        md: make sure manual changes to recovery checkpoint are saved.
        md/raid10: use correct limit variable
        md: writing to sync_action should clear the read-auto state.
        Subject: [PATCH] md:change resync_mismatches to atomic64_t to avoid races
        md/raid5: make sure to_read and to_write never go negative.
        md: When RAID5 is dirty, force reconstruct-write instead of read-modify-write.
        md/raid5: protect debug message against NULL derefernce.
        md/raid5: add some missing locking in handle_failed_stripe.
        MD: raid5 avoid unnecessary zero page for trim
        MD: raid5 trim support
        md/bitmap:Don't use IS_ERR to judge alloc_page().
        md/raid1: Don't release reference to device while handling read error.
        raid: replace list_for_each_continue_rcu with new interface
        add further __init annotations to crypto/xor.c
        DM RAID: Fix for "sync" directive ineffectiveness
        DM RAID: Fix comparison of index and quantity for "rebuild" parameter
        DM RAID: Add rebuild capability for RAID10
        DM RAID: Move 'rebuild' checking code to its own function
    • Russell King's avatar
      Merge branch 'config' into late-for-linus · 244acb1b
      Russell King authored
    • Russell King's avatar
      ARM: config: make sure that platforms are ordered by option string · 93e22567
      Russell King authored
      The large platform selection choice should be sorted by option string
      so it's easy to find the platform you're looking for.  Fix the few
      options which are out of this order.
      Acked-by: default avatarTony Lindgren <>
      Signed-off-by: default avatarRussell King <>
    • Russell King's avatar
      ARM: config: sort select statements alphanumerically · b1b3f49c
      Russell King authored
      As suggested by Andrew Morton:
        This is a pet peeve of mine.  Any time there's a long list of items
        (header file inclusions, kconfig entries, array initalisers, etc) and
        someone wants to add a new item, they *always* go and stick it at the
        end of the list.
        Guys, don't do this.  Either put the new item into a randomly-chosen
        position or, probably better, alphanumerically sort the list.
      lets sort all our select statements alphanumerically.  This commit was
      created by the following perl:
      while (<>) {
      	while (/\\\s*$/) {
      		$_ .= <>;
      	undef %selects if /^\s*config\s+/;
      	if (/^\s+select\s+(\w+).*/) {
      		if (defined($selects{$1})) {
      			if ($selects{$1} eq $_) {
      				print STDERR "Warning: removing duplicated $1 entry\n";
      			} else {
      				print STDERR "Error: $1 differently selected\n".
      					"\tOld: $selects{$1}\n".
      					"\tNew: $_\n";
      				exit 1;
      		$selects{$1} = $_;
      	if (%selects and (/^\s*$/ or /^\s+help/ or /^\s+---help---/ or
      			  /^endif/ or /^endchoice/)) {
      		foreach $k (sort (keys %selects)) {
      			print "$selects{$k}";
      		undef %selects;
      if (%selects) {
      	foreach $k (sort (keys %selects)) {
      		print "$selects{$k}";
      It found two duplicates:
      Warning: removing duplicated S5P_SETUP_MIPIPHY entry
      Warning: removing duplicated HARDIRQS_SW_RESEND entry
      and they are identical duplicates, hence the shrinkage in the diffstat
      of two lines.
      We have four testers reporting success of this change (Tony, Stephen,
      Linus and Sekhar.)
      Acked-by: default avatarJason Cooper <>
      Acked-by: default avatarTony Lindgren <>
      Acked-by: default avatarStephen Warren <>
      Acked-by: default avatarLinus Walleij <>
      Acked-by: default avatarSekhar Nori <>
      Signed-off-by: default avatarRussell King <>
    • David Howells's avatar
    • David Howells's avatar
    • David Howells's avatar
      UAPI: Unexport linux/blk_types.h · 08cce05c
      David Howells authored
      It seems that was linux/blk_types.h incorrectly exported to fix up some missing
      bits required by the exported parts of linux/fs.h (READ, WRITE, READA, etc.).
      So unexport linux/blk_types.h and unexport the relevant bits of linux/fs.h.
      Signed-off-by: default avatarDavid Howells <>
      cc: Jens Axboe <>
      cc: Tejun Heo <>
      cc: Al Viro <>
    • David Howells's avatar
      UAPI: Unexport part of linux/ppp-comp.h · 8e4627dd
      David Howells authored
      Unexport part of linux/ppp-comp.h as userspace can't make use of that bit.
      Signed-off-by: default avatarDavid Howells <>
      cc: Paul Mackerras <>
      cc: David Miller <>
    • Jonas Bonn's avatar
      Merge tag 'disintegrate-openrisc-20121009' of git:// · 6257c574
      Jonas Bonn authored
      UAPI Disintegration 2012-10-09
      * tag 'disintegrate-openrisc-20121009' of git://
        UAPI: (Scripted) Disintegrate arch/openrisc/include/asm
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git:// · 4d7127da
      Linus Torvalds authored
      Pull TPM bugfixes from James Morris.
      * 'for-linus' of git://
        tpm: Propagate error from tpm_transmit to fix a timeout hang
        driver/char/tpm: fix regression causesd by ppi
    • Linus Torvalds's avatar
      Merge branch 'release' of git:// · a3920a6e
      Linus Torvalds authored
      Pull ACPI & Thermal updates from Len Brown:
       "The generic Linux thermal layer is gaining some new capabilities
        (generic cooling via cpufreq) and some new customers (ARM).
        Also, an ACPI EC bug fix plus a regression fix."
      * 'release' of git:// (30 commits)
        tools/power/acpi/acpidump: remove duplicated include from acpidump.c
        ACPI idle, CPU hotplug: Fix NULL pointer dereference during hotplug
        cpuidle / ACPI: fix potential NULL pointer dereference
        ACPI: EC: Add a quirk for CLEVO M720T/M730T laptop
        ACPI: EC: Make the GPE storm threshold a module parameter
        thermal: Exynos: Fix NULL pointer dereference in exynos_unregister_thermal()
        Thermal: Fix bug on cpu_cooling, cooling device's id conflict problem.
        thermal: exynos: Use devm_* functions
        ARM: exynos: add thermal sensor driver platform data support
        thermal: exynos: register the tmu sensor with the kernel thermal layer
        thermal: exynos5: add exynos5250 thermal sensor driver support
        hwmon: exynos4: move thermal sensor driver to driver/thermal directory
        thermal: add generic cpufreq cooling implementation
        Fix a build error.
        thermal: Fix potential NULL pointer accesses
        thermal: add Renesas R-Car thermal sensor support
        thermal: fix potential out-of-bounds memory access
        Thermal: Introduce locking for cdev.thermal_instances list.
        Thermal: Unify the code for both active and passive cooling
        Thermal: Introduce simple arbitrator for setting device cooling state
    • Linus Torvalds's avatar
      Merge tag 'for-3.7' of git:// · 18a022de
      Linus Torvalds authored
      Pull OpenRISC updates from Jonas Bonn:
       "Fixups for some corner cases, build issues, and some obvious bugs in
        IRQ handling.  No major changes."
      * tag 'for-3.7' of git://
        openrisc: mask interrupts in irq_mask_ack function
        openrisc: fix typos in comments and warnings
        openrisc: PIC should act on domain-local irqs
        openrisc: Make cpu_relax() invoke barrier()
        audit: define AUDIT_ARCH_OPENRISC
        openrisc: delay: fix handling of counter overflow
        openrisc: delay: fix loops calculation for __const_udelay
    • Linus Torvalds's avatar
      Merge tag 'disintegrate-misc-arches-20121010' of... · 02a650e2
      Linus Torvalds authored
      Merge tag 'disintegrate-misc-arches-20121010' of git://
      Pull UAPI disintegration for misc arches from David Howells:
       "UAPI disintegration for MN10300, FRV and AVR32 arches"
      * tag 'disintegrate-misc-arches-20121010' of git://
        UAPI: (Scripted) Disintegrate arch/mn10300/include/asm
        UAPI: (Scripted) Disintegrate arch/frv/include/asm
        UAPI: (Scripted) Disintegrate arch/avr32/include/asm
    • Linus Torvalds's avatar
      Merge branch 'merge' of git:// · b6897130
      Linus Torvalds authored
      Pull powerpc uapi disintegration from Benjamin Herrenschmidt.
      * 'merge' of git://
        UAPI: (Scripted) Disintegrate arch/powerpc/include/asm
    • Linus Torvalds's avatar
      Merge tag 'arm64-uapi' of git:// · b4fe19f7
      Linus Torvalds authored
      Pull arm64 uapi disintegration from Catalin Marinas:
       "UAPI headers for arm64 together with some clean-up to make it
         - Do not export the COMPAT_* definitions to user
         - Simplify the compat unistd32.h definitions and remove the
           __SYSCALL_COMPAT guard
         - Disintegrate the arch/arm64/include/asm/* headers"
      * tag 'arm64-uapi' of git://
        UAPI: (Scripted) Disintegrate arch/arm64/include/asm
        arm64: Do not export the compat-specific definitions to the user
        arm64: Do not include asm/unistd32.h in asm/unistd.h
        arm64: Remove unused definitions from asm/unistd32.h
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git:// · ff69497a
      Linus Torvalds authored
      Pull C6X UAPI disintegration from Mark Salter:
       - scripted UAPI disintegration by David Howells.
      * tag 'for-linus' of git://
        UAPI: (Scripted) Disintegrate arch/c6x/include/asm
    • Linus Torvalds's avatar
      Merge tag 'for_linus-3.7' of git:// · 6c536a17
      Linus Torvalds authored
      Pull KGDB/KDB fixes and cleanups from Jason Wessel:
         - Clean up compile warnings in kgdboc.c and x86/kernel/kgdb.c
         - Add module event hooks for simplified debugging with gdb
         - Fix kdb to stop paging with 'q' on bta and dmesg
         - Fix for data that scrolls off the vga console due to line wrapping
           when using the kdb pager
         - The debug core registers for kernel module events which allows a
           kernel aware gdb to automatically load symbols and break on entry
           to a kernel module
         - Allow kgdboc=kdb to setup kdb on the vga console"
      * tag 'for_linus-3.7' of git://
        tty/console: fix warnings in drivers/tty/serial/kgdboc.c
        kdb,vt_console: Fix missed data due to pager overruns
        kdb: Fix dmesg/bta scroll to quit with 'q'
        kgdboc: Accept either kbd or kdb to activate the vga + keyboard kdb shell
        kgdb,x86: fix warning about unused variable
        mips,kgdb: fix recursive page fault with CONFIG_KPROBES
        kgdb: Add module event hooks
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.7-uapi-tag' of... · ba8a3d6c
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.7-uapi-tag' of git://
      Pull Xen UAPI disintegration from Konrad Rzeszutek Wilk:
       "This has the UAPI disintegration work done by David Howells"
      * tag 'stable/for-linus-3.7-uapi-tag' of git://
        UAPI: (Scripted) Disintegrate include/xen
    • Linus Torvalds's avatar
      Merge tag 'mmc-merge-for-3.7-rc1-part2' of git:// · 125aae1d
      Linus Torvalds authored
      Pull two more mmc changes from Chris Ball:
       - Disintegrate UAPI
       - fix a mismerge that caused a build error.
      * tag 'mmc-merge-for-3.7-rc1-part2' of git://
        UAPI: (Scripted) Disintegrate include/linux/mmc
        mmc: mxs-mmc: Fix merge issue causing build error
    • Linus Torvalds's avatar
      Merge tag 'dm-3.7-changes' of git:// · 79c63eeb
      Linus Torvalds authored
      Pull device-mapper changes from Alasdair G Kergon:
       "Remove the power-of-2 block size constraint on discards in dm thin
        provisioning and factor the bio_prison code out into a separate module
        (for sharing with the forthcoming cache target).
        Use struct bio's front_pad to eliminate the use of one separate
        mempool by bio-based devices.
        A few other tiny clean-ups."
      * tag 'dm-3.7-changes' of git://
        dm: store dm_target_io in bio front_pad
        dm thin: move bio_prison code to separate module
        dm thin: prepare to separate bio_prison code
        dm thin: support discard with non power of two block size
        dm persistent data: convert to use le32_add_cpu
        dm: use ACCESS_ONCE for sysfs values
        dm bufio: use list_move
        dm mpath: fix check for null mpio in end_io fn
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git:// · 6a5a3d6a
      Linus Torvalds authored
      Pull misc SCSI updates from James Bottomley:
       "This is an assorted set of stragglers into the merge window with
        driver updates for megaraid_sas, lpfc, bfi and mvumi.  It also
        includes some fairly major fixes for virtio-scsi (scatterlist init),
        scsi_debug (off by one error), storvsc (use after free) and qla2xxx
        (potential deadlock).
      Signed-off-by: default avatarJames Bottomley <;">
      * tag 'scsi-misc' of git:// (49 commits)
        [SCSI] storvsc: Account for in-transit packets in the RESET path
        [SCSI] qla2xxx: fix potential deadlock on ha->hardware_lock
        [SCSI] scsi_debug: Fix off-by-one bug when unmapping region
        [SCSI] Shorten the path length of scsi_cmd_to_driver()
        [SCSI] virtio-scsi: support online resizing of disks
        [SCSI] virtio-scsi: fix LUNs greater than 255
        [SCSI] virtio-scsi: initialize scatterlist structure
        [SCSI] megaraid_sas: Version, Changelog, Copyright update
        [SCSI] megaraid_sas: Remove duplicate code
        [SCSI] megaraid_sas: Add SystemPD FastPath support
        [SCSI] megaraid_sas: Add array boundary check for SystemPD
        [SCSI] megaraid_sas: Load io_request DataLength in bytes
        [SCSI] megaraid_sas: Add module param for configurable MSI-X vector count
        [SCSI] megaraid_sas: Remove un-needed completion_lock spinlock calls
        [SCSI] lpfc 8.3.35: Update lpfc version for 8.3.35 driver release
        [SCSI] lpfc 8.3.35: Fixed not reporting logical link speed to SCSI midlayer when QoS not on
        [SCSI] lpfc 8.3.35: Fix error with fabric service parameters causing performance issues
        [SCSI] lpfc 8.3.35: Fixed SCSI host create showing wrong link speed on SLI3 HBA ports
        [SCSI] lpfc 8.3.35: Fixed not checking solicition in progress bit when verifying FCF record for use
        [SCSI] lpfc 8.3.35: Fixed messages for misconfigured port errors
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git:// · 8bbbfa70
      Linus Torvalds authored
      Pull input layer updates from Dmitry Torokhov:
       "2nd round of updates for the input subsystem.  With it input core no
        longer limits number of character devices per event handler (such as
        evdev) to 32, but switches to dynamic minors once legacy range is
        exhausted.  This should get multi-seat installations that currently
        run our of event devices very quickly.
        You will also get an update for Wacom driver and a couple of driver
      * 'for-linus' of git://
        Input: extend the number of event (and other) devices
        Input: mousedev - mark mousedev interfaces as non-seekable
        Input: mousedev - rename mixdev_open to opened_by_mixdev
        Input: mousedev - reformat structure initializers
        Input: mousedev - factor out psaux code to reduce #ifdefery
        Input: samsung-keypad - add clk_prepare and clk_unprepare
        Input: atmel_mxt_ts - simplify mxt_dump_message
        Input: wacom - clean up wacom_query_tablet_data
        Input: wacom - introduce wacom_fix_phy_from_hid
        Input: wacom - allow any multi-input Intuos device to set prox
        Input: wacom - report correct touch contact size for I5/Bamboo
    • Linus Torvalds's avatar
      Merge branch 'for-3.7' of git:// · bd81ccea
      Linus Torvalds authored
      Pull nfsd update from J Bruce Fields:
       "Another relatively quiet cycle.  There was some progress on my
        remaining 4.1 todo's, but a couple of them were just of the form
        "check that we do X correctly", so didn't have much affect on the
        Other than that, a bunch of cleanup and some bugfixes (including an
        annoying NFSv4.0 state leak and a busy-loop in the server that could
        cause it to peg the CPU without making progress)."
      * 'for-3.7' of git:// (46 commits)
        UAPI: (Scripted) Disintegrate include/linux/sunrpc
        UAPI: (Scripted) Disintegrate include/linux/nfsd
        nfsd4: don't allow reclaims of expired clients
        nfsd4: remove redundant callback probe
        nfsd4: expire old client earlier
        nfsd4: separate session allocation and initialization
        nfsd4: clean up session allocation
        nfsd4: minor free_session cleanup
        nfsd4: new_conn_from_crses should only allocate
        nfsd4: separate connection allocation and initialization
        nfsd4: reject bad forechannel attrs earlier
        nfsd4: enforce per-client sessions/no-sessions distinction
        nfsd4: set cl_minorversion at create time
        nfsd4: don't pin clientids to pseudoflavors
        nfsd4: fix bind_conn_to_session xdr comment
        nfsd4: cast readlink() bug argument
        NFSD: pass null terminated buf to kstrtouint()
        nfsd: remove duplicate init in nfsd4_cb_recall
        nfsd4: eliminate redundant nfs4_free_stateid
        fs/nfsd/nfs4idmap.c: adjust inconsistent IS_ERR and PTR_ERR
    • Linus Torvalds's avatar
      Merge git:// · 98260daa
      Linus Torvalds authored
      Pull networking updates from David Miller:
       1) Alexey Kuznetsov noticed we routed TCP resets improperly in the
          assymetric routing case, fix this by reverting a change that made us
          use the incoming interface in the outgoing route key when we didn't
          have a socket context to work with.
       2) TCP sysctl kernel memory leakage to userspace fix from Alan Cox.
       3) Move UAPI bits from David Howells, WIMAX and CAN this time.
       4) Fix TX stalls in e1000e wrt.  Byte Queue Limits, from Hiroaki
          SHIMODA, Denys Fedoryshchenko, and Jesse Brandeburg.
       5) Fix IPV6 crashes in packet generator module, from Amerigo Wang.
       6) Tidies and fixes in the new VXLAN driver from Stephen Hemminger.
       7) Bridge IP options parse doesn't check first if SKB header has at
          least an IP header's worth of content present.  Fix from Sarveshwar
       8) The kernel now generates compound pages on transmit and the Xen
          netback drivers needs some adjustments in order to handle this.  Fix
          from Ian Campbell.
       9) Turn off ASPM in JME driver, from Kevin Bardon and Matthew Garrett.
      * git:// (43 commits)
        mcs7830: Fix link state detection
        net: add doc for in4_pton()
        net: add doc for in6_pton()
        vti: fix sparse bit endian warnings
        tcp: resets are misrouted
        usbnet: Support devices reporting idleness
        Add CDC-ACM support for the CX93010-2x UCMxx USB Modem
        net/ethernet/jme: disable ASPM
        tcp: sysctl interface leaks 16 bytes of kernel memory
        kaweth: print correct debug ptr
        e1000e: Change wthresh to 1 to avoid possible Tx stalls
        ipv4: fix route mark sparse warning
        xen: netback: handle compound page fragments on transmit.
        bridge: Pull ip header into skb->data before looking into ip header.
        isdn: fix a wrapping bug in isdn_ppp_ioctl()
        vxlan: fix oops when give unknown ifindex
        vxlan: fix receive checksum handling
        vxlan: add additional headroom
        vxlan: allow configuring port range
        vxlan: associate with tunnel socket on transmit
    • Linus Torvalds's avatar
      Merge git:// · e225ca27
      Linus Torvalds authored
      Pull Sparc updates from David Miller:
       1) Updated syscall tracing fix from Al Viro.
       2) SUN4V error reporting was deficient in several areas.
      * git://
        sparc64: fix ptrace interaction with force_successful_syscall_return()
        sparc64: Fix deficiencies in sun4v error reporting.
    • Linus Torvalds's avatar
      Merge git:// · 54f7fc25
      Linus Torvalds authored
      Pull tile arch update from Chris Metcalf:
       "The bulk of this change is the tile uapi disintegration.  There is
        also a one-line change in here to enable interrupts in
        do_work_pending() to avoid a WARN_ON in _local_bh_enable_ip()."
      * git://
        arch/tile: enable interrupts in do_work_pending()
        UAPI: (Scripted) Disintegrate arch/tile/include/asm
        UAPI: (Scripted) Disintegrate arch/tile/include/arch
    • Linus Torvalds's avatar
      Merge tag 'please-pull-dhowells-uapi' of git:// · 0c4a479b
      Linus Torvalds authored
      Pull ia64 UAPI changes from Tony Luck:
       "ia64 pieces of David Howells great UAPI include file move"
      * tag 'please-pull-dhowells-uapi' of git://
        UAPI: (Scripted) Disintegrate arch/ia64/include/asm
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git:// · ade0899b
      Linus Torvalds authored
      Pull perf updates from Ingo Molnar:
       "This tree includes some late late perf items that missed the first
         - Bash auto completion improvements, now we can auto complete the
           tools long options, tracepoint event names, etc, from Namhyung Kim.
         - Look up thread using tid instead of pid in 'perf sched'.
         - Move global variables into a perf_kvm struct, from David Ahern.
         - Hists refactorings, preparatory for improved 'diff' command, from
           Jiri Olsa.
         - Hists refactorings, preparatory for event group viewieng work, from
           Namhyung Kim.
         - Remove double negation on optional feature macro definitions, from
           Namhyung Kim.
         - Remove several cases of needless global variables, on most
         - misc fixes
         - sysfs support for IBS on AMD CPUs, from Robert Richter.
         - Support for an upcoming Intel CPU, the Xeon-Phi / Knights Corner
           HPC blade PMU, from Vince Weaver.
         - misc fixes"
      * 'perf-urgent-for-linus' of git:// (46 commits)
        perf: Fix perf_cgroup_switch for sw-events
        perf: Clarify perf_cpu_context::active_pmu usage by renaming it to ::unique_pmu
        perf/AMD/IBS: Add sysfs support
        perf hists: Add more helpers for hist entry stat
        perf hists: Move he->stat.nr_events initialization to a template
        perf hists: Introduce struct he_stat
        perf diff: Removing the total_period argument from output code
        perf tool: Add hpp interface to enable/disable hpp column
        perf tools: Removing hists pair argument from output path
        perf hists: Separate overhead and baseline columns
        perf diff: Refactor diff displacement possition info
        perf hists: Add struct hists pointer to struct hist_entry
        perf tools: Complete tracepoint event names
        perf/x86: Add support for Intel Xeon-Phi Knights Corner PMU
        perf evlist: Remove some unused methods
        perf evlist: Introduce add_newtp method
        perf kvm: Move global variables into a perf_kvm struct
        perf tools: Convert to BACKTRACE_SUPPORT
        perf tools: Long option completion support for each subcommands
        perf tools: Complete long option names of perf command
    • Markus Trippelsdorf's avatar
      perf: Handle new rbtree implementation · 871a0596
      Markus Trippelsdorf authored
      Perf build fails with the new rbtree implementation:
        ../../lib/rbtree.c:24:36: fatal error: linux/rbtree_augmented.h: No such file or directory compilation terminated.
      Fix by updating the Makefile and adding a btree_augmented.h
      Reported-and-tested-by: default avatarBorislav Petkov <>
      Signed-off-by: default avatarMarkus Trippelsdorf <>
      Cc: Arnaldo Carvalho de Melo <>
      Cc: Borislav Petkov <>
      Signed-off-by: default avatarIngo Molnar <>
      Signed-off-by: default avatarLinus Torvalds <>
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git:// · 4e21fc13
      Linus Torvalds authored
      Pull third pile of kernel_execve() patches from Al Viro:
       "The last bits of infrastructure for kernel_thread(), with
        alpha/arm/x86 use of those.  Plus sanitizing the asm glue and
        do_notify_resume() on alpha, fixing the "disabled irq while running
        task_work stuff" breakage there.
        At that point the rest of kernel_thread/kernel_execve/sys_execve work
        can be done independently for different architectures.  The only
        pending bits that do depend on having all architectures converted are
        restrictred to fs/* and kernel/* - that'll obviously have to wait for
        the next cycle.
        I thought we'd have to wait for all of them done before we start
        eliminating the longjump-style insanity in kernel_execve(), but it
        turned out there's a very simple way to do that without flagday-style
      * 'for-linus' of git://
        alpha: switch to saner kernel_execve() semantics
        arm: switch to saner kernel_execve() semantics
        x86, um: convert to saner kernel_execve() semantics
        infrastructure for saner ret_from_kernel_thread semantics
        make sure that kernel_thread() callbacks call do_exit() themselves
        make sure that we always have a return path from kernel_execve()
        ppc: eeh_event should just use kthread_run()
        don't bother with kernel_thread/kernel_execve for launching linuxrc
        alpha: get rid of switch_stack argument of do_work_pending()
        alpha: don't bother passing switch_stack separately from regs
        alpha: take SIGPENDING/NOTIFY_RESUME loop into signal.c
        alpha: simplify TIF_NEED_RESCHED handling
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git:// · 8418263e
      Linus Torvalds authored
      Pull third pile of VFS updates from Al Viro:
       "Stuff from Jeff Layton, mostly.  Sanitizing interplay between audit
        and namei, removing a lot of insanity from audit_inode() mess and
        getting things ready for his ESTALE patchset."
      * 'for-linus' of git://
        procfs: don't need a PATH_MAX allocation to hold a string representation of an int
        vfs: embed struct filename inside of names_cache allocation if possible
        audit: make audit_inode take struct filename
        vfs: make path_openat take a struct filename pointer
        vfs: turn do_path_lookup into wrapper around struct filename variant
        audit: allow audit code to satisfy getname requests from its names_list
        vfs: define struct filename and have getname() return it
        vfs: unexport getname and putname symbols
        acct: constify the name arg to acct_on
        vfs: allocate page instead of names_cache buffer in mount_block_root
        audit: overhaul __audit_inode_child to accomodate retrying
        audit: optimize audit_compare_dname_path
        audit: make audit_compare_dname_path use parent_len helper
        audit: remove dirlen argument to audit_compare_dname_path
        audit: set the name_len in audit_inode for parent lookups
        audit: add a new "type" field to audit_names struct
        audit: reverse arguments to audit_inode_child
        audit: no need to walk list in audit_inode if name is NULL
        audit: pass in dentry to audit_copy_inode wherever possible
        audit: remove unnecessary NULL ptr checks from do_path_lookup
    • Jeff Layton's avatar
    • Jeff Layton's avatar
      vfs: embed struct filename inside of names_cache allocation if possible · 7950e385
      Jeff Layton authored
      In the common case where a name is much smaller than PATH_MAX, an extra
      allocation for struct filename is unnecessary. Before allocating a
      separate one, try to embed the struct filename inside the buffer first. If
      it turns out that that's not long enough, then fall back to allocating a
      separate struct filename and redoing the copy.
      Signed-off-by: default avatarJeff Layton <>
      Signed-off-by: default avatarAl Viro <>
    • Jeff Layton's avatar
      audit: make audit_inode take struct filename · adb5c247
      Jeff Layton authored
      Keep a pointer to the audit_names "slot" in struct filename.
      Have all of the audit_inode callers pass a struct filename ponter to
      audit_inode instead of a string pointer. If the aname field is already
      populated, then we can skip walking the list altogether and just use it
      Signed-off-by: default avatarJeff Layton <>
      Signed-off-by: default avatarAl Viro <>