Commit aa2eaa8c authored by David S. Miller's avatar David S. Miller
Browse files


Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a3d3c74d 1609d760
Loading
Loading
Loading
Loading
+14 −3
Original line number Original line Diff line number Diff line
@@ -107,10 +107,13 @@ ForEachMacros:
  - 'css_for_each_descendant_post'
  - 'css_for_each_descendant_post'
  - 'css_for_each_descendant_pre'
  - 'css_for_each_descendant_pre'
  - 'device_for_each_child_node'
  - 'device_for_each_child_node'
  - 'dma_fence_chain_for_each'
  - 'drm_atomic_crtc_for_each_plane'
  - 'drm_atomic_crtc_for_each_plane'
  - 'drm_atomic_crtc_state_for_each_plane'
  - 'drm_atomic_crtc_state_for_each_plane'
  - 'drm_atomic_crtc_state_for_each_plane_state'
  - 'drm_atomic_crtc_state_for_each_plane_state'
  - 'drm_atomic_for_each_plane_damage'
  - 'drm_atomic_for_each_plane_damage'
  - 'drm_client_for_each_connector_iter'
  - 'drm_client_for_each_modeset'
  - 'drm_connector_for_each_possible_encoder'
  - 'drm_connector_for_each_possible_encoder'
  - 'drm_for_each_connector_iter'
  - 'drm_for_each_connector_iter'
  - 'drm_for_each_crtc'
  - 'drm_for_each_crtc'
@@ -126,6 +129,7 @@ ForEachMacros:
  - 'drm_mm_for_each_node_in_range'
  - 'drm_mm_for_each_node_in_range'
  - 'drm_mm_for_each_node_safe'
  - 'drm_mm_for_each_node_safe'
  - 'flow_action_for_each'
  - 'flow_action_for_each'
  - 'for_each_active_dev_scope'
  - 'for_each_active_drhd_unit'
  - 'for_each_active_drhd_unit'
  - 'for_each_active_iommu'
  - 'for_each_active_iommu'
  - 'for_each_available_child_of_node'
  - 'for_each_available_child_of_node'
@@ -153,6 +157,8 @@ ForEachMacros:
  - 'for_each_cpu_not'
  - 'for_each_cpu_not'
  - 'for_each_cpu_wrap'
  - 'for_each_cpu_wrap'
  - 'for_each_dev_addr'
  - 'for_each_dev_addr'
  - 'for_each_dev_scope'
  - 'for_each_displayid_db'
  - 'for_each_dma_cap_mask'
  - 'for_each_dma_cap_mask'
  - 'for_each_dpcm_be'
  - 'for_each_dpcm_be'
  - 'for_each_dpcm_be_rollback'
  - 'for_each_dpcm_be_rollback'
@@ -169,6 +175,8 @@ ForEachMacros:
  - 'for_each_evictable_lru'
  - 'for_each_evictable_lru'
  - 'for_each_fib6_node_rt_rcu'
  - 'for_each_fib6_node_rt_rcu'
  - 'for_each_fib6_walker_rt'
  - 'for_each_fib6_walker_rt'
  - 'for_each_free_mem_pfn_range_in_zone'
  - 'for_each_free_mem_pfn_range_in_zone_from'
  - 'for_each_free_mem_range'
  - 'for_each_free_mem_range'
  - 'for_each_free_mem_range_reverse'
  - 'for_each_free_mem_range_reverse'
  - 'for_each_func_rsrc'
  - 'for_each_func_rsrc'
@@ -178,6 +186,7 @@ ForEachMacros:
  - 'for_each_ip_tunnel_rcu'
  - 'for_each_ip_tunnel_rcu'
  - 'for_each_irq_nr'
  - 'for_each_irq_nr'
  - 'for_each_link_codecs'
  - 'for_each_link_codecs'
  - 'for_each_link_platforms'
  - 'for_each_lru'
  - 'for_each_lru'
  - 'for_each_matching_node'
  - 'for_each_matching_node'
  - 'for_each_matching_node_and_match'
  - 'for_each_matching_node_and_match'
@@ -302,7 +311,10 @@ ForEachMacros:
  - 'ide_port_for_each_present_dev'
  - 'ide_port_for_each_present_dev'
  - 'idr_for_each_entry'
  - 'idr_for_each_entry'
  - 'idr_for_each_entry_continue'
  - 'idr_for_each_entry_continue'
  - 'idr_for_each_entry_continue_ul'
  - 'idr_for_each_entry_ul'
  - 'idr_for_each_entry_ul'
  - 'in_dev_for_each_ifa_rcu'
  - 'in_dev_for_each_ifa_rtnl'
  - 'inet_bind_bucket_for_each'
  - 'inet_bind_bucket_for_each'
  - 'inet_lhash2_for_each_icsk_rcu'
  - 'inet_lhash2_for_each_icsk_rcu'
  - 'key_for_each'
  - 'key_for_each'
@@ -343,8 +355,6 @@ ForEachMacros:
  - 'media_device_for_each_intf'
  - 'media_device_for_each_intf'
  - 'media_device_for_each_link'
  - 'media_device_for_each_link'
  - 'media_device_for_each_pad'
  - 'media_device_for_each_pad'
  - 'mp_bvec_for_each_page'
  - 'mp_bvec_for_each_segment'
  - 'nanddev_io_for_each_page'
  - 'nanddev_io_for_each_page'
  - 'netdev_for_each_lower_dev'
  - 'netdev_for_each_lower_dev'
  - 'netdev_for_each_lower_private'
  - 'netdev_for_each_lower_private'
@@ -381,18 +391,19 @@ ForEachMacros:
  - 'radix_tree_for_each_slot'
  - 'radix_tree_for_each_slot'
  - 'radix_tree_for_each_tagged'
  - 'radix_tree_for_each_tagged'
  - 'rbtree_postorder_for_each_entry_safe'
  - 'rbtree_postorder_for_each_entry_safe'
  - 'rdma_for_each_block'
  - 'rdma_for_each_port'
  - 'rdma_for_each_port'
  - 'resource_list_for_each_entry'
  - 'resource_list_for_each_entry'
  - 'resource_list_for_each_entry_safe'
  - 'resource_list_for_each_entry_safe'
  - 'rhl_for_each_entry_rcu'
  - 'rhl_for_each_entry_rcu'
  - 'rhl_for_each_rcu'
  - 'rhl_for_each_rcu'
  - 'rht_for_each'
  - 'rht_for_each'
  - 'rht_for_each_from'
  - 'rht_for_each_entry'
  - 'rht_for_each_entry'
  - 'rht_for_each_entry_from'
  - 'rht_for_each_entry_from'
  - 'rht_for_each_entry_rcu'
  - 'rht_for_each_entry_rcu'
  - 'rht_for_each_entry_rcu_from'
  - 'rht_for_each_entry_rcu_from'
  - 'rht_for_each_entry_safe'
  - 'rht_for_each_entry_safe'
  - 'rht_for_each_from'
  - 'rht_for_each_rcu'
  - 'rht_for_each_rcu'
  - 'rht_for_each_rcu_from'
  - 'rht_for_each_rcu_from'
  - '__rq_for_each_bio'
  - '__rq_for_each_bio'
+7 −7
Original line number Original line Diff line number Diff line
@@ -159,7 +159,7 @@ Mitigation development


The initial response team sets up an encrypted mailing-list or repurposes
The initial response team sets up an encrypted mailing-list or repurposes
an existing one if appropriate. The disclosing party should provide a list
an existing one if appropriate. The disclosing party should provide a list
of contacts for all other parties who have already been, or should be
of contacts for all other parties who have already been, or should be,
informed about the issue. The response team contacts these parties so they
informed about the issue. The response team contacts these parties so they
can name experts who should be subscribed to the mailing-list.
can name experts who should be subscribed to the mailing-list.


@@ -217,11 +217,11 @@ an involved disclosed party. The current ambassadors list:
  AMD
  AMD
  IBM
  IBM
  Intel
  Intel
  Qualcomm
  Qualcomm	Trilok Soni <tsoni@codeaurora.org>


  Microsoft
  Microsoft	Sasha Levin <sashal@kernel.org>
  VMware
  VMware
  XEN
  Xen		Andrew Cooper <andrew.cooper3@citrix.com>


  Canonical	Tyler Hicks <tyhicks@canonical.com>
  Canonical	Tyler Hicks <tyhicks@canonical.com>
  Debian	Ben Hutchings <ben@decadent.org.uk>
  Debian	Ben Hutchings <ben@decadent.org.uk>
@@ -230,8 +230,8 @@ an involved disclosed party. The current ambassadors list:
  SUSE		Jiri Kosina <jkosina@suse.cz>
  SUSE		Jiri Kosina <jkosina@suse.cz>


  Amazon
  Amazon
  Google
  Google	Kees Cook <keescook@chromium.org>
  ============== ========================================================
  ============= ========================================================


If you want your organization to be added to the ambassadors list, please
If you want your organization to be added to the ambassadors list, please
contact the hardware security team. The nominated ambassador has to
contact the hardware security team. The nominated ambassador has to
+7 −6
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ The following 64-byte header is present in decompressed Linux kernel image.
	u32 res1  = 0;		  /* Reserved */
	u32 res1  = 0;		  /* Reserved */
	u64 res2  = 0;    	  /* Reserved */
	u64 res2  = 0;    	  /* Reserved */
	u64 magic = 0x5643534952; /* Magic number, little endian, "RISCV" */
	u64 magic = 0x5643534952; /* Magic number, little endian, "RISCV" */
	u32 res3;		  /* Reserved for additional RISC-V specific header */
	u32 magic2 = 0x56534905;  /* Magic number 2, little endian, "RSC\x05" */
	u32 res4;		  /* Reserved for PE COFF offset */
	u32 res4;		  /* Reserved for PE COFF offset */


This header format is compliant with PE/COFF header and largely inspired from
This header format is compliant with PE/COFF header and largely inspired from
@@ -37,13 +37,14 @@ Notes:
	Bits 16:31 - Major version
	Bits 16:31 - Major version


  This preserves compatibility across newer and older version of the header.
  This preserves compatibility across newer and older version of the header.
  The current version is defined as 0.1.
  The current version is defined as 0.2.


- res3 is reserved for offset to any other additional fields. This makes the
- The "magic" field is deprecated as of version 0.2.  In a future
  header extendible in future. One example would be to accommodate ISA
  release, it may be removed.  This originally should have matched up
  extension for RISC-V in future. For current version, it is set to be zero.
  with the ARM64 header "magic" field, but unfortunately does not.
  The "magic2" field replaces it, matching up with the ARM64 header.


- In current header, the flag field has only one field.
- In current header, the flags field has only one field.
	Bit 0: Kernel endianness. 1 if BE, 0 if LE.
	Bit 0: Kernel endianness. 1 if BE, 0 if LE.


- Image size is mandatory for boot loader to load kernel image. Booting will
- Image size is mandatory for boot loader to load kernel image. Booting will
+1 −2
Original line number Original line Diff line number Diff line
@@ -17732,8 +17732,7 @@ F: include/uapi/linux/dqblk_xfs.h
F:	include/uapi/linux/fsmap.h
F:	include/uapi/linux/fsmap.h


XILINX AXI ETHERNET DRIVER
XILINX AXI ETHERNET DRIVER
M:	Anirudha Sarangi <anirudh@xilinx.com>
M:	Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
M:	John Linn <John.Linn@xilinx.com>
S:	Maintained
S:	Maintained
F:	drivers/net/ethernet/xilinx/xilinx_axienet*
F:	drivers/net/ethernet/xilinx/xilinx_axienet*


+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@
VERSION = 5
VERSION = 5
PATCHLEVEL = 3
PATCHLEVEL = 3
SUBLEVEL = 0
SUBLEVEL = 0
EXTRAVERSION = -rc7
EXTRAVERSION = -rc8
NAME = Bobtail Squid
NAME = Bobtail Squid


# *DOCUMENTATION*
# *DOCUMENTATION*
Loading