Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 26, 2012
  1. ARM: PXA27x: Zipit Z2: disable wake on GPIO0

    authored
    We don't want machine to wake up on AC state change
    
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
  2. ARM: PXA27x: save/restore PWER on suspend/resume

    authored
    Bootloader can clobber PWER value, so save it state on suspend.
    
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
  3. pxafb: do console locking before calling fb_blank()

    authored
    Otherwise we hit WARN_CONSOLE_UNLOCKED in do_unblank_screen
    
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
  4. ARM: pxa27x_keypad: clear pending interrupts on keypad config

    authored
    Bootloader can leave interrupt bit pending, and it confuses driver.
    
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
  5. ARM: PXA: Zipit Z2: Fix oops in z2_power_off

    authored
    pxa27x_set_pwrmode is marked with __init, so it's not legitimate
    to call it in pm_power_off hook.
    
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Commits on Jan 5, 2012
  1. libertas: implement if_spi runtime power management

    authored
    The SPI card is now fully powered down when the network
    interface is brought down.
    
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
  2. libertas: add ability to power off card on suspend

    authored
    Could be usefull if it's not possible to keep power on the card
    when host goes into suspend.
    
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
  3. spi-pxa2xx: fix memory corruption

    authored
    pxa2xx_spi_probe allocates struct driver_data and null_dma_buf
    at same time via spi_alloc_master(), but then calculates
    null_dma_buf pointer incorrectly, and it causes memory corruption
    later if DMA usage is enabled.
    
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
  4. ARM: PXA: Zipit Z2: Add USB host and device support

    authored
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
  5. ARM: PXA: Add z2-usb-switch driver

    authored
    This driver controls mode of USB port #2 pins - device or host.
    
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
  6. ARM: PXA27x: CPUFREQ: Don't use fastbus mode

    authored
    PXA27x does not like fastbus for some reason, it can hang in
    random places when it's enabled. So don't use it to make cpufreq
    stable.
    
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
  7. ARM: PXA: Zipit Z2: Add mtd partition with logo

    authored
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
  8. libertas_spi: cancel packer work on module removal

    authored
    Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Commits on Jan 4, 2012
  1. @torvalds

    Linux 3.2

    torvalds authored
  2. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
      fix CAN MAINTAINERS SCM tree type
      mwifiex: fix crash during simultaneous scan and connect
      b43: fix regression in PIO case
      ath9k: Fix kernel panic in AR2427 in AP mode
      CAN MAINTAINERS update
      net: fsl: fec: fix build for mx23-only kernel
      sch_qfq: fix overflow in qfq_update_start()
      Revert "Bluetooth: Increase HCI reset timeout in hci_dev_do_close"
  3. @torvalds

    minixfs: misplaced checks lead to dentry leak

    Al Viro authored torvalds committed
    bitmap size sanity checks should be done *before* allocating ->s_root;
    there their cleanup on failure would be correct.  As it is, we do iput()
    on root inode, but leak the root dentry...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Josh Boyer <jwboyer@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @utrace @torvalds

    ptrace: ensure JOBCTL_STOP_SIGMASK is not zero after detach

    utrace authored torvalds committed
    This is the temporary simple fix for 3.2, we need more changes in this
    area.
    
    1. do_signal_stop() assumes that the running untraced thread in the
       stopped thread group is not possible. This was our goal but it is
       not yet achieved: a stopped-but-resumed tracee can clone the running
       thread which can initiate another group-stop.
    
       Remove WARN_ON_ONCE(!current->ptrace).
    
    2. A new thread always starts with ->jobctl = 0. If it is auto-attached
       and this group is stopped, __ptrace_unlink() sets JOBCTL_STOP_PENDING
       but JOBCTL_STOP_SIGMASK part is zero, this triggers WANR_ON(!signr)
       in do_jobctl_trap() if another debugger attaches.
    
       Change __ptrace_unlink() to set the artificial SIGSTOP for report.
    
       Alternatively we could change ptrace_init_task() to copy signr from
       current, but this means we can copy it for no reason and hide the
       possible similar problems.
    
    Acked-by: Tejun Heo <tj@kernel.org>
    Cc: <stable@kernel.org>		[3.1]
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @utrace @torvalds

    ptrace: partially fix the do_wait(WEXITED) vs EXIT_DEAD->EXIT_ZOMBIE …

    utrace authored torvalds committed
    …race
    
    Test-case:
    
    	int main(void)
    	{
    		int pid, status;
    
    		pid = fork();
    		if (!pid) {
    			for (;;) {
    				if (!fork())
    					return 0;
    				if (waitpid(-1, &status, 0) < 0) {
    					printf("ERR!! wait: %m\n");
    					return 0;
    				}
    			}
    		}
    
    		assert(ptrace(PTRACE_ATTACH, pid, 0,0) == 0);
    		assert(waitpid(-1, NULL, 0) == pid);
    
    		assert(ptrace(PTRACE_SETOPTIONS, pid, 0,
    					PTRACE_O_TRACEFORK) == 0);
    
    		do {
    			ptrace(PTRACE_CONT, pid, 0, 0);
    			pid = waitpid(-1, NULL, 0);
    		} while (pid > 0);
    
    		return 1;
    	}
    
    It fails because ->real_parent sees its child in EXIT_DEAD state
    while the tracer is going to change the state back to EXIT_ZOMBIE
    in wait_task_zombie().
    
    The offending commit is 823b018 which moved the EXIT_DEAD check,
    but in fact we should not blame it. The original code was not
    correct as well because it didn't take ptrace_reparented() into
    account and because we can't really trust ->ptrace.
    
    This patch adds the additional check to close this particular
    race but it doesn't solve the whole problem. We simply can't
    rely on ->ptrace in this case, it can be cleared if the tracer
    is multithreaded by the exiting ->parent.
    
    I think we should kill EXIT_DEAD altogether, we should always
    remove the soon-to-be-reaped child from ->children or at least
    we should never do the DEAD->ZOMBIE transition. But this is too
    complex for 3.2.
    
    Reported-and-tested-by: Denys Vlasenko <vda.linux@googlemail.com>
    Tested-by: Lukasz Michalik <lmi@ift.uni.wroc.pl>
    Acked-by: Tejun Heo <tj@kernel.org>
    Cc: <stable@kernel.org>		[3.0+]
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    Merge git://git.samba.org/sfrench/cifs-2.6

    torvalds authored
    * git://git.samba.org/sfrench/cifs-2.6:
      [CIFS] default ntlmv2 for cifs mount delayed to 3.3
      cifs: fix bad buffer length check in coalesce_t2
  7. @linvjw

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    linvjw authored
    …t/linville/wireless into for-davem
  8. @torvalds

    Revert "rtc: Expire alarms after the time is set."

    torvalds authored
    This reverts commit 93b2ec0.
    
    The call to "schedule_work()" in rtc_initialize_alarm() happens too
    early, and can cause oopses at bootup
    
    Neil Brown explains why we do it:
    
      "If you set an alarm in the future, then shutdown and boot again after
       that time, then you will end up with a timer_queue node which is in
       the past.
    
       When this happens the queue gets stuck.  That entry-in-the-past won't
       get removed until and interrupt happens and an interrupt won't happen
       because the RTC only triggers an interrupt when the alarm is "now".
    
       So you'll find that e.g.  "hwclock" will always tell you that
       'select' timed out.
    
       So we force the interrupt work to happen at the start just in case."
    
    and has a patch that convert it to do things in-process rather than with
    the worker thread, but right now it's too late to play around with this,
    so we just revert the patch that caused problems for now.
    
    Reported-by: Sander Eikelenboom <linux@eikelenboom.it>
    Requested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Requested-by: John Stultz <john.stultz@linaro.org>
    Cc: Neil Brown <neilb@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. [CIFS] default ntlmv2 for cifs mount delayed to 3.3

    Steve French authored
    Turned out the ntlmv2 (default security authentication)
    upgrade was harder to test than expected, and we ran
    out of time to test against Apple and a few other servers
    that we wanted to.  Delay upgrade of default security
    from ntlm to ntlmv2 (on mount) to 3.3.  Still works
    fine to specify it explicitly via "sec=ntlmv2" so this
    should be fine.
    
    Acked-by: Jeff Layton <jlayton@samba.org>
    Signed-off-by: Steve French <smfrench@gmail.com>
  10. cifs: fix bad buffer length check in coalesce_t2

    Jeff Layton authored Steve French committed
    The current check looks to see if the RFC1002 length is larger than
    CIFSMaxBufSize, and fails if it is. The buffer is actually larger than
    that by MAX_CIFS_HDR_SIZE.
    
    This bug has been around for a long time, but the fact that we used to
    cap the clients MaxBufferSize at the same level as the server tended
    to paper over it. Commit c974bef changed that however and caused this
    bug to bite in more cases.
    
    Reported-and-Tested-by: Konstantinos Skarlatos <k.skarlatos@gmail.com>
    Tested-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <smfrench@gmail.com>
  11. @torvalds

    Revert "rtc: Disable the alarm in the hardware"

    torvalds authored
    This reverts commit c0afabd.
    
    It causes failures on Toshiba laptops - instead of disabling the alarm,
    it actually seems to enable it on the affected laptops, resulting in
    (for example) the laptop powering on automatically five minutes after
    shutdown.
    
    There's a patch for it that appears to work for at least some people,
    but it's too late to play around with this, so revert for now and try
    again in the next merge window.
    
    See for example
    
    	http://bugs.debian.org/652869
    
    Reported-and-bisected-by: Andreas Friedrich <afrie@gmx.net> (Toshiba Tecra)
    Reported-by: Antonio-M. Corbi Bellot <antonio.corbi@ua.es> (Toshiba Portege R500)
    Reported-by: Marco Santos <marco.santos@waynext.com> (Toshiba Portege Z830)
    Reported-by: Christophe Vu-Brugier <cvubrugier@yahoo.fr>  (Toshiba Portege R830)
    Cc: Jonathan Nieder <jrnieder@gmail.com>
    Requested-by: John Stultz <john.stultz@linaro.org>
    Cc: stable@kernel.org  # for the versions that applied this
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @torvalds

    hung_task: fix false positive during vfork

    Mandeep Singh Baines authored torvalds committed
    vfork parent uninterruptibly and unkillably waits for its child to
    exec/exit. This wait is of unbounded length. Ignore such waits
    in the hung_task detector.
    
    Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
    Reported-by: Sasha Levin <levinsasha928@gmail.com>
    LKML-Reference: <1325344394.28904.43.camel@lappy>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: John Kacur <jkacur@redhat.com>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. @jankara @torvalds

    security: Fix security_old_inode_init_security() when CONFIG_SECURITY…

    jankara authored torvalds committed
    … is not set
    
    Commit 1e39f38 ("evm: fix build problems") makes the stub version
    of security_old_inode_init_security() return 0 when CONFIG_SECURITY is
    not set.
    
    But that makes callers such as reiserfs_security_init() assume that
    security_old_inode_init_security() has set name, value, and len
    arguments properly - but security_old_inode_init_security() left them
    uninitialized which then results in interesting failures.
    
    Revert security_old_inode_init_security() to the old behavior of
    returning EOPNOTSUPP since both callers (reiserfs and ocfs2) handle this
    just fine.
    
    [ Also fixed the S_PRIVATE(inode) case of the actual non-stub
      security_old_inode_init_security() function to return EOPNOTSUPP
      for the same reason, as pointed out by Mimi Zohar.
    
      It got incorrectly changed to match the new function in commit
      fb88c2b: "evm: fix security/security_old_init_security return
      code".   - Linus ]
    
    Reported-by: Jorge Bastos <mysql.jorge@decimal.pt>
    Acked-by: James Morris <jmorris@namei.org>
    Acked-by: Mimi Zohar <zohar@us.ibm.com>
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jan 3, 2012
  1. @hartkopp @davem330

    fix CAN MAINTAINERS SCM tree type

    hartkopp authored davem330 committed
    As pointed out by Joe Perches the SCM tree type was missing in my patch.
    
    Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
    
    CC: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
    CC: Urs Thuermann <urs.thuermann@volkswagen.de>
    CC: Wolfgang Grandegger <wg@grandegger.com>
    CC: Marc Kleine-Budde <mkl@pengutronix.de>
    CC: linux-can@vger.kernel.org
  2. @linvjw

    mwifiex: fix crash during simultaneous scan and connect

    Amitkumar Karwar authored linvjw committed
    If 'iw connect' command is fired when driver is already busy in
    serving 'iw scan' command, ssid specific scan operation for connect
    is skipped. In this case cmd wait queue handler gets called with no
    command in queue (i.e. adapter->cmd_queued = NULL).
    
    This patch adds a NULL check in mwifiex_wait_queue_complete()
    routine to fix crash observed during simultaneous scan and assoc
    operations.
    
    Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
    Signed-off-by: Bing Zhao <bzhao@marvell.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
  3. @lyakh @linvjw

    b43: fix regression in PIO case

    lyakh authored linvjw committed
    This patch fixes the regression, introduced by
    
    commit 17030f4
    From: Rafał Miłecki <zajec5@gmail.com>
    Date: Thu, 11 Aug 2011 17:16:27 +0200
    Subject: [PATCH] b43: support new RX header, noticed to be used in 598.314+ fw
    
    in PIO case.
    
    Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
  4. @linvjw

    ath9k: Fix kernel panic in AR2427 in AP mode

    Mohammed Shafi Shajakhan authored linvjw committed
    don't do aggregation related stuff for 'AP mode client power save
    handling' if aggregation is not enabled in the driver, otherwise it
    will lead to panic because those data structures won't be never
    intialized in 'ath_tx_node_init' if aggregation is disabled
    
    	EIP is at ath_tx_aggr_wakeup+0x37/0x80 [ath9k]
    	EAX: e8c09a20 EBX: f2a304e8 ECX: 00000001 EDX: 00000000
    	ESI: e8c085e0 EDI: f2a304ac EBP: f40e1ca4 ESP: f40e1c8c
    	DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
    	Process swapper/1 (pid: 0, ti=f40e0000 task=f408e860
    	task.ti=f40dc000)
    	Stack:
    	0001e966 e8c09a20 00000000 f2a304ac e8c085e0 f2a304ac
    	f40e1cb0 f8186741
    	f8186700 f40e1d2c f922988d f2a304ac 00000202 00000001
    	c0b4ba43 00000000
    	0000000f e8eb75c0 e8c085e0 205b0001 34383220 f2a304ac
    	f2a30000 00010020
    	Call Trace:
    	[<f8186741>] ath9k_sta_notify+0x41/0x50 [ath9k]
    	[<f8186700>] ? ath9k_get_survey+0x110/0x110 [ath9k]
    	[<f922988d>] ieee80211_sta_ps_deliver_wakeup+0x9d/0x350
    	[mac80211]
    	[<c018dc75>] ? __module_address+0x95/0xb0
    	[<f92465b3>] ap_sta_ps_end+0x63/0xa0 [mac80211]
    	[<f9246746>] ieee80211_rx_h_sta_process+0x156/0x2b0
    	[mac80211]
    	[<f9247d1e>] ieee80211_rx_handlers+0xce/0x510 [mac80211]
    	[<c018440b>] ? trace_hardirqs_on+0xb/0x10
    	[<c056936e>] ? skb_queue_tail+0x3e/0x50
    	[<f9248271>] ieee80211_prepare_and_rx_handle+0x111/0x750
    	[mac80211]
    	[<f9248bf9>] ieee80211_rx+0x349/0xb20 [mac80211]
    	[<f9248949>] ? ieee80211_rx+0x99/0xb20 [mac80211]
    	[<f818b0b8>] ath_rx_tasklet+0x818/0x1d00 [ath9k]
    	[<f8187a75>] ? ath9k_tasklet+0x35/0x1c0 [ath9k]
    	[<f8187a75>] ? ath9k_tasklet+0x35/0x1c0 [ath9k]
    	[<f8187b33>] ath9k_tasklet+0xf3/0x1c0 [ath9k]
    	[<c0151b7e>] tasklet_action+0xbe/0x180
    
    Cc: stable@kernel.org
    Cc: Senthil Balasubramanian <senthilb@qca.qualcomm.com>
    Cc: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
    Reported-by: Ashwin Mendonca <ashwinloyal@gmail.com>
    Tested-by: Ashwin Mendonca <ashwinloyal@gmail.com>
    Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
  5. @linvjw
  6. @hartkopp @davem330

    CAN MAINTAINERS update

    hartkopp authored davem330 committed
    Update the CAN MAINTAINERS section:
    
    - point out active maintainers
    - pull the CAN driver discussion away from netdev ML
    - point to the new CAN web site on gitorious.org
    - add CAN development git repository URL to submit patches
    
    Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
    
    CC: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
    CC: Urs Thuermann <urs.thuermann@volkswagen.de>
    CC: Wolfgang Grandegger <wg@grandegger.com>
    CC: Marc Kleine-Budde <mkl@pengutronix.de>
    CC: linux-can@vger.kernel.org
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. @davem330

    net: fsl: fec: fix build for mx23-only kernel

    Wolfram Sang authored davem330 committed
    If one only selects mx23-based boards, compile fails:
    
    drivers/net/ethernet/freescale/fec.c:410:2: error: 'FEC_HASH_TABLE_HIGH' undeclared (first use in this function)
    drivers/net/ethernet/freescale/fec.c:411:2: error: 'FEC_HASH_TABLE_LOW' undeclared (first use in this function)
    
    This is because fec.h uses CONFIG_SOC_IMX28 to determine the register
    layout of the core which makes sense since the MX23 does not have a fec.
    However, Kconfig uses the broader ARCH_MXS symbol and this way even
    makes the fec-driver default for MX23. Adapt Kconfig to use the more
    precise SOC_IMX28 as well.
    
    Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
    Cc: Fabio Estevam <fabio.estevam@freescale.com>
    Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Cc: Shawn Guo <shawn.guo@linaro.org>
    Cc: David S. Miller <davem@davemloft.net>
    Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. @davem330

    sch_qfq: fix overflow in qfq_update_start()

    Eric Dumazet authored davem330 committed
    grp->slot_shift is between 22 and 41, so using 32bit wide variables is
    probably a typo.
    
    This could explain QFQ hangs Dave reported to me, after 2^23 packets ?
    
    (23 = 64 - 41)
    
    Reported-by: Dave Taht <dave.taht@gmail.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    CC: Stephen Hemminger <shemminger@vyatta.com>
    CC: Dave Taht <dave.taht@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. @amr86

    drm/radeon/kms/atom: fix possible segfault in pm setup

    amr86 authored Dave Airlie committed
    If we end up with no power states, don't look up
    current vddc.
    
    fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=44130
    
    agd5f: fix patch formatting
    
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Something went wrong with that request. Please try again.