Skip to content

Commit 52b9aca

Browse files
davem330davem330
committed
Merge branch 'master' of ../netdev/
2 parents 7756332 + e2faeec commit 52b9aca

File tree

241 files changed

+1881
-1133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+1881
-1133
lines changed

‎Documentation/power/runtime_pm.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,7 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h:
431431

432432
void pm_runtime_irq_safe(struct device *dev);
433433
- set the power.irq_safe flag for the device, causing the runtime-PM
434-
suspend and resume callbacks (but not the idle callback) to be invoked
435-
with interrupts disabled
434+
callbacks to be invoked with interrupts off
436435

437436
void pm_runtime_mark_last_busy(struct device *dev);
438437
- set the power.last_busy field to the current time

‎MAINTAINERS‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,6 @@ F: drivers/input/misc/ati_remote2.c
12781278
ATLX ETHERNET DRIVERS
12791279
M: Jay Cliburn <jcliburn@gmail.com>
12801280
M: Chris Snook <chris.snook@gmail.com>
1281-
M: Jie Yang <jie.yang@atheros.com>
12821281
L: netdev@vger.kernel.org
12831282
W: http://sourceforge.net/projects/atl1
12841283
W: http://atl1.sourceforge.net
@@ -1574,7 +1573,6 @@ F: drivers/scsi/bfa/
15741573

15751574
BROCADE BNA 10 GIGABIT ETHERNET DRIVER
15761575
M: Rasesh Mody <rmody@brocade.com>
1577-
M: Debashis Dutt <ddutt@brocade.com>
15781576
L: netdev@vger.kernel.org
15791577
S: Supported
15801578
F: drivers/net/bna/
@@ -1758,7 +1756,6 @@ F: Documentation/zh_CN/
17581756

17591757
CISCO VIC ETHERNET NIC DRIVER
17601758
M: Christian Benvenuti <benve@cisco.com>
1761-
M: Vasanthy Kolluri <vkolluri@cisco.com>
17621759
M: Roopa Prabhu <roprabhu@cisco.com>
17631760
M: David Wang <dwang2@cisco.com>
17641761
S: Supported
@@ -1883,7 +1880,7 @@ S: Maintained
18831880
F: drivers/connector/
18841881

18851882
CONTROL GROUPS (CGROUPS)
1886-
M: Paul Menage <menage@google.com>
1883+
M: Paul Menage <paul@paulmenage.org>
18871884
M: Li Zefan <lizf@cn.fujitsu.com>
18881885
L: containers@lists.linux-foundation.org
18891886
S: Maintained
@@ -1932,7 +1929,7 @@ S: Maintained
19321929
F: tools/power/cpupower
19331930

19341931
CPUSETS
1935-
M: Paul Menage <menage@google.com>
1932+
M: Paul Menage <paul@paulmenage.org>
19361933
W: http://www.bullopensource.org/cpuset/
19371934
W: http://oss.sgi.com/projects/cpusets/
19381935
S: Supported
@@ -2649,11 +2646,11 @@ F: drivers/net/wan/dlci.c
26492646
F: drivers/net/wan/sdla.c
26502647

26512648
FRAMEBUFFER LAYER
2652-
M: Paul Mundt <lethal@linux-sh.org>
2649+
M: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
26532650
L: linux-fbdev@vger.kernel.org
26542651
W: http://linux-fbdev.sourceforge.net/
26552652
Q: http://patchwork.kernel.org/project/linux-fbdev/list/
2656-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
2653+
T: git git://github.com/schandinat/linux-2.6.git fbdev-next
26572654
S: Maintained
26582655
F: Documentation/fb/
26592656
F: Documentation/devicetree/bindings/fb/
@@ -4404,7 +4401,8 @@ L: netfilter@vger.kernel.org
44044401
L: coreteam@netfilter.org
44054402
W: http://www.netfilter.org/
44064403
W: http://www.iptables.org/
4407-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
4404+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git
4405+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git
44084406
S: Supported
44094407
F: include/linux/netfilter*
44104408
F: include/linux/netfilter/
@@ -5532,6 +5530,7 @@ F: include/media/*7146*
55325530

55335531
SAMSUNG AUDIO (ASoC) DRIVERS
55345532
M: Jassi Brar <jassisinghbrar@gmail.com>
5533+
M: Sangbeom Kim <sbkim73@samsung.com>
55355534
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
55365535
S: Supported
55375536
F: sound/soc/samsung
@@ -7087,7 +7086,7 @@ S: Supported
70877086
F: drivers/mmc/host/vub300.c
70887087

70897088
W1 DALLAS'S 1-WIRE BUS
7090-
M: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
7089+
M: Evgeniy Polyakov <zbr@ioremap.net>
70917090
S: Maintained
70927091
F: Documentation/w1/
70937092
F: drivers/w1/

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VERSION = 3
22
PATCHLEVEL = 1
33
SUBLEVEL = 0
4-
EXTRAVERSION = -rc3
4+
EXTRAVERSION = -rc4
55
NAME = "Divemaster Edition"
66

77
# *DOCUMENTATION*

‎arch/alpha/include/asm/sysinfo.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,4 @@
2727
#define UAC_NOFIX 2
2828
#define UAC_SIGBUS 4
2929

30-
31-
#ifdef __KERNEL__
32-
33-
/* This is the shift that is applied to the UAC bits as stored in the
34-
per-thread flags. See thread_info.h. */
35-
#define UAC_SHIFT 6
36-
37-
#endif
38-
3930
#endif /* __ASM_ALPHA_SYSINFO_H */

‎arch/alpha/include/asm/thread_info.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ register struct thread_info *__current_thread_info __asm__("$8");
7474
#define TIF_NEED_RESCHED 3 /* rescheduling necessary */
7575
#define TIF_POLLING_NRFLAG 8 /* poll_idle is polling NEED_RESCHED */
7676
#define TIF_DIE_IF_KERNEL 9 /* dik recursion lock */
77-
#define TIF_UAC_NOPRINT 10 /* see sysinfo.h */
78-
#define TIF_UAC_NOFIX 11
79-
#define TIF_UAC_SIGBUS 12
77+
#define TIF_UAC_NOPRINT 10 /* ! Preserve sequence of following */
78+
#define TIF_UAC_NOFIX 11 /* ! flags as they match */
79+
#define TIF_UAC_SIGBUS 12 /* ! userspace part of 'osf_sysinfo' */
8080
#define TIF_MEMDIE 13 /* is terminating due to OOM killer */
8181
#define TIF_RESTORE_SIGMASK 14 /* restore signal mask in do_signal */
8282
#define TIF_FREEZE 16 /* is freezing for suspend */
@@ -97,7 +97,7 @@ register struct thread_info *__current_thread_info __asm__("$8");
9797
#define _TIF_ALLWORK_MASK (_TIF_WORK_MASK \
9898
| _TIF_SYSCALL_TRACE)
9999

100-
#define ALPHA_UAC_SHIFT 10
100+
#define ALPHA_UAC_SHIFT TIF_UAC_NOPRINT
101101
#define ALPHA_UAC_MASK (1 << TIF_UAC_NOPRINT | 1 << TIF_UAC_NOFIX | \
102102
1 << TIF_UAC_SIGBUS)
103103

‎arch/alpha/kernel/osf_sys.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include <asm/uaccess.h>
4343
#include <asm/system.h>
4444
#include <asm/sysinfo.h>
45+
#include <asm/thread_info.h>
4546
#include <asm/hwrpb.h>
4647
#include <asm/processor.h>
4748

@@ -633,9 +634,10 @@ SYSCALL_DEFINE5(osf_getsysinfo, unsigned long, op, void __user *, buffer,
633634
case GSI_UACPROC:
634635
if (nbytes < sizeof(unsigned int))
635636
return -EINVAL;
636-
w = (current_thread_info()->flags >> UAC_SHIFT) & UAC_BITMASK;
637-
if (put_user(w, (unsigned int __user *)buffer))
638-
return -EFAULT;
637+
w = (current_thread_info()->flags >> ALPHA_UAC_SHIFT) &
638+
UAC_BITMASK;
639+
if (put_user(w, (unsigned int __user *)buffer))
640+
return -EFAULT;
639641
return 1;
640642

641643
case GSI_PROC_TYPE:
@@ -756,8 +758,8 @@ SYSCALL_DEFINE5(osf_setsysinfo, unsigned long, op, void __user *, buffer,
756758
case SSIN_UACPROC:
757759
again:
758760
old = current_thread_info()->flags;
759-
new = old & ~(UAC_BITMASK << UAC_SHIFT);
760-
new = new | (w & UAC_BITMASK) << UAC_SHIFT;
761+
new = old & ~(UAC_BITMASK << ALPHA_UAC_SHIFT);
762+
new = new | (w & UAC_BITMASK) << ALPHA_UAC_SHIFT;
761763
if (cmpxchg(&current_thread_info()->flags,
762764
old, new) != old)
763765
goto again;

‎arch/alpha/kernel/systbls.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ sys_call_table:
360360
.quad sys_newuname
361361
.quad sys_nanosleep /* 340 */
362362
.quad sys_mremap
363-
.quad sys_nfsservctl
363+
.quad sys_ni_syscall /* old nfsservctl */
364364
.quad sys_setresuid
365365
.quad sys_getresuid
366366
.quad sys_pciconfig_read /* 345 */

‎arch/arm/boot/compressed/mmcif-sh7372.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ asmlinkage void mmc_loader(unsigned char *buf, unsigned long len)
8282

8383

8484
/* Disable clock to MMC hardware block */
85-
__raw_writel(__raw_readl(SMSTPCR3) & (1 << 12), SMSTPCR3);
85+
__raw_writel(__raw_readl(SMSTPCR3) | (1 << 12), SMSTPCR3);
8686

8787
mmc_update_progress(MMC_PROGRESS_DONE);
8888
}

‎arch/arm/boot/compressed/sdhi-sh7372.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ asmlinkage void mmc_loader(unsigned short *buf, unsigned long len)
8585
goto err;
8686

8787
/* Disable clock to SDHI1 hardware block */
88-
__raw_writel(__raw_readl(SMSTPCR3) & (1 << 13), SMSTPCR3);
88+
__raw_writel(__raw_readl(SMSTPCR3) | (1 << 13), SMSTPCR3);
8989

9090
mmc_update_progress(MMC_PROGRESS_DONE);
9191

‎arch/arm/kernel/calls.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
CALL(sys_ni_syscall) /* vm86 */
179179
CALL(sys_ni_syscall) /* was sys_query_module */
180180
CALL(sys_poll)
181-
CALL(sys_nfsservctl)
181+
CALL(sys_ni_syscall) /* was nfsservctl */
182182
/* 170 */ CALL(sys_setresgid16)
183183
CALL(sys_getresgid16)
184184
CALL(sys_prctl)

0 commit comments

Comments
 (0)