Pandora Sourcecodes - pandora-kernel.git/commit

git.openpandora.org / pandora-kernel.git / commit

author	David S. Miller <davem@davemloft.net>
	Tue, 8 May 2012 03:35:40 +0000 (23:35 -0400)
committer	David S. Miller <davem@davemloft.net>
	Tue, 8 May 2012 03:35:40 +0000 (23:35 -0400)
commit	0d6c4a2e4641bbc556dd74d3aa158c413a972492
tree	da944af17682659bb433dc2282dcb48380c14cd1	tree \| snapshot
parent	6e06c0e2347ec79d0bd5702b2438fe883f784545	commit \| diff
parent	1c430a727fa512500a422ffe4712166c550ea06a	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/intel/e1000e/param.c
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
drivers/net/wireless/iwlwifi/iwl-trans.h

Resolved the iwlwifi conflict with mainline using 3-way diff posted
by John Linville and Stephen Rothwell. In 'net' we added a bug
fix to make iwlwifi report a more accurate skb->truesize but this
conflicted with RX path changes that happened meanwhile in net-next.

In e1000e a conflict arose in the validation code for settings of
adapter->itr. 'net-next' had more sophisticated logic so that
logic was used.

Signed-off-by: David S. Miller <davem@davemloft.net>

61 files changed:

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dlink/dl2k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dlink/dl2k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/param.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sun/sungem.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/tlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar5008_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom_9287.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-1000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-2000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-5000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-6000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wl1251/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wl1251/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet-tx.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_vs.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_forward.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/ieee802154/6lowpan.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_diag.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ftp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_lblc.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_lblcr.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_proto.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_netem.c	diff1 \|	diff2 \|	blob \| history

Pandora Kernel Repository

RSS Atom

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dlink/dl2k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/dlink/dl2k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000/e1000_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/e1000e/param.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/sky2.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/sun/sungem.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/tlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/usbnet.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar5008_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom_9287.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2200.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-1000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-2000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-5000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-6000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wl1251/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wl1251/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/octeon/ethernet-tx.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	diff1 \|	diff2 \|	blob \| history
include/net/ip_vs.h	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/bridge/br_forward.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/ieee802154/6lowpan.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/inet_diag.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/l2tp/l2tp_ip.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_core.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ftp.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_lblc.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_lblcr.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_proto.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_netem.c	diff1 \|	diff2 \|	blob \| history