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

Commit 835d39fc authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents 89bad589 ecd68853

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -1899,6 +1899,12 @@ M: James.Bottomley@HansenPartnership.com 
L:	linux-scsi@vger.kernel.org

S:	Maintained



NETEM NETWORK EMULATOR

P:	Stephen Hemminger

M:	shemminger@osdl.org

L:	netem@osdl.org

S:	Maintained



NETFILTER/IPTABLES/IPCHAINS

P:	Rusty Russell

P:	Marc Boucher

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 17

EXTRAVERSION =-rc4

NAME=Sliding Snow Leopard

EXTRAVERSION =-rc5

NAME=Lordi Rules



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"

arch/i386/kernel/syscall_table.S

+1 −0
Original line number Diff line number Diff line
@@ -315,3 +315,4 @@ ENTRY(sys_call_table) 
	.long sys_splice

	.long sys_sync_file_range

	.long sys_tee			/* 315 */

	.long sys_vmsplice

arch/powerpc/platforms/powermac/setup.c

+12 −0
Original line number Diff line number Diff line
@@ -463,11 +463,23 @@ static int pmac_pm_finish(suspend_state_t state) 
	return 0;

}



static int pmac_pm_valid(suspend_state_t state)

{

	switch (state) {

	case PM_SUSPEND_DISK:

		return 1;

	/* can't do any other states via generic mechanism yet */

	default:

		return 0;

	}

}



static struct pm_ops pmac_pm_ops = {

	.pm_disk_mode	= PM_DISK_SHUTDOWN,

	.prepare	= pmac_pm_prepare,

	.enter		= pmac_pm_enter,

	.finish		= pmac_pm_finish,

	.valid		= pmac_pm_valid,

};



#endif /* CONFIG_SOFTWARE_SUSPEND */

arch/s390/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static inline void stop_hz_timer(void) 
	next = next_timer_interrupt();

	do {

		seq = read_seqbegin_irqsave(&xtime_lock, flags);

		timer = (__u64 next) - (__u64 jiffies) + jiffies_64;

		timer = ((__u64) next) - ((__u64) jiffies) + jiffies_64;

	} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));

	todval = -1ULL;

	/* Be careful about overflows. */