Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync up with Linus #71

Merged
merged 119 commits into from
May 13, 2015
Merged

Sync up with Linus #71

Changes from 1 commit
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
d44c3fe
iwlwifi: mvm: fix Tx Power firmware API
Apr 18, 2015
145d90b
iwlwifi: mvm: don't stop the FW monitor too early
egrumbach Apr 13, 2015
1083fd7
iwlwifi: mvm: fix scan iteration complete notification handling
AviStern Mar 31, 2015
8047cc0
iwlwifi: mvm: Avoid signal based decisions if ave beacon RSSI is 0
alexbondarintel Mar 26, 2015
553452e
iwlwifi: pcie: prevent using unmapped memory in fw monitor
lkaufman-he Apr 16, 2015
5eb8f4d
mac80211: don't warn when stopping VLAN with stations
jmberg-intel Apr 13, 2015
60f4b62
mac80211: fix rhashtable conversion
jmberg-intel Apr 23, 2015
caf22d3
mac80211: enable hash table shrinking
jmberg-intel Apr 24, 2015
414b7e3
rtlwifi: rtl8192cu: Fix kernel deadlock
lwfinger Apr 24, 2015
8d193ca
iwlwifi: mvm: don't power off the device between INIT and OPER firmwares
Apr 27, 2015
6bbd552
iwlwifi: mvm: fix typo in CONFIG option
egrumbach Apr 28, 2015
e7afe89
iwlwifi: mvm: force quota update update after FW restart
jmberg-intel Apr 21, 2015
0df48c2
tcp: add tcpi_bytes_acked to tcp_info
Apr 28, 2015
bdd1f9e
tcp: add tcpi_bytes_received to tcp_info
Apr 28, 2015
64f40ff
tcp: prepare CC get_info() access from getsockopt()
Apr 28, 2015
6e9250f
tcp: add TCP_CC_INFO socket option
Apr 28, 2015
9dac883
tcp: update reordering first before detecting loss
yuchungcheng Apr 29, 2015
16e5c47
Bluetooth: bt3c: Delete some unuseful comments
Apr 10, 2015
50862ee
Bluetooth: btbcm: Export patchram download as separate function
holtmann Apr 10, 2015
c0ba7ac
Bluetooth: hci_uart: Reorder Atheros specific driver callbacks
holtmann Apr 11, 2015
4c876c0
Bluetooth: hci_uart: Add Atheros support for address configuration
holtmann Apr 11, 2015
a2698a9
Bluetooth: btusb: Add Realtek 8723A/8723B/8761A/8821A support
dsd Apr 16, 2015
eb50042
Bluetooth: btusb: Fix two coding style issues
holtmann Apr 16, 2015
c57ddfa
Bluetooth: btusb: off by one in rtl8723b_parse_firmware()
Apr 20, 2015
409e718
axp288_fuel_gauge: Add original author details
Mar 13, 2015
2a6afdd
MAINTAINERS: Add me as maintainer of Nokia N900 power supply drivers
pali Mar 29, 2015
932df43
power/reset: at91: fix return value check in at91_reset_platform_probe()
Apr 16, 2015
ce99236
power_supply: fix oops in collie_battery driver
lumag Apr 27, 2015
d881825
power: reset: ltc2952: Remove bogus hrtimer_start() return value checks
KAGA-KOKO Apr 14, 2015
d24d814
Bluetooth: Skip the shutdown routine if the interface is not up
gm-vm Apr 26, 2015
2b4d413
mac802154: fix ieee802154_register_hw error handling
alexaring Apr 30, 2015
89eb6d0
mac802154: llsec: fix return value check in llsec_key_alloc()
Apr 30, 2015
42fb23e
mac802154: add description to mac802154 APIs
bhadram Apr 30, 2015
1cc800e
ieee802154: Add trace events for rdev->ops
agx Apr 30, 2015
4748e86
at86rf230: Add macro for TRX STATE MASK
christofferholmstedt Apr 30, 2015
5b4a103
cfg802154: pass name_assign_type to rdev_add_virtual_intf()
bhadram Apr 30, 2015
5e8e01e
at86rf230: remove tabs after define
alexaring Apr 30, 2015
2ad3324
at86rf230: move cal_timeout to state change
alexaring Apr 30, 2015
3b951ca
at86rf230: add TX_ARET_ON for calibration timeout
alexaring Apr 30, 2015
2f8cdd9
at86rf230: remove unnecessary tx state change
alexaring Apr 30, 2015
8500920
at86rf230: change state change if from trx_off
alexaring Apr 30, 2015
d2c8bf5
at86rf230: add slp_tr support to start tx
alexaring Apr 30, 2015
1add156
ieee802154: trace: fix endian convertion
alexaring Apr 30, 2015
5793aff
net: can: xilinx_can: fix extended frame handling
Apr 29, 2015
0a73125
power: reset: Add MFD_SYSCON depends for brcmstb
ffainelli Apr 30, 2015
8ebb7e9
power: bq27x00_battery: Add missing MODULE_ALIAS
Apr 30, 2015
0581276
Merge tag 'iwlwifi-for-kalle-2015-04-28' of https://git.kernel.org/pu…
May 3, 2015
f673821
ath9k: fix per-packet tx power configuration
LorenzoBianconi Apr 8, 2015
a5d2809
codel: fix maxpacket/mtu confusion
Apr 30, 2015
edac450
netlink: Remove max_size setting
herbertx May 1, 2015
c0adf54
net/rds: fix unaligned memory access
srabinov May 1, 2015
f0e9fc5
drivers/net: include <module.h> for modular stmmac_platform code
May 1, 2015
4f6d25d
Merge tag 'linux-can-fixes-for-4.1-20150501' of git://git.kernel.org/…
davem330 May 4, 2015
4212b54
net: dsa: mv88e6xxx: unregister mv88e6352 driver
vivien May 1, 2015
5948632
fm10k: Do not assume budget will never be 0 for NAPI
May 1, 2015
eb78139
r8169: Do not use dev_kfree_skb in xmit path
May 1, 2015
e7fcd54
ixgbevf: Use dev_kfree_skb_any in xmit path, not dev_kfree_skb
May 1, 2015
bd4d95a
Merge branch 'dev_kfree_skb'
davem330 May 4, 2015
2e70aed
Revert "net: kernel socket should be released in init_net namespace"
herbertx May 3, 2015
efdbd2b
macvlan: Propagate promiscuity setting to lower devices.
vyasevich May 1, 2015
ff419b3
mac80211: fix 90 kernel-doc warnings
rddunlap Apr 27, 2015
6b096fd
isdn/gigaset: cede maintainership
tilmanschmidt May 2, 2015
d66bf7d
net: core: Correct an over-stringent device loop detection.
vyasevich May 3, 2015
965b2aa
net/smsc911x: fix irq resource allocation failure
May 4, 2015
a2d4fcb
Revert "Revert "smc91x: retrieve IRQ and trigger flags in a modern way""
davem330 May 4, 2015
e278371
net/rds: Fix new sparse warning
May 4, 2015
73e8431
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/ker…
davem330 May 4, 2015
0650c0b
bnx2x: Fix to prevent inner-reload
May 4, 2015
b7ba7b4
Merge tag 'mac80211-for-davem-2015-05-04' of git://git.kernel.org/pub…
davem330 May 4, 2015
7aab515
hv_netvsc: remove unused variable in netvsc_send()
snits May 4, 2015
cae0633
net/mlx4_en: Fix off-by-one in counters manipulation
May 5, 2015
2d3c739
net/mlx4_core: Work properly with EQ numbers > 256 in SRIOV
yishaih May 5, 2015
bc321ed
Merge branch 'mlx4'
davem330 May 5, 2015
c967a08
mpls: Move reserved label definitions
tomratbert May 5, 2015
53ee103
Merge tag 'wireless-drivers-for-davem-2015-05-05' of git://git.kernel…
davem330 May 5, 2015
31ccd0e
tcp_westwood: fix tcp_westwood_info()
Apr 29, 2015
c0a06ee
igb: Fix oops on changing number of rings
Apr 13, 2015
2439fc4
igb: Fix NULL assignment to incorrect variable in igb_reset_q_vector
Apr 13, 2015
0a80144
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/ker…
davem330 May 9, 2015
e16e888
ipv6: Fixed source specific default route handling.
fingon May 5, 2015
f711a6a
net/rds: RDS-TCP: Always create a new rds_sock for an incoming connec…
sowminiv May 5, 2015
c82ac7e
net/rds: RDS-TCP: only initiate reconnect attempt on outgoing TCP soc…
sowminiv May 5, 2015
d3196a2
Merge branch 'rds'
davem330 May 9, 2015
bfbb92c
net: macb: Handle the RXUBR interrupt on all devices
natesully May 5, 2015
1006da1
drivers/net/usb: Add support for 'Lenovo OneLink Pro Dock'
qehgt May 6, 2015
d744318
net_sched: fix a use-after-free in tc_ctl_tfilter()
congwang May 5, 2015
74a78b1
net: amd-xgbe: Add hardware dependency
jdelvare May 6, 2015
ccad725
net: xgene_enet: Set hardware dependency
jdelvare May 6, 2015
240b23c
netxen_nic: use spin_[un]lock_bh around tx_clean_lock (2)
camuso May 6, 2015
3e4336a
usbnet: avoid integer overflow in start_xmit
zx2c4 May 6, 2015
7c0004d
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…
davem330 May 10, 2015
78f5b89
mpls: Change reserved label names to be consistent with netbsd
tomratbert May 7, 2015
19fc99d
ARM: net fix emit_udiv() for BPF_ALU | BPF_DIV | BPF_K intruction.
nschichan May 6, 2015
0b59d88
ARM: net: delegate filter to kernel interpreter when imm_offset() ret…
nschichan May 7, 2015
cd9c399
bnx2x: limit fw delay in kdump to 5s after boot
michich May 7, 2015
fbf33a2
af_packet / TX_RING not fully non-blocking (w/ MSG_DONTWAIT).
May 8, 2015
7c0c826
net: mdio-gpio: Allow for unspecified bus id
biot May 8, 2015
268be0f
net: qca_spi: Fix possible race during probe
lategoodbye May 9, 2015
665a6cd
pppoe: drop pppoe device in pppoe_unbind_sock_work
May 9, 2015
145a42b
net_sched: gred: use correct backlog value in WRED mode
dpward May 10, 2015
94634e9
IB/ehca: use correct destination for memcpy
May 11, 2015
940fd30
iw_cxgb4: use wildcard mapping for getting remote addr info
May 7, 2015
2936ae0
MAINTAINERS: update the official rdma git repo
dledford May 12, 2015
cafb45b
MIPS: SMP: Fix build error.
ralfbaechle May 12, 2015
6938f85
Update be2net maintainers' email addresses
May 12, 2015
620b155
MIPS: fix FP mode selection in lieu of .MIPS.abiflags data
paulburton May 6, 2015
ec04847
RDMA/core: Fix for parsing netlink string attribute
tatyana-en May 8, 2015
ec40f92
IB/qib: fix test of unsigned variable
mmarcini May 12, 2015
f4f01b5
infiniband: Remove duplicated KERN_<LEVEL> from pr_<level> uses
JoePerches May 8, 2015
cc49e8c
Merge tag 'for-v4.1-rc' of git://git.infradead.org/battery-2.6
torvalds May 12, 2015
e3d8ecb
netns: return RTM_NEWNSID instead of RTM_GETNSID on a get
NicolasDichtel May 11, 2015
03906ca
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi…
torvalds May 12, 2015
6c9d370
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upst…
torvalds May 12, 2015
343f845
x86: bpf_jit: fix FROM_BE16 and FROM_LE16/32 instructions
May 12, 2015
44d4f8d
net: ll_temac: Fix DMA map size bug
May 12, 2015
bced870
net: phy: micrel: Fix regression in kszphy_probe
May 12, 2015
5684044
e1000e: Add pm_qos header
dsahern May 12, 2015
01d460d
net: Remove remaining remnants of pm_qos from netdevice.h
dsahern May 12, 2015
110bc76
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
torvalds May 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
net: Remove remaining remnants of pm_qos from netdevice.h 
Commit e2c6544 removed pm_qos from struct net_device but left the
comment and header file. Remove those.

Signed-off-by: David Ahern <[email protected]>
Cc: Thomas Graf <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@dsahern @davem330
dsahern authored and davem330 committed May 13, 2015
commit 01d460dd70adc858e15307332832183c622bee50
3 changes: 0 additions & 3 deletions include/linux/netdevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#ifndef _LINUX_NETDEVICE_H
#define _LINUX_NETDEVICE_H

#include <linux/pm_qos.h>
#include <linux/timer.h>
#include <linux/bug.h>
#include <linux/delay.h>
Expand Down Expand Up @@ -1499,8 +1498,6 @@ enum netdev_priv_flags {
*
* @qdisc_tx_busylock: XXX: need comments on this one
*
* @pm_qos_req: Power Management QoS object
*
* FIXME: cleanup struct net_device such that network protocol info
* moves out.
*/
Expand Down