linux-kernel - Re: [GIT PATCH] STAGING patches for 3.1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 27 Jul 2011 13:53:28 +0200
From:	Daniel Morsing <daniel.morsing@...il.com>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Greg KH <greg@...ah.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	linux-kernel@...r.kernel.org, devel@...uxdriverproject.org
Subject: Re: [GIT PATCH] STAGING patches for 3.1

On Mon, 2011-07-25 at 23:31 -0700, Linus Torvalds wrote:
> 
> So all merged and pushed out. Of course, maybe I made a mistake
> somewhere, but none of it looked at all questionable (famous last
> words ;)
> 
>                    Linus
> 

I came across a double include of linux/interrupt.h in
drivers/staging/brcm80211/brcmsmac/mac80211_if.h from this merge while
trying to teach myself how to effectively use git as a tool for
resolving merges. 

The merge also added an include of linux/interrupt.h in mac80211_if.c
which includes mac80211_if.h, but I left that in, since it explicitly
shows the dependencies of the file.

Anyway, Here's the patch:

---
From: Daniel Morsing <daniel.morsing@...il.com>

staging: brcm80211: Fix double include introduced by bad merge

A merge with Linus' tree added a double include of linux/interrupt.h.
Fix by removing one of the includes.

Signed-off-by: Daniel Morsing <daniel.morsing@...il.com>
---
 drivers/staging/brcm80211/brcmsmac/mac80211_if.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
index 5711e7c..40e3d37 100644
--- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
+++ b/drivers/staging/brcm80211/brcmsmac/mac80211_if.h
@@ -24,8 +24,6 @@
 #define BRCMS_SET_SHORTSLOT_OVERRIDE		146
 
 
-#include <linux/interrupt.h>
-
 /* BMAC Note: High-only driver is no longer working in softirq context
as it needs to block and
  * sleep so perimeter lock has to be a semaphore instead of spinlock.
This requires timers to be
  * submitted to workqueue instead of being on kernel timer





--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/