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

Commit 74d89c16 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream'

parents 52a32205 05c8e0ac

CREDITS

+12 −8
Original line number Original line Diff line number Diff line
@@ -1127,8 +1127,10 @@ S: Carnegie, Pennsylvania 15106-4304 
S: USA

S: USA





N: Philip Gladstone

N: Philip Gladstone

E: philip@raptor.com

E: philip@gladstonefamily.net

D: Kernel / timekeeping stuff

D: Kernel / timekeeping stuff

S: Carlisle, MA 01741

S: USA

  

  

N: Jan-Benedict Glaw

N: Jan-Benedict Glaw

E: jbglaw@lug-owl.de

E: jbglaw@lug-owl.de
@@ -2007,13 +2009,14 @@ S: University of Stuttgart, Germany and 
S: Ecole Nationale Superieure des Telecommunications, Paris

S: Ecole Nationale Superieure des Telecommunications, Paris





N: Jamie Lokier

N: Jamie Lokier

E: jamie@imbolc.ucc.ie

E: jamie@shareable.org

W: http://www.shareable.org/

D: Reboot-through-BIOS for broken 486 motherboards

D: Reboot-through-BIOS for broken 486 motherboards

D: Some parport fixes

D: Parport fixes, futex improvements

S: 11 Goodson Walk

D: First instruction of x86 sysenter path :)

S: Marston

S: 51 Sunningwell Road

S: Oxford

S: Oxford

S: OX3 0HX

S: OX1 4SZ

S: United Kingdom

S: United Kingdom





N: Mark Lord

N: Mark Lord
@@ -3740,10 +3743,11 @@ D: Mylex DAC960 PCI RAID driver 
D: Miscellaneous kernel fixes

D: Miscellaneous kernel fixes





N: Alessandro Zummo

N: Alessandro Zummo

E: azummo@ita.flashnet.it

E: a.zummo@towertech.it

W: http://freepage.logicom.it/azummo/

D: CMI8330 support is sb_card.c

D: CMI8330 support is sb_card.c

D: ISAPnP fixes in sb_card.c

D: ISAPnP fixes in sb_card.c

D: ZyXEL omni.net lcd plus driver

D: RTC subsystem

S: Italy

S: Italy





N: Marc Zyngier

N: Marc Zyngier

Documentation/DMA-mapping.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -199,6 +199,8 @@ address during PCI bus mastering you might do something like: 
		       "mydev: 24-bit DMA addressing not available.\n");

		       "mydev: 24-bit DMA addressing not available.\n");

		goto ignore_this_device;

		goto ignore_this_device;

	}

	}

[Better use DMA_24BIT_MASK instead of 0x00ffffff.

See linux/include/dma-mapping.h for reference.]





When pci_set_dma_mask() is successful, and returns zero, the PCI layer

When pci_set_dma_mask() is successful, and returns zero, the PCI layer

saves away this mask you have provided.  The PCI layer will use this

saves away this mask you have provided.  The PCI layer will use this

Documentation/DocBook/Makefile

+7 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ PS_METHOD = $(prefer-db2x) 




###

###

# The targets that may be used.

# The targets that may be used.

.PHONY:	xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs

PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs





BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))

BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))

xmldocs: $(BOOKS)

xmldocs: $(BOOKS)
@@ -211,3 +211,9 @@ clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) 




#man put files in man subdir - traverse down

#man put files in man subdir - traverse down

subdir- := man/

subdir- := man/





# Declare the contents of the .PHONY variable as phony.  We keep that

# information in a variable se we can use it in if_changed and friends.



.PHONY: $(PHONY)

Documentation/RCU/whatisRCU.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -360,7 +360,7 @@ uses of RCU may be found in listRCU.txt, arrayRCU.txt, and NMI-RCU.txt. 
		struct foo *new_fp;

		struct foo *new_fp;

		struct foo *old_fp;

		struct foo *old_fp;





		new_fp = kmalloc(sizeof(*fp), GFP_KERNEL);

		new_fp = kmalloc(sizeof(*new_fp), GFP_KERNEL);

		spin_lock(&foo_mutex);

		spin_lock(&foo_mutex);

		old_fp = gbl_foo;

		old_fp = gbl_foo;

		*new_fp = *old_fp;

		*new_fp = *old_fp;
@@ -461,7 +461,7 @@ The foo_update_a() function might then be written as follows: 
		struct foo *new_fp;

		struct foo *new_fp;

		struct foo *old_fp;

		struct foo *old_fp;





		new_fp = kmalloc(sizeof(*fp), GFP_KERNEL);

		new_fp = kmalloc(sizeof(*new_fp), GFP_KERNEL);

		spin_lock(&foo_mutex);

		spin_lock(&foo_mutex);

		old_fp = gbl_foo;

		old_fp = gbl_foo;

		*new_fp = *old_fp;

		*new_fp = *old_fp;
@@ -605,7 +605,7 @@ are the same as those shown in the preceding section, so they are omitted. 
	{

	{

		int cpu;

		int cpu;





		for_each_cpu(cpu)

		for_each_possible_cpu(cpu)

			run_on(cpu);

			run_on(cpu);

	}

	}

Documentation/aoe/mkdevs.sh

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ rm -f $dir/discover 
mknod -m 0200 $dir/discover c $MAJOR 3

mknod -m 0200 $dir/discover c $MAJOR 3

rm -f $dir/interfaces

rm -f $dir/interfaces

mknod -m 0200 $dir/interfaces c $MAJOR 4

mknod -m 0200 $dir/interfaces c $MAJOR 4

rm -f $dir/revalidate

mknod -m 0200 $dir/revalidate c $MAJOR 5





export n_partitions

export n_partitions

mkshelf=`echo $0 | sed 's!mkdevs!mkshelf!'`

mkshelf=`echo $0 | sed 's!mkdevs!mkshelf!'`