1. 15 7月, 2008 40 次提交
    • E
      IB/mlx4: Pass congestion management class MADs to the HCA · 6578cf33
      Eli Cohen 提交于
      ConnectX HCAs support the IB_MGMT_CLASS_CONG_MGMT management class, so
      process MADs of this class through the MAD_IFC firmware command.
      Signed-off-by: NEli Cohen <eli@mellanox.co.il>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      6578cf33
    • E
      IB/mlx4: Configure QPs' max message size based on real device capability · d1f2cd89
      Eli Cohen 提交于
      ConnectX returns the max message size it supports through the
      QUERY_DEV_CAP firmware command.  When modifying a QP to RTR, the max
      message size for the QP must be specified.  This value must not exceed
      the value declared through QUERY_DEV_CAP.  The current code ignores
      the max allowed size and unconditionally sets the value to 2^31.  This
      patch sets all QPs to the max value allowed as returned from firmware.
      Signed-off-by: NEli Cohen <eli@mellanox.co.il>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      d1f2cd89
    • S
      RDMA/cxgb3: MEM_MGT_EXTENSIONS support · e7e55829
      Steve Wise 提交于
      - set IB_DEVICE_MEM_MGT_EXTENSIONS capability bit if fw supports it.
      - set max_fast_reg_page_list_len device attribute.
      - add iwch_alloc_fast_reg_mr function.
      - add iwch_alloc_fastreg_pbl
      - add iwch_free_fastreg_pbl
      - adjust the WQ depth for kernel mode work queues to account for
        fastreg possibly taking 2 WR slots.
      - add fastreg_mr work request support.
      - add local_inv work request support.
      - add send_with_inv and send_with_se_inv work request support.
      - removed useless duplicate enums/defines for TPT/MW/MR stuff.
      Signed-off-by: NSteve Wise <swise@opengridcomputing.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      e7e55829
    • S
      RDMA/core: Add memory management extensions support · 00f7ec36
      Steve Wise 提交于
      This patch adds support for the IB "base memory management extension"
      (BMME) and the equivalent iWARP operations (which the iWARP verbs
      mandates all devices must implement).  The new operations are:
      
       - Allocate an ib_mr for use in fast register work requests.
      
       - Allocate/free a physical buffer lists for use in fast register work
         requests.  This allows device drivers to allocate this memory as
         needed for use in posting send requests (eg via dma_alloc_coherent).
      
       - New send queue work requests:
         * send with remote invalidate
         * fast register memory region
         * local invalidate memory region
         * RDMA read with invalidate local memory region (iWARP only)
      
      Consumer interface details:
      
       - A new device capability flag IB_DEVICE_MEM_MGT_EXTENSIONS is added
         to indicate device support for these features.
      
       - New send work request opcodes IB_WR_FAST_REG_MR, IB_WR_LOCAL_INV,
         IB_WR_RDMA_READ_WITH_INV are added.
      
       - A new consumer API function, ib_alloc_mr() is added to allocate
         fast register memory regions.
      
       - New consumer API functions, ib_alloc_fast_reg_page_list() and
         ib_free_fast_reg_page_list() are added to allocate and free
         device-specific memory for fast registration page lists.
      
       - A new consumer API function, ib_update_fast_reg_key(), is added to
         allow the key portion of the R_Key and L_Key of a fast registration
         MR to be updated.  Consumers call this if desired before posting
         a IB_WR_FAST_REG_MR work request.
      
      Consumers can use this as follows:
      
       - MR is allocated with ib_alloc_mr().
      
       - Page list memory is allocated with ib_alloc_fast_reg_page_list().
      
       - MR R_Key/L_Key "key" field is updated with ib_update_fast_reg_key().
      
       - MR made VALID and bound to a specific page list via
         ib_post_send(IB_WR_FAST_REG_MR)
      
       - MR made INVALID via ib_post_send(IB_WR_LOCAL_INV),
         ib_post_send(IB_WR_RDMA_READ_WITH_INV) or an incoming send with
         invalidate operation.
      
       - MR is deallocated with ib_dereg_mr()
      
       - page lists dealloced via ib_free_fast_reg_page_list().
      
      Applications can allocate a fast register MR once, and then can
      repeatedly bind the MR to different physical block lists (PBLs) via
      posting work requests to a send queue (SQ).  For each outstanding
      MR-to-PBL binding in the SQ pipe, a fast_reg_page_list needs to be
      allocated (the fast_reg_page_list is owned by the low-level driver
      from the consumer posting a work request until the request completes).
      Thus pipelining can be achieved while still allowing device-specific
      page_list processing.
      
      The 32-bit fast register memory key/STag is composed of a 24-bit index
      and an 8-bit key.  The application can change the key each time it
      fast registers thus allowing more control over the peer's use of the
      key/STag (ie it can effectively be changed each time the rkey is
      rebound to a page list).
      Signed-off-by: NSteve Wise <swise@opengridcomputing.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      00f7ec36
    • E
      IPoIB: Copy small received SKBs in connected mode · f89271da
      Eli Cohen 提交于
      The connected mode implementation in the IPoIB driver has a large
      overhead in the way SKBs are handled in the receive flow.  It usually
      allocates an SKB with as big as was used in the currently received SKB
      and moves unused fragments from the old SKB to the new one. This
      involves a loop on all the remaining fragments and incurs overhead on
      the CPU.  This patch, for small SKBs, allocates an SKB just large
      enough to contain the received data and copies to it the data from the
      received SKB.  The newly allocated SKB is passed to the stack and the
      old SKB is reposted.
      
      When running netperf, UDP small messages, without this pach I get:
      
          UDP UNIDIRECTIONAL SEND TEST from 0.0.0.0 (0.0.0.0) port 0 AF_INET to
          14.4.3.178 (14.4.3.178) port 0 AF_INET
          Socket  Message  Elapsed      Messages
          Size    Size     Time         Okay Errors   Throughput
          bytes   bytes    secs            #      #   10^6bits/sec
      
          114688     128   10.00     5142034      0     526.31
          114688           10.00     1130489            115.71
      
      With this patch I get both send and receive at ~315 mbps.
      
      The reason that send performance actually slows down is as follows:
      When using this patch, the overhead of the CPU for handling RX packets
      is dramatically reduced.  As a result, we do not experience RNR NAK
      messages from the receiver which cause the connection to be closed and
      reopened again; when the patch is not used, the receiver cannot handle
      the packets fast enough so there is less time to post new buffers and
      hence the mentioned RNR NACKs.  So what happens is that the
      application *thinks* it posted a certain number of packets for
      transmission but these packets are flushed and do not really get
      transmitted.  Since the connection gets opened and closed many times,
      each time netperf gets the CPU time that otherwise would have been
      given to IPoIB to actually transmit the packets.  This can be verified
      when looking at the port counters -- the output of ifconfig and the
      oputput of netperf (this is for the case without the patch):
      
          tx packets
          ==========
          port counter:   1,543,996
          ifconfig:       1,581,426
          netperf:        5,142,034
      
          rx packets
          ==========
          netperf         1,1304,089
      Signed-off-by: NEli Cohen <eli@mellanox.co.il>
      f89271da
    • R
      RDMA: Remove subversion $Id tags · f3781d2e
      Roland Dreier 提交于
      They don't get updated by git and so they're worse than useless.
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      f3781d2e
    • D
      RDMA: Improve include file coding style · 4deccd6d
      Dotan Barak 提交于
      Remove subversion $Id lines and improve readability by fixing other
      coding style problems pointed out by checkpatch.pl.
      Signed-off-by: NDotan Barak <dotanba@gmail.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      4deccd6d
    • R
      fd91b1bf
    • E
      IB/mlx4: Optimize QP stamping · 9670e553
      Eli Cohen 提交于
      The idea is that for QPs with fixed size work requests (eg selective
      signaling QPs), before stamping the WQE, we read the value of the DS
      field, which gives the effective size of the descriptor as used in the
      previous post.  Then we stamp only that area, since the rest of the
      descriptor is already stamped.
      
      When initializing the send queue buffer, make sure the DS field is
      initialized to the max descriptor size so that the subsequent stamping
      will be done on the entire descriptor area.
      Signed-off-by: NEli Cohen <eli@mellanox.co.il>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      9670e553
    • M
      IB/sa: Fail requests made while creating new SM AH · 164ba089
      Moni Shoua 提交于
      This patch solves a race that occurs after an event occurs that causes
      the SA query module to flush its SM address handle (AH).  When SM AH
      becomes invalid and needs an update it is handled by the global
      workqueue.  On the other hand this event is also handled in the IPoIB
      driver by queuing work in the ipoib_workqueue that does multicast
      joins.  Although queuing is in the right order, it is done to 2
      different workqueues and so there is no guarantee that the first to be
      queued is the first to be executed.
      
      This causes a problem because IPoIB may end up sending an request to
      the old SM, which will take a long time to time out (since the old SM
      is gone); this leads to a much longer than necessary interruption in
      multicast traffer.
      
      The patch sets the SA query module's SM AH to NULL when the event
      occurs, and until update_sm_ah() is done, any request that needs sm_ah
      fails with -EAGAIN return status.
      
      For consumers, the patch doesn't make things worse.  Before the patch,
      MADs are sent to the wrong SM so the request gets lost.  Consumers can
      be improved if they examine the return code and respond to EAGAIN
      properly but even without an improvement the situation is not getting
      worse.
      Signed-off-by: NMoni Levy <monil@voltaire.com>
      Signed-off-by: NMoni Shoua <monis@voltaire.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      164ba089
    • S
      RDMA: Fix license text · a9474917
      Sean Hefty 提交于
      The license text for several files references a third software license
      that was inadvertently copied in.  Update the license to what was
      intended.  This update was based on a request from HP.
      Signed-off-by: NSean Hefty <sean.hefty@intel.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      a9474917
    • C
      RDMA/nes: Remove unnecessary memset() · 929555a2
      Christophe Jaillet 提交于
      Remove an explicit memset(..., 0, ...) of a 'listener' structure
      allocated with kzalloc().
      Signed-off-by: NChristophe Jaillet <christophe.jaillet@wanadoo.fr>
      Acked-by: NFaisal Latif <faisal@neteffect.com>
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      929555a2
    • R
      IB/srp: Remove use of cached P_Key/GID queries · 969a60f9
      Roland Dreier 提交于
      The SRP initiator is currently using ib_find_cached_pkey() and
      ib_get_cached_gid() in situations where the uncached ib_find_pkey()
      and ib_query_gid() functions serve just as well: sleeping is allowed
      and performance is not an issue.  Since we want to eliminate the
      cached operations in the long term, convert SRP to use the uncached
      variants.
      Signed-off-by: NRoland Dreier <rolandd@cisco.com>
      969a60f9
    • D
      firmware: Correct dependency on CONFIG_EXTRA_FIRMWARE_DIR · 50515af2
      David Woodhouse 提交于
      When CONFIG_EXTRA_FIRMWARE_DIR gets changed, the filename in the .S file
      (which uses .incbin to include the binary) needs to change. When we
      renamed the BUILTIN_FIRMWARE_DIR option to EXTRA_FIRMWARE_DIR, we forgot
      to update the manual dependency in firmware/Makefile, so it was
      depending on a non-existent file in include/config/
      Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      50515af2
    • L
      Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6 · 5a861022
      Linus Torvalds 提交于
      * 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
        firmware: convert sb16_csp driver to use firmware loader exclusively
        dsp56k: use request_firmware
        edgeport-ti: use request_firmware()
        edgeport: use request_firmware()
        vicam: use request_firmware()
        dabusb: use request_firmware()
        cpia2: use request_firmware()
        ip2: use request_firmware()
        firmware: convert Ambassador ATM driver to request_firmware()
        whiteheat: use request_firmware()
        ti_usb_3410_5052: use request_firmware()
        emi62: use request_firmware()
        emi26: use request_firmware()
        keyspan_pda: use request_firmware()
        keyspan: use request_firmware()
        ttusb-budget: use request_firmware()
        kaweth: use request_firmware()
        smctr: use request_firmware()
        firmware: convert ymfpci driver to use firmware loader exclusively
        firmware: convert maestro3 driver to use firmware loader exclusively
        ...
      
      Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and
      drivers/char/ip2/ip2main.c manually.
      5a861022
    • L
      Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · 85082fd7
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (241 commits)
        [ARM] 5171/1: ep93xx: fix compilation of modules using clocks
        [ARM] 5133/2: at91sam9g20 defconfig file
        [ARM] 5130/4: Support for the at91sam9g20
        [ARM] 5160/1: IOP3XX: gpio/gpiolib support
        [ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.
        [ARM] 5084/1: zylonite: Register AC97 device
        [ARM] 5085/2: PXA: Move AC97 over to the new central device declaration model
        [ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers
        [ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting
        [ARM] 5145/1: PXA2xx: provide api to control IrDA pins state
        [ARM] 5144/1: pxaficp_ir: cleanup includes
        [ARM] pxa: remove pxa_set_cken()
        [ARM] pxa: allow clk aliases
        [ARM] Feroceon: don't disable BPU on boot
        [ARM] Orion: LED support for HP mv2120
        [ARM] Orion: add RD88F5181L-FXO support
        [ARM] Orion: add RD88F5181L-GE support
        [ARM] Orion: add Netgear WNR854T support
        [ARM] s3c2410_defconfig: update for current build
        [ARM] Acer n30: Minor style and indentation fixes.
        ...
      85082fd7
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git · 751851af
      David Woodhouse 提交于
      Conflicts:
      
      	sound/pci/Kconfig
      751851af
    • R
      [ARM] Merge most of the PXA work for initial merge · 53ffe3b4
      Russell King 提交于
      This includes PXA work up to the SPI changes for the initial merge,
      since e172274c depends on the SPI
      tree being merged.
      
      Conflicts:
      
      	arch/arm/configs/em_x270_defconfig
      	arch/arm/configs/xm_x270_defconfig
      53ffe3b4
    • L
      Merge branch 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 666484f0
      Linus Torvalds 提交于
      * 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        softirq: remove irqs_disabled warning from local_bh_enable
        softirq: remove initialization of static per-cpu variable
        Remove argument from open_softirq which is always NULL
      666484f0
    • L
    • L
      Merge branch 'core/printk' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 4bb0057f
      Linus Torvalds 提交于
      * 'core/printk' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, generic: mark early_printk as asmlinkage
        printk: export console_drivers
        printk: remember the message level for multi-line output
        printk: refactor processing of line severity tokens
        printk: don't prefer unsuited consoles on registration
        printk: clean up recursion check related static variables
        namespacecheck: more kernel/printk.c fixes
        namespacecheck: fix kernel printk.c
      4bb0057f
    • L
      x86: MMIOTRACE should not default to on · 116a9fb3
      Linus Torvalds 提交于
      Even the help-text makes it clear that normal people shouldn't enable
      it.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      116a9fb3
    • L
      Merge branch 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 40e7babb
      Linus Torvalds 提交于
      * 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        lockdep: fix kernel/fork.c warning
        lockdep: fix ftrace irq tracing false positive
        lockdep: remove duplicate definition of STATIC_LOCKDEP_MAP_INIT
        lockdep: add lock_class information to lock_chain and output it
        lockdep: add lock_class information to lock_chain and output it
        lockdep: output lock_class key instead of address for forward dependency output
        __mutex_lock_common: use signal_pending_state()
        mutex-debug: check mutex magic before owner
      
      Fixed up conflict in kernel/fork.c manually
      40e7babb
    • L
      Merge branch 'sched/new-API-sched_setscheduler' of... · 948769a5
      Linus Torvalds 提交于
      Merge branch 'sched/new-API-sched_setscheduler' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched/new-API-sched_setscheduler' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: add new API sched_setscheduler_nocheck: add a flag to control access checks
      948769a5
    • L
      Merge branch 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · e18425a0
      Linus Torvalds 提交于
      * 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (228 commits)
        ftrace: build fix for ftraced_suspend
        ftrace: separate out the function enabled variable
        ftrace: add ftrace_kill_atomic
        ftrace: use current CPU for function startup
        ftrace: start wakeup tracing after setting function tracer
        ftrace: check proper config for preempt type
        ftrace: trace schedule
        ftrace: define function trace nop
        ftrace: move sched_switch enable after markers
        ftrace: prevent ftrace modifications while being kprobe'd, v2
        fix "ftrace: store mcount address in rec->ip"
        mmiotrace broken in linux-next (8-bit writes only)
        ftrace: avoid modifying kprobe'd records
        ftrace: freeze kprobe'd records
        kprobes: enable clean usage of get_kprobe
        ftrace: store mcount address in rec->ip
        ftrace: build fix with gcc 4.3
        namespacecheck: fixes
        ftrace: fix "notrace" filtering priority
        ftrace: fix printout
        ...
      e18425a0
    • L
      Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6 · d1794f2c
      Linus Torvalds 提交于
      * 'bkl-removal' of git://git.lwn.net/linux-2.6: (146 commits)
        IB/umad: BKL is not needed for ib_umad_open()
        IB/uverbs: BKL is not needed for ib_uverbs_open()
        bf561-coreb: BKL unneeded for open()
        Call fasync() functions without the BKL
        snd/PCM: fasync BKL pushdown
        ipmi: fasync BKL pushdown
        ecryptfs: fasync BKL pushdown
        Bluetooth VHCI: fasync BKL pushdown
        tty_io: fasync BKL pushdown
        tun: fasync BKL pushdown
        i2o: fasync BKL pushdown
        mpt: fasync BKL pushdown
        Remove BKL from remote_llseek v2
        Make FAT users happier by not deadlocking
        x86-mce: BKL pushdown
        vmwatchdog: BKL pushdown
        vmcp: BKL pushdown
        via-pmu: BKL pushdown
        uml-random: BKL pushdown
        uml-mmapper: BKL pushdown
        ...
      d1794f2c
    • J
    • J
      7f127d5e
    • J
      edgeport-ti: use request_firmware() · d12b219a
      Jaswinder Singh 提交于
      Firmware blob looks like this...
              uint8_t  MajorVersion
              uint8_t  MinorVersion
              __le16   BuildNumber
              uint8_t  data[]
      Signed-off-by: NJaswinder Singh <jaswinder@infradead.org>
      Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
      d12b219a
    • J
      edgeport: use request_firmware() · 5b9ea932
      Jaswinder Singh 提交于
      Version number provided in first HEX record.
      Signed-off-by: NJaswinder Singh <jaswinder@infradead.org>
      Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
      5b9ea932
    • J
      vicam: use request_firmware() · fb54be87
      Jaswinder Singh 提交于
      Although it wasn't actually using ihex records before, we use the Intel
      HEX record format for this firmware -- because that gives us a simple
      way to split it into separate chunks internally as we need, without
      loading each part as a separate file.
      Signed-off-by: NJaswinder Singh <jaswinder@infradead.org>
      Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
      fb54be87
    • D
      dabusb: use request_firmware() · c4667746
      David Woodhouse 提交于
      Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
      c4667746
    • D
      cpia2: use request_firmware() · 04a33e40
      David Woodhouse 提交于
      Thanks for Jaswinder Singh for converting the firmware blob itself to ihex.
      Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>
      04a33e40
    • J
      Merge commit 'v2.6.26' into bkl-removal · 2fceef39
      Jonathan Corbet 提交于
      2fceef39
    • S
      ftrace: document updates · a41eebab
      Steven Rostedt 提交于
      The following updates were recommended by Elias Oltmanns and Randy Dunlap.
      
      [ updates based on Andrew Morton's comments are still to come. ]
      Signed-off-by: NSteven Rostedt <srostedt@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a41eebab
    • L
      Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 17489c05
      Linus Torvalds 提交于
      * 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (76 commits)
        sched_clock: and multiplier for TSC to gtod drift
        sched_clock: record TSC after gtod
        sched_clock: only update deltas with local reads.
        sched_clock: fix calculation of other CPU
        sched_clock: stop maximum check on NO HZ
        sched_clock: widen the max and min time
        sched_clock: record from last tick
        sched: fix accounting in task delay accounting & migration
        sched: add avg-overlap support to RT tasks
        sched: terminate newidle balancing once at least one task has moved over
        sched: fix warning
        sched: build fix
        sched: sched_clock_cpu() based cpu_clock(), lockdep fix
        sched: export cpu_clock
        sched: make sched_{rt,fair}.c ifdefs more readable
        sched: bias effective_load() error towards failing wake_affine().
        sched: incremental effective_load()
        sched: correct wakeup weight calculations
        sched: fix mult overflow
        sched: update shares on wakeup
        ...
      17489c05
    • L
      Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · a3da5bf8
      Linus Torvalds 提交于
      * 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (821 commits)
        x86: make 64bit hpet_set_mapping to use ioremap too, v2
        x86: get x86_phys_bits early
        x86: max_low_pfn_mapped fix #4
        x86: change _node_to_cpumask_ptr to return const ptr
        x86: I/O APIC: remove an IRQ2-mask hack
        x86: fix numaq_tsc_disable calling
        x86, e820: remove end_user_pfn
        x86: max_low_pfn_mapped fix, #3
        x86: max_low_pfn_mapped fix, #2
        x86: max_low_pfn_mapped fix, #1
        x86_64: fix delayed signals
        x86: remove conflicting nx6325 and nx6125 quirks
        x86: Recover timer_ack lost in the merge of the NMI watchdog
        x86: I/O APIC: Never configure IRQ2
        x86: L-APIC: Always fully configure IRQ0
        x86: L-APIC: Set IRQ0 as edge-triggered
        x86: merge dwarf2 headers
        x86: use AS_CFI instead of UNWIND_INFO
        x86: use ignore macro instead of hash comment
        x86: use matching CFI_ENDPROC
        ...
      a3da5bf8
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 3b23e665
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (50 commits)
        crypto: ixp4xx - Select CRYPTO_AUTHENC
        crypto: s390 - Respect STFL bit
        crypto: talitos - Add support for sha256 and md5 variants
        crypto: hash - Move ahash functions into crypto/hash.h
        crypto: crc32c - Add ahash implementation
        crypto: hash - Added scatter list walking helper
        crypto: prng - Deterministic CPRNG
        crypto: hash - Removed vestigial ahash fields
        crypto: hash - Fixed digest size check
        crypto: rmd - sparse annotations
        crypto: rmd128 - sparse annotations
        crypto: camellia - Use kernel-provided bitops, unaligned access helpers
        crypto: talitos - Use proper form for algorithm driver names
        crypto: talitos - Add support for 3des
        crypto: padlock - Make module loading quieter when hardware isn't available
        crypto: tcrpyt - Remove unnecessary kmap/kunmap calls
        crypto: ixp4xx - Hardware crypto support for IXP4xx CPUs
        crypto: talitos - Freescale integrated security engine (SEC) driver
        [CRYPTO] tcrypt: Add self test for des3_ebe cipher operating in cbc mode
        [CRYPTO] rmd: Use pointer form of endian swapping operations
        ...
      3b23e665
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · 6c118e43
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: (31 commits)
        avr32: Fix typo of IFSR in a comment in the PIO header file
        avr32: Power Management support ("standby" and "mem" modes)
        avr32: Add system device for the internal interrupt controller (intc)
        avr32: Add simple SRAM allocator
        avr32: Enable SDRAMC clock at startup
        rtc-at32ap700x: Enable wakeup
        macb: Basic suspend/resume support
        atmel_serial: Drain console TX shifter before suspending
        atmel_serial: Fix build on avr32 with CONFIG_PM enabled
        avr32: Use a quicklist for PTE allocation as well
        avr32: Use a quicklist for PGD allocation
        avr32: Cover the kernel page tables in the user PGDs
        avr32: Store virtual addresses in the PGD
        avr32: Remove useless zeroing of swapper_pg_dir at startup
        avr32: Clean up and optimize the TLB operations
        avr32: Rename at32ap.c -> pdc.c
        avr32: Move setup_platform() into chip-specific file
        avr32: Kill special exception handler sections
        avr32: Kill unneeded #include <asm/pgalloc.h> from asm/mmu_context.h
        avr32: Clean up time.c #includes
        ...
      6c118e43
    • L
      Merge branch 'for-linus' of... · 847106ff
      Linus Torvalds 提交于
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (25 commits)
        security: remove register_security hook
        security: remove dummy module fix
        security: remove dummy module
        security: remove unused sb_get_mnt_opts hook
        LSM/SELinux: show LSM mount options in /proc/mounts
        SELinux: allow fstype unknown to policy to use xattrs if present
        security: fix return of void-valued expressions
        SELinux: use do_each_thread as a proper do/while block
        SELinux: remove unused and shadowed addrlen variable
        SELinux: more user friendly unknown handling printk
        selinux: change handling of invalid classes (Was: Re: 2.6.26-rc5-mm1 selinux whine)
        SELinux: drop load_mutex in security_load_policy
        SELinux: fix off by 1 reference of class_to_string in context_struct_compute_av
        SELinux: open code sidtab lock
        SELinux: open code load_mutex
        SELinux: open code policy_rwlock
        selinux: fix endianness bug in network node address handling
        selinux: simplify ioctl checking
        SELinux: enable processes with mac_admin to get the raw inode contexts
        Security: split proc ptrace checking into read vs. attach
        ...
      847106ff