Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 365d46dc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/xen 

Conflicts:
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/process_64.c
	arch/x86/xen/enlighten.c
parents 5dc64a34 fd048088

Documentation/00-INDEX

+0 −2
Original line number Original line Diff line number Diff line
@@ -251,8 +251,6 @@ mono.txt 
	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.

	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.

moxa-smartio

moxa-smartio

	- file with info on installing/using Moxa multiport serial driver.

	- file with info on installing/using Moxa multiport serial driver.

mtrr.txt

	- how to use PPro Memory Type Range Registers to increase performance.

mutex-design.txt

mutex-design.txt

	- info on the generic mutex subsystem.

	- info on the generic mutex subsystem.

namespaces/

namespaces/

Documentation/DMA-API.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -337,7 +337,7 @@ With scatterlists, you use the resulting mapping like this: 
	int i, count = dma_map_sg(dev, sglist, nents, direction);

	int i, count = dma_map_sg(dev, sglist, nents, direction);

	struct scatterlist *sg;

	struct scatterlist *sg;





	for (i = 0, sg = sglist; i < count; i++, sg++) {

	for_each_sg(sglist, sg, count, i) {

		hw_address[i] = sg_dma_address(sg);

		hw_address[i] = sg_dma_address(sg);

		hw_len[i] = sg_dma_len(sg);

		hw_len[i] = sg_dma_len(sg);

	}

	}

Documentation/DMA-mapping.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -740,7 +740,7 @@ failure can be determined by: 
	dma_addr_t dma_handle;

	dma_addr_t dma_handle;





	dma_handle = pci_map_single(pdev, addr, size, direction);

	dma_handle = pci_map_single(pdev, addr, size, direction);

	if (pci_dma_mapping_error(dma_handle)) {

	if (pci_dma_mapping_error(pdev, dma_handle)) {

		/*

		/*

		 * reduce current DMA mapping usage,

		 * reduce current DMA mapping usage,

		 * delay and try again later or

		 * delay and try again later or

Documentation/DocBook/kernel-api.tmpl

+5 −0
Original line number Original line Diff line number Diff line
@@ -283,6 +283,7 @@ X!Earch/x86/kernel/mca_32.c 
  <chapter id="security">

  <chapter id="security">

     <title>Security Framework</title>

     <title>Security Framework</title>

!Isecurity/security.c

!Isecurity/security.c

!Esecurity/inode.c

  </chapter>

  </chapter>





  <chapter id="audit">

  <chapter id="audit">
@@ -364,6 +365,10 @@ X!Edrivers/pnp/system.c 
!Eblock/blk-barrier.c

!Eblock/blk-barrier.c

!Eblock/blk-tag.c

!Eblock/blk-tag.c

!Iblock/blk-tag.c

!Iblock/blk-tag.c

!Eblock/blk-integrity.c

!Iblock/blktrace.c

!Iblock/genhd.c

!Eblock/genhd.c

  </chapter>

  </chapter>





  <chapter id="chrdev">

  <chapter id="chrdev">

Documentation/DocBook/mac80211.tmpl

+4 −8
Original line number Original line Diff line number Diff line
@@ -145,7 +145,6 @@ usage should require reading the full document. 
        this though and the recommendation to allow only a single

        this though and the recommendation to allow only a single

        interface in STA mode at first!

        interface in STA mode at first!

      </para>

      </para>

!Finclude/net/mac80211.h ieee80211_if_types

!Finclude/net/mac80211.h ieee80211_if_init_conf

!Finclude/net/mac80211.h ieee80211_if_init_conf

!Finclude/net/mac80211.h ieee80211_if_conf

!Finclude/net/mac80211.h ieee80211_if_conf

    </chapter>

    </chapter>
@@ -177,8 +176,7 @@ usage should require reading the full document. 
        <title>functions/definitions</title>

        <title>functions/definitions</title>

!Finclude/net/mac80211.h ieee80211_rx_status

!Finclude/net/mac80211.h ieee80211_rx_status

!Finclude/net/mac80211.h mac80211_rx_flags

!Finclude/net/mac80211.h mac80211_rx_flags

!Finclude/net/mac80211.h ieee80211_tx_control

!Finclude/net/mac80211.h ieee80211_tx_info

!Finclude/net/mac80211.h ieee80211_tx_status_flags

!Finclude/net/mac80211.h ieee80211_rx

!Finclude/net/mac80211.h ieee80211_rx

!Finclude/net/mac80211.h ieee80211_rx_irqsafe

!Finclude/net/mac80211.h ieee80211_rx_irqsafe

!Finclude/net/mac80211.h ieee80211_tx_status

!Finclude/net/mac80211.h ieee80211_tx_status
@@ -189,12 +187,11 @@ usage should require reading the full document. 
!Finclude/net/mac80211.h ieee80211_ctstoself_duration

!Finclude/net/mac80211.h ieee80211_ctstoself_duration

!Finclude/net/mac80211.h ieee80211_generic_frame_duration

!Finclude/net/mac80211.h ieee80211_generic_frame_duration

!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb

!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb

!Finclude/net/mac80211.h ieee80211_get_hdrlen

!Finclude/net/mac80211.h ieee80211_hdrlen

!Finclude/net/mac80211.h ieee80211_wake_queue

!Finclude/net/mac80211.h ieee80211_wake_queue

!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_start_queues

!Finclude/net/mac80211.h ieee80211_stop_queues

!Finclude/net/mac80211.h ieee80211_wake_queues

!Finclude/net/mac80211.h ieee80211_wake_queues

!Finclude/net/mac80211.h ieee80211_stop_queues

      </sect1>

      </sect1>

    </chapter>

    </chapter>
@@ -230,8 +227,7 @@ usage should require reading the full document. 
      <title>Multiple queues and QoS support</title>

      <title>Multiple queues and QoS support</title>

      <para>TBD</para>

      <para>TBD</para>

!Finclude/net/mac80211.h ieee80211_tx_queue_params

!Finclude/net/mac80211.h ieee80211_tx_queue_params

!Finclude/net/mac80211.h ieee80211_tx_queue_stats_data

!Finclude/net/mac80211.h ieee80211_tx_queue_stats

!Finclude/net/mac80211.h ieee80211_tx_queue

    </chapter>

    </chapter>





    <chapter id="AP">

    <chapter id="AP">