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

Commit 9cfc8624 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' 

* akpm: (173 commits)
  genalloc: use bitmap_find_next_zero_area
  ia64: use bitmap_find_next_zero_area
  sparc: use bitmap_find_next_zero_area
  mlx4: use bitmap_find_next_zero_area
  isp1362-hcd: use bitmap_find_next_zero_area
  iommu-helper: use bitmap library
  bitmap: introduce bitmap_set, bitmap_clear, bitmap_find_next_zero_area
  qnx4: use hweight8
  qnx4fs: remove remains of the (defunct) write support
  resource: constify arg to resource_size() and resource_type()
  gru: send cross partition interrupts using the gru
  gru: function to generate chipset IPI values
  gru: update driver version number
  gru: improve GRU TLB dropin statistics
  gru: fix GRU interrupt race at deallocate
  gru: add hugepage support
  gru: fix bug in allocation of kernel contexts
  gru: update GRU structures to match latest hardware spec
  gru: check for correct GRU chiplet assignment
  gru: remove stray local_irq_enable
  ...
parents f42647ac 243797f5

Documentation/DocBook/Makefile

+3 −14
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    procfs-guide.xml writing_usb_driver.xml networking.xml \

	    writing_usb_driver.xml networking.xml \

	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
@@ -65,7 +65,7 @@ KERNELDOC = $(srctree)/scripts/kernel-doc 
DOCPROC   = $(objtree)/scripts/basic/docproc



XMLTOFLAGS = -m $(srctree)/Documentation/DocBook/stylesheet.xsl

#XMLTOFLAGS += --skip-validation

XMLTOFLAGS += --skip-validation



###

# DOCPROC is used for two purposes:
@@ -101,17 +101,6 @@ endif 
# Changes in kernel-doc force a rebuild of all documentation

$(BOOKS): $(KERNELDOC)



###

# procfs guide uses a .c file as example code.

# This requires an explicit dependency

C-procfs-example = procfs_example.xml

C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))

$(obj)/procfs-guide.xml: $(C-procfs-example2)



# List of programs to build

##oops, this is a kernel module::hostprogs-y := procfs_example

obj-m += procfs_example.o



# Tell kbuild to always build the programs

always := $(hostprogs-y)
@@ -238,7 +227,7 @@ clean-files := $(DOCBOOKS) \ 
	$(patsubst %.xml, %.pdf,  $(DOCBOOKS)) \

	$(patsubst %.xml, %.html, $(DOCBOOKS)) \

	$(patsubst %.xml, %.9,    $(DOCBOOKS)) \

	$(C-procfs-example) $(index)

	$(index)



clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man

Documentation/DocBook/procfs-guide.tmpl

deleted100644 → 0
+0 −626

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/DocBook/procfs_example.c

deleted100644 → 0
+0 −201

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/SubmitChecklist

+4 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ kernel patches. 
2: Passes allnoconfig, allmodconfig



3: Builds on multiple CPU architectures by using local cross-compile tools

   or something like PLM at OSDL.

   or some other build farm.



4: ppc64 is a good architecture for cross-compilation checking because it

   tends to use `unsigned long' for 64-bit quantities.
@@ -88,3 +88,6 @@ kernel patches. 


24: All memory barriers {e.g., barrier(), rmb(), wmb()} need a comment in the

    source code that explains the logic of what they are doing and why.



25: If any ioctl's are added by the patch, then also update

    Documentation/ioctl/ioctl-number.txt.

Documentation/fb/viafb.txt

+1 −11
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    VIA UniChrome Family(CLE266, PM800 / CN400 / CN300,

                        P4M800CE / P4M800Pro / CN700 / VN800,

                        CX700 / VX700, K8M890, P4M890,

                        CN896 / P4M900, VX800)

                        CN896 / P4M900, VX800, VX855)



[Driver features]

------------------------
@@ -154,13 +154,6 @@ 
        0 : No Dual Edge Panel (default)

        1 : Dual Edge Panel



    viafb_video_dev:

        This option is used to specify video output devices(CRT, DVI, LCD) for

        duoview case.

        For example:

        To output video on DVI, we should use:

            modprobe viafb viafb_video_dev=DVI...



    viafb_lcd_port:

        This option is used to specify LCD output port,

        available values are "DVP0" "DVP1" "DFP_HIGHLOW" "DFP_HIGH" "DFP_LOW".
@@ -181,9 +174,6 @@ Notes: 
       and bpp, need to call VIAFB specified ioctl interface VIAFB_SET_DEVICE

       instead of calling common ioctl function FBIOPUT_VSCREENINFO since

       viafb doesn't support multi-head well, or it will cause screen crush.

    4. VX800 2D accelerator hasn't been supported in this driver yet. When

       using driver on VX800, the driver will disable the acceleration

       function as default.





[Configure viafb with "fbset" tool]