Commit 4d69f155 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v4.9-rc1' into x86/fpu, to resolve conflict 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c474e507 1001354c

.gitattributes

0 → 100644
+2 −0
Original line number Diff line number Diff line 
*.c   diff=cpp

*.h   diff=cpp

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ Jean Tourrilhes <jt@hpl.hp.com> 
Jeff Garzik <jgarzik@pretzel.yyz.us>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

<josh@joshtriplett.org> <josh@freedesktop.org>
@@ -125,6 +127,7 @@ Peter Oruba <peter@oruba.de> 
Peter Oruba <peter.oruba@amd.com>

Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Rajesh Shah <rajesh.shah@intel.com>

Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -160,6 +163,7 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu> 
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>

Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>

Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>

Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

CREDITS

+21 −4
Original line number Diff line number Diff line
@@ -1090,6 +1090,10 @@ S: 6350 Stoneridge Mall Road 
S: Pleasanton, CA 94588

S: USA



N: Dmitry Eremin-Solenikov

E: dbaryshkov@gmail.com

D: Power Supply Maintainer from v3.14 - v3.15



N: Doug Evans

E: dje@cygnus.com

D: Wrote Xenix FS (part of standard kernel since 0.99.15)
@@ -1944,6 +1948,11 @@ E: kraxel@bytesex.org 
E: kraxel@suse.de

D: video4linux, bttv, vesafb, some scsi, misc fixes



N: Hans J. Koch

D: USERSPACE I/O, MAX6650

D: Hans passed away in June 2016, and will be greatly missed.

W: https://lwn.net/Articles/691000/



N: Harald Koenig

E: koenig@tat.physik.uni-tuebingen.de

D: XFree86 (S3), DCF77, some kernel hacks and fixes
@@ -2287,11 +2296,11 @@ D: Initial implementation of VC's, pty's and select() 


N: Pavel Machek

E: pavel@ucw.cz

D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd

P: 4096R/92DFCE96 4FA7 9EEF FCD4 C44F C585  B8C7 C060 2241 92DF CE96

D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd,

D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,

D: work on suspend-to-ram/disk, killing duplicates from ioctl32

S: Volkova 1131

S: 198 00 Praha 9

D: work on suspend-to-ram/disk, killing duplicates from ioctl32,

D: Altera SoCFPGA and Nokia N900 support.

S: Czech Republic



N: Paul Mackerras
@@ -3518,6 +3527,10 @@ S: 145 Howard St. 
S: Northborough, MA 01532

S: USA



N: Doug Thompson

E: dougthompson@xmission.com

D: EDAC



N: Tommy Thorn

E: Tommy.Thorn@irisa.fr

W: http://www.irisa.fr/prive/thorn/index.html
@@ -3654,6 +3667,10 @@ S: Obere Heerbergstrasse 17 
S: 97078 Wuerzburg

S: Germany



N: Jason Uhlenkott

E: juhlenko@akamai.com

D: I3000 EDAC driver



N: Greg Ungerer

E: gerg@snapgear.com

D: uClinux kernel hacker

Documentation/00-INDEX

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ IRQ.txt 
Intel-IOMMU.txt

	- basic info on the Intel IOMMU virtualization support.

Makefile

	- some files in Documentation dir are actually sample code to build

	- This file does nothing. Removing it breaks make htmldocs and

	  make distclean.

ManagementStyle

	- how to (attempt to) manage kernel hackers.

RCU/

Documentation/80211/cfg80211.rst

0 → 100644
+345 −0
Original line number Diff line number Diff line 
==================

cfg80211 subsystem

==================



Device registration

===================



.. kernel-doc:: include/net/cfg80211.h

   :doc: Device registration



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_channel_flags



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_channel



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_rate_flags



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_rate



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_sta_ht_cap



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_supported_band



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_signal_type



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_params_flags



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_flags



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy



.. kernel-doc:: include/net/cfg80211.h

   :functions: wireless_dev



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_new



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_register



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_unregister



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_free



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_name



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_dev



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_priv



.. kernel-doc:: include/net/cfg80211.h

   :functions: priv_to_wiphy



.. kernel-doc:: include/net/cfg80211.h

   :functions: set_wiphy_dev



.. kernel-doc:: include/net/cfg80211.h

   :functions: wdev_priv



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_iface_limit



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_iface_combination



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_check_combinations



Actions and configuration

=========================



.. kernel-doc:: include/net/cfg80211.h

   :doc: Actions and configuration



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_ops



.. kernel-doc:: include/net/cfg80211.h

   :functions: vif_params



.. kernel-doc:: include/net/cfg80211.h

   :functions: key_params



.. kernel-doc:: include/net/cfg80211.h

   :functions: survey_info_flags



.. kernel-doc:: include/net/cfg80211.h

   :functions: survey_info



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_beacon_data



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_ap_settings



.. kernel-doc:: include/net/cfg80211.h

   :functions: station_parameters



.. kernel-doc:: include/net/cfg80211.h

   :functions: rate_info_flags



.. kernel-doc:: include/net/cfg80211.h

   :functions: rate_info



.. kernel-doc:: include/net/cfg80211.h

   :functions: station_info



.. kernel-doc:: include/net/cfg80211.h

   :functions: monitor_flags



.. kernel-doc:: include/net/cfg80211.h

   :functions: mpath_info_flags



.. kernel-doc:: include/net/cfg80211.h

   :functions: mpath_info



.. kernel-doc:: include/net/cfg80211.h

   :functions: bss_parameters



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_txq_params



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_crypto_settings



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_auth_request



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_assoc_request



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_deauth_request



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_disassoc_request



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_ibss_params



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_connect_params



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_pmksa



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_rx_mlme_mgmt



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_auth_timeout



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_rx_assoc_resp



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_assoc_timeout



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_tx_mlme_mgmt



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_ibss_joined



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_connect_result



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_connect_bss



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_connect_timeout



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_roamed



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_disconnected



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_ready_on_channel



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_remain_on_channel_expired



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_new_sta



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_rx_mgmt



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_mgmt_tx_status



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_cqm_rssi_notify



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_cqm_pktloss_notify



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_michael_mic_failure



Scanning and BSS list handling

==============================



.. kernel-doc:: include/net/cfg80211.h

   :doc: Scanning and BSS list handling



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_ssid



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_scan_request



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_scan_done



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_bss



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_inform_bss



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_inform_bss_frame_data



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_inform_bss_data



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_unlink_bss



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_find_ie



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_bss_get_ie



Utility functions

=================



.. kernel-doc:: include/net/cfg80211.h

   :doc: Utility functions



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_channel_to_frequency



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_frequency_to_channel



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_get_channel



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_get_response_rate



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_hdrlen



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_get_hdrlen_from_skb



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_radiotap_iterator



Data path helpers

=================



.. kernel-doc:: include/net/cfg80211.h

   :doc: Data path helpers



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_data_to_8023



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_data_from_8023



.. kernel-doc:: include/net/cfg80211.h

   :functions: ieee80211_amsdu_to_8023s



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_classify8021d



Regulatory enforcement infrastructure

=====================================



.. kernel-doc:: include/net/cfg80211.h

   :doc: Regulatory enforcement infrastructure



.. kernel-doc:: include/net/cfg80211.h

   :functions: regulatory_hint



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_apply_custom_regulatory



.. kernel-doc:: include/net/cfg80211.h

   :functions: freq_reg_info



RFkill integration

==================



.. kernel-doc:: include/net/cfg80211.h

   :doc: RFkill integration



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_rfkill_set_hw_state



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_rfkill_start_polling



.. kernel-doc:: include/net/cfg80211.h

   :functions: wiphy_rfkill_stop_polling



Test mode

=========



.. kernel-doc:: include/net/cfg80211.h

   :doc: Test mode



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_testmode_alloc_reply_skb



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_testmode_reply



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_testmode_alloc_event_skb



.. kernel-doc:: include/net/cfg80211.h

   :functions: cfg80211_testmode_event