Received-SPF: pass (google.com: domain of linux-kernel+bounces-63958-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <e15b25c2-2ced-4f79-b541-61980a31f947@intel.com>
Date: Tue, 13 Feb 2024 18:03:34 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: linux-next: manual merge of the wireless-next tree with the pm
 tree
To: Johannes Berg <johannes@sipsolutions.net>, Stephen Rothwell
	<sfr@canb.auug.org.au>, Kalle Valo <kvalo@kernel.org>, Wireless
	<linux-wireless@vger.kernel.org>
CC: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, "Linux Next
 Mailing List" <linux-next@vger.kernel.org>, Miri Korenblit
	<miriam.rachel.korenblit@intel.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
	"Rafael J. Wysocki" <rafael@kernel.org>
References: <20240213110852.51524899@canb.auug.org.au>
 <4044e07e87af766f643f89f839b332973819e048.camel@sipsolutions.net>
Content-Language: en-US
From: "Wysocki, Rafael J" <rafael.j.wysocki@intel.com>
In-Reply-To: <4044e07e87af766f643f89f839b332973819e048.camel@sipsolutions.net>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U0Y3K1RNNkxYSUJYUkhkWVh1NkFzYnpsbEdyKy9rMzFROTdkN0FFb0xXY1U5?=
 =?utf-8?B?cHVFc09UQ3pscjNLbDJSTlNpTlpBUGdBd2IyS3E3aTVoUTM4VW1DU2paSy9w?=
 =?utf-8?B?ZHNkY21VUmdscjRUUVIvVjlxZGtzUG1SUEMvUUEvRFUzT1JqSk1LT1MxbGJQ?=
 =?utf-8?B?TGZPTUhEblhoTkxqUlVBVHRFWFRVbWZJcTBsbEFKblQ4SmlWWmsrWE14MU1t?=
 =?utf-8?B?QXVLWkFLQkd6V2dZSStyUlhPenh2QlBBWk5vM2h2VGRmVFVkQmJUb3hmQUlr?=
 =?utf-8?B?aEgva0hJc0NMeWt2OXJFb3RBTnVqY1pBWmdTRXBmcm54NjhhZko0RG5BYy92?=
 =?utf-8?B?SXE1RVVheFZOV3RranFyalZwN0dyRGlFNElZZmpyZHRqdHFCU01XdWZUZVEx?=
 =?utf-8?B?bUI5anB1NWEyR0hkOGtJWXljTGYxelFQTUh0VU1HVFlOV1BvZDhUOGcxZkVk?=
 =?utf-8?B?dVFQeHBXWmQ3UWtxMGhEdXJ2TGRMQ1ZXTlAwRnYzb2FXTGd6bllTOGM1N0Vn?=
 =?utf-8?B?QTRuZzhkY2FzTmxSc1RZRWN0VkorRGlQOUxiZHY2SU56NXBkemN1REVrN3lM?=
 =?utf-8?B?cWVQTmhpSmZ5d3dsYWF3MXpQRERDd1VNcC9KSXlvb04wcmxZM2JKT1EyYkpS?=
 =?utf-8?B?NWhIZDZFU1c2THJlMm5NcVZQb1NvQ1RhTE5nZWpwMU1rdXNtMTA5S2E2QnJm?=
 =?utf-8?B?NndIdnIwKzZ5Q091MFgrTnRSK1JhcW9DcElIeXpNNEppRzZva2U4a1lJQ1ZP?=
 =?utf-8?B?VHg5R1FLSll5NFpIa0NpbHRzd0VXakU0R3VBNldkZFZvZnpYZnhxdDlYa01r?=
 =?utf-8?B?T29ZdW9ja2J0QVJUbWpHYk9uMEcvRUUyZWpadTVhMGswVWFLcExnVDBkSGsw?=
 =?utf-8?B?bVFEeWVyekJFbWVlWG02aG0rclpadHE2SEswOEx0cDVYVjFSK1QyWFNEcFVw?=
 =?utf-8?B?aGZzbUg0NDhsMVRWdGxDaHE1bG8zWEg0VnpBakZCYzRNQ09USGljNmFiSzFF?=
 =?utf-8?B?aG1IVWZtSndTZnZ0NVVCUHZvYitSNTRKWDRGVDI2VmREb0pDTUswcHJvOGpJ?=
 =?utf-8?B?QVhZd0NkVHBSaWV3SUdRYlkxcEVZZGgvN0JycEZQTFp6eHo2a1Q1MlYxcDBE?=
 =?utf-8?B?bk5peloxSmQ0dHBxWWd5UVppU3o3WTNaTWE4RXl3cUlKVTluMWNMZFp4S1ow?=
 =?utf-8?B?SkNXUW45OUVJRUFCUWhRQUk4NEtodlFmUUwxWUFibG02dTBtM2pDaEkrY1J4?=
 =?utf-8?B?MlU2WTFsZFloZnkwNmtxWHZoWHpKZjl4ay9QYVdWOGlyS01yL1c3czBVWi9x?=
 =?utf-8?B?REpRWWU3OFlNeThGdVQxY0I2Y28zczUxS0N4b0w0dHd6OVE2NG9tdmpSTVBn?=
 =?utf-8?B?dStLYjE1elltWnc0cGFlbTlEbkc0ck42L2JrMTdERlh0YzhNTFF6YytlbDNw?=
 =?utf-8?B?eENKZU5LSlF3NVNQTEZKbFB6Q1lCamcyZnl4aXNodXJjWlFSdHBIa3BmMlY0?=
 =?utf-8?B?VzlwTlZZV1ZFczZNaG5sQ3Z3cWxoL2ZrN0tUWEMzZzdCa1U4Qk1VeFhQNTVn?=
 =?utf-8?B?Qk9aMnJxS1VYNHVxdFlwR1NEM1RMZXpwcnQvVVNGakhhWlFLUi9vcDVTWFZs?=
 =?utf-8?B?bjNaVXVrcjE1ZHRNWFBoU2tBUzk2VXIzdkU3UHpYR2t2ai9ja0FhWlFFMnRL?=
 =?utf-8?B?dE1FUWUyMHZwWGtYTVVxdkYzSGErazF4RUdRSnpRb0Q3N0lId0paeS9ORWZG?=
 =?utf-8?B?WTNXNG9hVTcvY2YrKzZCeTF3YXhsS0p0L3Q4TXB3em8wY0d5Z2c4N3ZmSnhv?=
 =?utf-8?B?K1ROUWExMGpiRm84MzlsTWNXc2RvTkVpT2h0dEdXK0dsYnovVUM2Q0V2M2o3?=
 =?utf-8?B?WXFFbHd6Si9adTFWaHJOZ3BFMjJXeGpQemJxNkFyOUt1UkNNU2w2WlN3SnBR?=
 =?utf-8?B?eFAzMlRwTG1FeDVhOE02RzVUUzY3Tm1jY0tydHRDUGtxYjNIWmFOUFJzVmcw?=
 =?utf-8?B?UUZOVisxOTcrNE13bW5NcVd4RE9KMWhkM0ZtQTFXMzl5eWNVazMyQVpSMm5o?=
 =?utf-8?B?NE9SZktUVkxwUFNzWUJVY2x1TnAwdUYvdS9SRDMwRDhWcTNzKzRRY0RVWE0r?=
 =?utf-8?B?M1gwd21wZmx1ZXJYajluTGVydXhPL040b2JYMFhLS1ptUGp6K3ZZbVFnSDBz?=
 =?utf-8?B?Z2c9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: a9769d8b-a37a-4049-be2d-08dc2cb5b9bd
X-MS-Exchange-CrossTenant-AuthSource: MW5PR11MB5810.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2024 17:03:39.9621
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Tj/os9oSfQGDkFIqSk2KIYiZaBIx+I/QjIJLfzTx07C2+w9XJbz/dwErG5x0/LrZJEho1jc2TuAhQDJuimS7HCvYRvIKk0zCaL5AMpyg0oU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB5871
X-OriginatorOrg: intel.com

On 2/13/2024 9:25 AM, Johannes Berg wrote:
> On Tue, 2024-02-13 at 11:08 +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the wireless-next tree got a conflict in:
>>
>>    drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
>>
>> between commit:
>>
>>    2e171a57c312 ("iwlwifi: mvm: Drop unused fw_trips_index[] from iwl_mvm_thermal_device")
>>
>> from the pm tree and commit:
>>
>>    8cb3a308ceb1 ("wifi: iwlwifi: mvm: fix thermal kernel-doc")
>>
>> from the wireless-next tree.
> Hah, sorry about that. I told Rafael this was likely not going to
> conflict, but didn't see the doc changes ...
>
> I guess we'll have to live with this conflict, unless Rafael you have a
> feature branch for this I could pull in and resolve?

Well, not yet, but I can add one if that helps.

Cheers!